Package: libgsm
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From a5f8c2328b379c866a061f106abcb7090872e5b9 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 03:36:46 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/README.source | 8 ---
debian/changelog | 14 ++++--
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 6 --
.../{01_makefile.dpatch => 01_makefile.patch} | 8 +--
.../{02_cplusplus.dpatch => 02_cplusplus.patch} | 8 +--
.../patches/{03_config.dpatch => 03_config.patch} | 8 +--
debian/patches/04_includes.dpatch | 50 --------------------
debian/patches/04_includes.patch | 49 +++++++++++++++++++
..._warnings.dpatch => 05_compiler_warnings.patch} | 8 +--
...6_fix_manpages.dpatch => 06_fix_manpages.patch} | 8 +--
debian/patches/series | 6 ++
debian/rules | 5 +-
debian/source/format | 1 +
15 files changed, 81 insertions(+), 104 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_makefile.dpatch => 01_makefile.patch} (89%)
rename debian/patches/{02_cplusplus.dpatch => 02_cplusplus.patch} (76%)
rename debian/patches/{03_config.dpatch => 03_config.patch} (96%)
delete mode 100644 debian/patches/04_includes.dpatch
create mode 100644 debian/patches/04_includes.patch
rename debian/patches/{05_compiler_warnings.dpatch => 05_compiler_warnings.patch} (93%)
rename debian/patches/{06_fix_manpages.dpatch => 06_fix_manpages.patch} (95%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index e52fac0..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,8 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build. Please see:
-
- /usr/share/doc/dpatch/README.source.gz
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.
diff --git a/debian/changelog b/debian/changelog
index 335f813..33a81e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libgsm (1.0.13-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ Note: patch 04 was updated with "quilt refresh" to make
+ it apply cleanly.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Wed, 29 Feb 2012 03:34:59 -0500
+
libgsm (1.0.13-3) unstable; urgency=low
* Fix cut and paste error in long description (Closes: #544896)
@@ -163,7 +173,3 @@ libgsm (1.0.10-1) unstable; urgency=low
* Initial Release.
-- Klee Dienes <k...@debian.org> Fri, 24 Jan 1997 14:50:55 -0500
-
-Local variables:
-mode: debian-changelog
-End:
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index a75ebba..ee1abfb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: libgsm
Section: libs
Priority: optional
Maintainer: Jochen Friedrich <joc...@scram.de>
-Standards-Version: 3.8.3
-Build-Depends: debhelper (> 7), dpatch
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9)
Package: libgsm1
Section: libs
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 22fdf9c..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,6 +0,0 @@
-01_makefile
-02_cplusplus
-03_config
-04_includes
-05_compiler_warnings
-06_fix_manpages.dpatch
diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.patch
similarity index 89%
rename from debian/patches/01_makefile.dpatch
rename to debian/patches/01_makefile.patch
index 5af4564..560c400 100644
--- a/debian/patches/01_makefile.dpatch
+++ b/debian/patches/01_makefile.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_makefile.dpatch by <joc...@scram.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from libgsm 1.0.10-14 diff.gz
+From: <joc...@scram.de>
+Subject: New patch generated from libgsm 1.0.10-14 diff.gz
-@DPATCH@
diff -urNad libgsm-1.0.12~/Makefile libgsm-1.0.12/Makefile
--- libgsm-1.0.12~/Makefile 2007-11-01 15:37:52.000000000 +0100
+++ libgsm-1.0.12/Makefile 2007-11-01 15:43:06.000000000 +0100
diff --git a/debian/patches/02_cplusplus.dpatch b/debian/patches/02_cplusplus.patch
similarity index 76%
rename from debian/patches/02_cplusplus.dpatch
rename to debian/patches/02_cplusplus.patch
index 48f59a8..b15cc12 100644
--- a/debian/patches/02_cplusplus.dpatch
+++ b/debian/patches/02_cplusplus.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_cplusplus.dpatch by <joc...@scram.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Anand Kumria <wildf...@progsoc.org>
+Subject: Add C++ guard to gsm.h (Closes: #202712)
-@DPATCH@
diff -urNad libgsm-1.0.10~/inc/gsm.h libgsm-1.0.10/inc/gsm.h
--- libgsm-1.0.10~/inc/gsm.h 2007-11-01 15:37:52.000000000 +0100
+++ libgsm-1.0.10/inc/gsm.h 2007-11-01 15:44:52.000000000 +0100
diff --git a/debian/patches/03_config.dpatch b/debian/patches/03_config.patch
similarity index 96%
rename from debian/patches/03_config.dpatch
rename to debian/patches/03_config.patch
index f357b47..cb51adb 100644
--- a/debian/patches/03_config.dpatch
+++ b/debian/patches/03_config.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_config.dpatch by <joc...@scram.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Anand Kumria <wildf...@progsoc.org>
+Subject: Add C++ guard to gsm.h
-@DPATCH@
diff -urNad libgsm-1.0.10~/Makefile libgsm-1.0.10/Makefile
--- libgsm-1.0.10~/Makefile 2007-11-01 15:37:52.000000000 +0100
+++ libgsm-1.0.10/Makefile 2007-11-01 15:48:02.000000000 +0100
diff --git a/debian/patches/04_includes.dpatch b/debian/patches/04_includes.dpatch
deleted file mode 100644
index cb78d08..0000000
--- a/debian/patches/04_includes.dpatch
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_includes.dpatch by <joc...@scram.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad libgsm-1.0.10~/inc/toast.h libgsm-1.0.10/inc/toast.h
---- libgsm-1.0.10~/inc/toast.h 2007-11-01 15:37:52.000000000 +0100
-+++ libgsm-1.0.10/inc/toast.h 2007-11-01 15:52:33.000000000 +0100
-@@ -16,11 +16,12 @@
-
- #include <stdio.h>
- #include <ctype.h>
-+#include <pthread.h>
- #include <signal.h>
-
- #include <errno.h>
--#ifndef HAS_ERRNO_DECL
-- extern int errno;
-+#ifndef errno
-+ extern int errno;
- #endif
-
- #ifdef HAS_LIMITS_H
-@@ -37,6 +38,10 @@
- # endif
- #endif
-
-+#ifdef HAS_STDIO_H
-+# include <stdio.h>
-+#endif
-+
- #include "gsm.h"
-
- #ifndef S_ISREG
-diff -urNad libgsm-1.0.10~/src/code.c libgsm-1.0.10/src/code.c
---- libgsm-1.0.10~/src/code.c 2007-11-01 15:37:52.000000000 +0100
-+++ libgsm-1.0.10/src/code.c 2007-11-01 15:52:33.000000000 +0100
-@@ -9,8 +9,8 @@
- #include "config.h"
-
-
--#ifdef HAS_STDLIB_H
--#include <stdlib.h>
-+#ifdef HAS_STRING_H
-+#include <string.h>
- #else
- # include "proto.h"
- extern char * memcpy P((char *, char *, int));
diff --git a/debian/patches/04_includes.patch b/debian/patches/04_includes.patch
new file mode 100644
index 0000000..92a3377
--- /dev/null
+++ b/debian/patches/04_includes.patch
@@ -0,0 +1,49 @@
+From: Jochen Friedrich <joc...@scram.de>
+Subject: Change errno handling to fix Hurd (Closes: #164191, #164194)
+
+---
+ inc/toast.h | 9 +++++++--
+ src/code.c | 4 ++--
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+
+--- a/inc/toast.h
++++ b/inc/toast.h
+@@ -16,11 +16,12 @@
+
+ #include <stdio.h>
+ #include <ctype.h>
++#include <pthread.h>
+ #include <signal.h>
+
+ #include <errno.h>
+-#ifndef HAS_ERRNO_DECL
+- extern int errno;
++#ifndef errno
++ extern int errno;
+ #endif
+
+ #ifdef HAS_LIMITS_H
+@@ -37,6 +38,10 @@
+ # endif
+ #endif
+
++#ifdef HAS_STDIO_H
++# include <stdio.h>
++#endif
++
+ #include "gsm.h"
+
+ #ifndef S_ISREG
+--- a/src/code.c
++++ b/src/code.c
+@@ -9,8 +9,8 @@
+ #include "gsm_config.h"
+
+
+-#ifdef HAS_STDLIB_H
+-#include <stdlib.h>
++#ifdef HAS_STRING_H
++#include <string.h>
+ #else
+ # include "proto.h"
+ extern char * memcpy P((char *, char *, int));
diff --git a/debian/patches/05_compiler_warnings.dpatch b/debian/patches/05_compiler_warnings.patch
similarity index 93%
rename from debian/patches/05_compiler_warnings.dpatch
rename to debian/patches/05_compiler_warnings.patch
index 70e2836..6c6a6cb 100644
--- a/debian/patches/05_compiler_warnings.dpatch
+++ b/debian/patches/05_compiler_warnings.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_compiler_warnings.dpatch by <joc...@scram.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Jochen Friedrich <joc...@scram.de>
+Subject: Clean up comiler warnings (Closes: #226561)
-@DPATCH@
diff -urNad libgsm-1.0.10~/src/debug.c libgsm-1.0.10/src/debug.c
--- libgsm-1.0.10~/src/debug.c 2007-11-01 15:37:52.000000000 +0100
+++ libgsm-1.0.10/src/debug.c 2007-11-01 15:53:42.000000000 +0100
diff --git a/debian/patches/06_fix_manpages.dpatch b/debian/patches/06_fix_manpages.patch
similarity index 95%
rename from debian/patches/06_fix_manpages.dpatch
rename to debian/patches/06_fix_manpages.patch
index 1c5a2b4..b9e20b8 100644
--- a/debian/patches/06_fix_manpages.dpatch
+++ b/debian/patches/06_fix_manpages.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_fix_manpages.dpatch by <joc...@scram.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Jochen Friedrich <joc...@scram.de>
+Subject: Correct manual page markup
-@DPATCH@
diff -urNad libgsm-1.0.13~/man/gsm.3 libgsm-1.0.13/man/gsm.3
--- libgsm-1.0.13~/man/gsm.3 2009-10-14 11:17:29.000000000 +0200
+++ libgsm-1.0.13/man/gsm.3 2009-10-14 12:10:49.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3982a6f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+01_makefile.patch
+02_cplusplus.patch
+03_config.patch
+04_includes.patch
+05_compiler_warnings.patch
+06_fix_manpages.patch
diff --git a/debian/rules b/debian/rules
index faf3d5b..4db76ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
#! /usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
.PHONY: build clean binary binary-indep binary-arch
@@ -19,12 +18,12 @@ MULTYPE='-DUSE_FLOAT_MUL'
endif
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
$(MAKE) $(CROSS) CCFLAGS='-c -g -O2 -fPIC -Wall -D_GNU_SOURCE -D_REENTRANT -DNeedFunctionPrototypes=1 -DWAV49' MULHACK=$(MULTYPE) all
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
$(MAKE) clean
rm -f lib/*
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.9
