Package: getstream
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 90995ba284dbb87d6170d8043e5905d48cacac1a Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Mon, 27 Feb 2012 15:30:45 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/README.source | 2 --
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 2 --
...ibhttp-memleak.dpatch => libhttp-memleak.patch} | 7 ++-----
debian/patches/series | 2 ++
.../{use-pkgconfig.dpatch => use-pkgconfig.patch} | 9 ++-------
debian/rules | 3 +--
debian/source/format | 1 +
10 files changed, 19 insertions(+), 21 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{libhttp-memleak.dpatch => libhttp-memleak.patch} (78%)
create mode 100644 debian/patches/series
rename debian/patches/{use-pkgconfig.dpatch => use-pkgconfig.patch} (70%)
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index ea7e94a..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-The source code is being modified to prevent a memleak from appearing in libhttp.c
-until upstream fixes it directly in the software.
diff --git a/debian/changelog b/debian/changelog
index 51f61ae..f17a1f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+getstream (20081204-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <[email protected]> Mon, 27 Feb 2012 15:29:42 -0500
+
getstream (20081204-1.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index c57f968..6234fee 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: getstream
Section: net
Priority: extra
Maintainer: Herve Rousseau <[email protected]>
-Build-Depends: debhelper (>= 5), libevent-dev, libglib2.0-dev, dpatch, pkg-config
+Build-Depends: debhelper (>= 9), libevent-dev, libglib2.0-dev, pkg-config
Vcs-Git: git://hydra.gt.owl.de/getstream.git
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
Homepage: http://silicon-verl.de/home/flo/projects/streaming/
Package: getstream
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 3a8a763..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-libhttp-memleak
-use-pkgconfig
diff --git a/debian/patches/libhttp-memleak.dpatch b/debian/patches/libhttp-memleak.patch
similarity index 78%
rename from debian/patches/libhttp-memleak.dpatch
rename to debian/patches/libhttp-memleak.patch
index 63c1f76..d26b148 100644
--- a/debian/patches/libhttp-memleak.dpatch
+++ b/debian/patches/libhttp-memleak.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## libhttp-memleak.dpatch by Herve Rousseau <[email protected]>
-##
-## DP: Fixes a memleak ([email protected])
+From: Herve Rousseau <[email protected]>
+Subject: Fixes a memleak ([email protected])
-@DPATCH@
diff -urNad getstream_20081204~/libhttp.c getstream_20081204/libhttp.c
--- getstream_20081204~/libhttp.c 2008-12-04 15:21:07.000000000 +0100
+++ getstream_20081204/libhttp.c 2009-08-23 18:05:47.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f0b3962
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+libhttp-memleak.patch
+use-pkgconfig.patch
diff --git a/debian/patches/use-pkgconfig.dpatch b/debian/patches/use-pkgconfig.patch
similarity index 70%
rename from debian/patches/use-pkgconfig.dpatch
rename to debian/patches/use-pkgconfig.patch
index d1cdd68..916d4ca 100644
--- a/debian/patches/use-pkgconfig.dpatch
+++ b/debian/patches/use-pkgconfig.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## use-pkgconfig.dpatch by Steve Langasek <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use pkg-config instead of hard-coding a glib header path, to fix
-## DP: build failure under multiarch.
+From: Steve Langasek <[email protected]>
+Subject: Use pkg-config, not hard-coded glib header path (multiarch fix)
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/Makefile getstream-20081204/Makefile
--- getstream-20081204~/Makefile 2008-12-04 06:21:07.000000000 -0800
+++ getstream-20081204/Makefile 2011-04-11 10:19:09.659399230 -0700
diff --git a/debian/rules b/debian/rules
index e2708fc..a666d97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
CFLAGS = -Wall -g
@@ -14,7 +13,7 @@ build-stamp: $(DPATCH_STAMPFN)
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
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
