Package: vsdump
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 b1cf85398925f4087ca5f728bb342018c656ec81 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 04:39:24 -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>
---
config.h | 6 +++---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
....dpatch => 01_fix_path_chunks-parse-cmds.patch} | 7 ++-----
debian/patches/series | 1 +
debian/rules | 13 ++-----------
8 files changed, 19 insertions(+), 23 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_fix_path_chunks-parse-cmds.dpatch => 01_fix_path_chunks-parse-cmds.patch} (77%)
mode change 100755 => 100644
create mode 100644 debian/patches/series
diff --git a/config.h b/config.h
index 7bc2605..da85a8f 100644
--- a/config.h
+++ b/config.h
@@ -11,16 +11,16 @@
#define PACKAGE_NAME "vsdump"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "vsdump 0.0.45"
+#define PACKAGE_STRING "vsdump 0.0.44"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "vsdump"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.0.45"
+#define PACKAGE_VERSION "0.0.44"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.0.45"
+#define VERSION "0.0.44"
diff --git a/debian/changelog b/debian/changelog
index e37d6c3..5568e0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vsdump (0.0.45-1.1) 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 <jari.aa...@cante.net> Wed, 29 Feb 2012 04:37:20 -0500
+
vsdump (0.0.45-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/compat b/debian/compat
index 1e8b314..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+9
diff --git a/debian/control b/debian/control
index 1ad8aca..afdf3f1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: vsdump
Section: utils
Priority: extra
Maintainer: Juan Angulo Moreno <j...@apuntale.com>
-Build-Depends: debhelper (>= 6), autotools-dev, pkg-config, libgsf-1-common, libglib2.0-0, libgsf-1-114, libgsf-1-dev, dpatch
-Standards-Version: 3.9.0
+Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, libgsf-1-common, libglib2.0-0, libgsf-1-114, libgsf-1-dev
+Standards-Version: 3.9.3
Package: vsdump
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e5b0a84..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_fix_path_chunks-parse-cmds.dpatch
diff --git a/debian/patches/01_fix_path_chunks-parse-cmds.dpatch b/debian/patches/01_fix_path_chunks-parse-cmds.patch
old mode 100755
new mode 100644
similarity index 77%
rename from debian/patches/01_fix_path_chunks-parse-cmds.dpatch
rename to debian/patches/01_fix_path_chunks-parse-cmds.patch
index 1ae0e59..2a2c733
--- a/debian/patches/01_fix_path_chunks-parse-cmds.dpatch
+++ b/debian/patches/01_fix_path_chunks-parse-cmds.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_path_chunks-parse-cmds.dpatch by Juan Angulo Moreno <j...@apuntale.com>
-##
-## DP: Change path .tbl commands
+From: Juan Angulo Moreno <j...@apuntale.com>
+Subject: Change path .tbl commands
-@DPATCH@
diff -urNad vsdump-0.0.44~/src/vsd_parse_cmds.c vsdump-0.0.44/src/vsd_parse_cmds.c
--- vsdump-0.0.44~/src/vsd_parse_cmds.c 2007-07-09 23:53:19.000000000 -0400
+++ vsdump-0.0.44/src/vsd_parse_cmds.c 2008-05-03 06:43:40.000000000 -0430
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6790619
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_fix_path_chunks-parse-cmds.patch
diff --git a/debian/rules b/debian/rules
index 16f1b80..1bcf51d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,23 +21,14 @@ config.status: configure
cp -f /usr/share/misc/config.guess config.guess
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
-build: patch build-stamp
+build: build-stamp
build-stamp: config.status
dh_testdir
$(MAKE)
touch $@
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
--
1.7.9
