Package: vncsnapshot
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
Benoit, as we spoke before, here is the proposed NMU patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload with these changes.
Thanks,
Jari
>From ed71da84dd2f5b2b3c7142ab2741584a498fa471 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 29 Feb 2012 13:21:44 -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 | 1 -
debian/changelog | 8 +++++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 2 -
...n_amd64.dpatch => 01_no_capture_on_amd64.patch} | 8 +-----
...oken.dpatch => 02_argument_tunnel_broken.patch} | 8 +-----
debian/patches/series | 2 +
debian/patches/{tunnel.c => tunnel.patch} | 1 +
debian/patches/vnc.patch | 1 +
debian/rules | 21 +------------------
debian/source/format | 1 +
12 files changed, 22 insertions(+), 37 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_no_capture_on_amd64.dpatch => 01_no_capture_on_amd64.patch} (64%)
rename debian/patches/{02_argument_tunnel_broken.dpatch => 02_argument_tunnel_broken.patch} (87%)
create mode 100644 debian/patches/series
rename debian/patches/{tunnel.c => tunnel.patch} (99%)
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 1c919f0..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/dpatch/README.source.gz
diff --git a/debian/changelog b/debian/changelog
index 6000d88..2afd146 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vncsnapshot (1.2a-5.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 <[email protected]> Wed, 29 Feb 2012 12:49:23 -0500
+
vncsnapshot (1.2a-5) unstable; urgency=low
* New maintainer (Closes: #483484)
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 36a905b..c58edbd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: vncsnapshot
Section: x11
Priority: optional
Maintainer: Benoit Mortier <[email protected]>
-Build-Depends: debhelper (>= 5), libjpeg62-dev, zlib1g-dev, dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), libjpeg62-dev, zlib1g-dev
+Standards-Version: 3.9.3
Homepage: http://vncsnapshot.sourceforge.net/
Vcs-Browser: http://vncsnapshot.cvs.sourceforge.net/viewvc/vncsnapshot/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 38f64e6..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_no_capture_on_amd64
-02_argument_tunnel_broken
diff --git a/debian/patches/01_no_capture_on_amd64.dpatch b/debian/patches/01_no_capture_on_amd64.patch
similarity index 64%
rename from debian/patches/01_no_capture_on_amd64.dpatch
rename to debian/patches/01_no_capture_on_amd64.patch
index abe751e..246657e 100644
--- a/debian/patches/01_no_capture_on_amd64.dpatch
+++ b/debian/patches/01_no_capture_on_amd64.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_no_capture_on_amd64.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: cannot capture vnc screen on amd64
+From: <[email protected]>
+Subject: cannot capture vnc screen on amd64
-@DPATCH@
diff -Naur vncsnapshot-1.2a.orig/rfb.h vncsnapshot-1.2a/rfb.h
--- vncsnapshot-1.2a.orig/rfb.h 2009-07-08 07:47:53.000000000 +0800
diff --git a/debian/patches/02_argument_tunnel_broken.dpatch b/debian/patches/02_argument_tunnel_broken.patch
similarity index 87%
rename from debian/patches/02_argument_tunnel_broken.dpatch
rename to debian/patches/02_argument_tunnel_broken.patch
index d80bff6..f358517 100644
--- a/debian/patches/02_argument_tunnel_broken.dpatch
+++ b/debian/patches/02_argument_tunnel_broken.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_argument_tunnel_broken.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: argument parsing (-tunnel) broken
+From: <[email protected]>
+Subject: argument parsing (-tunnel) broken
-@DPATCH@
--- vncsnapshot-1.2a.orig/tunnel.c
+++ vncsnapshot-1.2a/tunnel.c
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..52cc5ae
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_no_capture_on_amd64.patch
+02_argument_tunnel_broken.patch
diff --git a/debian/patches/tunnel.c b/debian/patches/tunnel.patch
similarity index 99%
rename from debian/patches/tunnel.c
rename to debian/patches/tunnel.patch
index 3794cc6..6e6cc41 100644
--- a/debian/patches/tunnel.c
+++ b/debian/patches/tunnel.patch
@@ -1,3 +1,4 @@
+
--- vncsnapshot-1.2a.orig/tunnel.c
+++ vncsnapshot-1.2a/tunnel.c
@@ -106,6 +106,8 @@
diff --git a/debian/patches/vnc.patch b/debian/patches/vnc.patch
index d9b716c..0acbbcd 100644
--- a/debian/patches/vnc.patch
+++ b/debian/patches/vnc.patch
@@ -1,3 +1,4 @@
+
diff -Naur vncsnapshot-1.2a.orig/rfb.h vncsnapshot-1.2a/rfb.h
--- vncsnapshot-1.2a.orig/rfb.h 2009-07-08 07:47:53.000000000 +0800
+++ vncsnapshot-1.2a/rfb.h 2009-07-03 23:52:53.000000000 +0800
diff --git a/debian/rules b/debian/rules
index 33adbac..34f0132 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,37 +23,20 @@ configure-stamp:
touch configure-stamp
-build: patch build-stamp
+build: build-stamp
build-stamp: configure-stamp
dh_testdir
$(MAKE)
touch build-stamp
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
[ ! -f Makefile ] || $(MAKE) clean
dh_clean
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
-
-
-
-
-
-
-
install: build
dh_testdir
dh_testroot
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
