Package: libdbi-drivers
Severity: wishlist
Tags: patch
Hi Thomas,
I had some free time; see attached patch to migrate to new package format.
Among other Lintian fixes I also corrected the open FTBFS #666331 which was
due to Debian'n chnage to multiarch.
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
[*] 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>
>From eaf445621c41721c61607db6fe062656dda88817 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Mon, 9 Apr 2012 00:04:13 +0300
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/changelog | 12 +++++++
debian/compat | 2 +-
debian/control | 10 +++---
debian/patches/00list | 1 -
debian/patches/00template | 1 -
...bian-changes-0.9b3-4 => 05-local-changes.patch} | 31 +------------------
debian/patches/{00_AES.dpatch => 10-AES.patch} | 7 +---
debian/patches/series | 3 +-
debian/rules | 17 ++++-------
debian/source.lintian-overrides | 2 -
10 files changed, 30 insertions(+), 56 deletions(-)
delete mode 100644 debian/patches/00list
delete mode 100644 debian/patches/00template
rename debian/patches/{debian-changes-0.9b3-4 => 05-local-changes.patch} (98%)
rename debian/patches/{00_AES.dpatch => 10-AES.patch} (98%)
mode change 100755 => 100644
delete mode 100644 debian/source.lintian-overrides
diff --git a/debian/changelog b/debian/changelog
index acb33b1..ab981d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ssldump (0.9b3-4.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.1 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Delete no longer needed debian/source.lintian-overrides.
+ * Fix description-synopsis-starts-with-article (Lintian)
+ * Fix no-homepage-field (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Mon, 09 Apr 2012 00:01:29 +0300
+
ssldump (0.9b3-4.1) unstable; urgency=low
* Non-maintainer upload.
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 10b571c..e7ee4f0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,15 @@ Source: ssldump
Section: net
Priority: optional
Maintainer: Juan Angulo Moreno <j...@apuntale.com>
-Build-Depends: debhelper (>= 7), libpcap-dev (>= 0.6.2), libssl-dev (>= 0.9.6c), dpatch
-Standards-Version: 3.9.0
+Build-Depends: debhelper (>= 9), libpcap-dev (>= 0.6.2), libssl-dev (>= 0.9.6c)
+Standards-Version: 3.9.3.1
+Homepage: http://www.rtfm.com/ssldump
Package: ssldump
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: tcpdump
-Description: An SSLv3/TLS network protocol analyzer
+Description: SSLv3/TLS network protocol analyzer
This program will dump the traffic on a network and analyze it for
SSLv3/TLS network traffic, typically used to secure TCP connections.
When it identifies this traffic, it decodes the results. When
@@ -17,5 +18,4 @@ Description: An SSLv3/TLS network protocol analyzer
the connections and display the application data traffic.
.
ssldump is based on tcpdump, a network monitoring and data acquisition
- tool. More information on ssldump is available at
- http://www.rtfm.com/ssldump/
+ tool.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 0db50bb..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-00_AES.dpatch
diff --git a/debian/patches/00template b/debian/patches/00template
deleted file mode 100644
index 0db50bb..0000000
--- a/debian/patches/00template
+++ /dev/null
@@ -1 +0,0 @@
-00_AES.dpatch
diff --git a/debian/patches/debian-changes-0.9b3-4 b/debian/patches/05-local-changes.patch
similarity index 98%
rename from debian/patches/debian-changes-0.9b3-4
rename to debian/patches/05-local-changes.patch
index ceeea5f..d694530 100644
--- a/debian/patches/debian-changes-0.9b3-4
+++ b/debian/patches/05-local-changes.patch
@@ -1,32 +1,5 @@
-Description: Upstream changes introduced in version 0.9b3-4
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- ssldump (0.9b3-4) unstable; urgency=low
- .
- * Bumped Standards-Version to 3.9.0.
- * Fixed: Add AES support from CVS (Closes: #383619).
- * Switch to dpkg-source 3.0 (quilt) format.
- * Added debian/source.lintian-overrides for more-than-one-patch-system
- (Reference: #585657).
- .
- The person named in the Author field signed this changelog entry.
-Author: Juan Angulo Moreno <j...@apuntale.com>
-Bug-Debian: http://bugs.debian.org/383619
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
+From: Unknown
+Subject:
--- /dev/null
+++ ssldump-0.9b3/ssldump-0.9-aes.patch
diff --git a/debian/patches/00_AES.dpatch b/debian/patches/10-AES.patch
old mode 100755
new mode 100644
similarity index 98%
rename from debian/patches/00_AES.dpatch
rename to debian/patches/10-AES.patch
index 45885bb..f4f231c
--- a/debian/patches/00_AES.dpatch
+++ b/debian/patches/10-AES.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001_AES.dpatch by Carsten Hoeger <choe...@suse.de>
-##
-## DP: Adds support for AES cipher-suites
+From: Carsten Hoeger <choe...@suse.de>
+Subject: Adds support for AES cipher-suites
-@DPATCH@
diff -urNad ssldump-0.9b3~/ssl/ciphersuites.c ssldump-0.9b3/ssl/ciphersuites.c
--- ssldump-0.9b3~/ssl/ciphersuites.c 2002-08-16 21:33:17.000000000 -0400
+++ ssldump-0.9b3/ssl/ciphersuites.c 2010-04-20 12:18:06.000000000 -0430
diff --git a/debian/patches/series b/debian/patches/series
index e2ec4e3..509d3d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-debian-changes-0.9b3-4
+05-local-changes.patch
+10-AES.patch
diff --git a/debian/rules b/debian/rules
index de9089a..2e74495 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,20 +20,19 @@ config.status: configure
--mandir=\$${prefix}/share/man --with-pcap-lib=/usr/lib/$(DEB_HOST_MULTIARCH)
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: config.status patch
+build-stamp: config.status
dh_testdir
$(MAKE)
touch build-stamp
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
-
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -42,10 +41,6 @@ clean-patched:
rm -f Makefile
dh_clean
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
install: build
dh_testdir
dh_testroot
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 777d188..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-more-than-one-patch-system
-
--
1.7.9.1
