Package: cryptcat
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 d987e1519c3683ad6b0b1f0f62732b9a946a2c7b Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Mon, 30 Apr 2012 17:20:52 +0300
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/changelog | 18 +++++++++---
debian/compat | 2 +-
debian/control | 9 +++---
debian/copyright | 10 +++++--
debian/patches/00list | 2 --
debian/patches/{01_makefile => 01-makefile.patch} | 30 ++++----------------
..._segfault => 02-fix-listen-mode-segfault.patch} | 8 ++----
debian/patches/series | 2 ++
debian/rules | 11 ++++---
debian/source/format | 1 +
10 files changed, 44 insertions(+), 49 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_makefile => 01-makefile.patch} (62%)
rename debian/patches/{02_fix_listen_mode_segfault => 02-fix-listen-mode-segfault.patch} (65%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index b045b64..727c8b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+cryptcat (20031202-4.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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Mark old upstream URL obsolete in copyright file.
+ * Fix copyright-without-copyright-notice (Lintian)
+ * Fix spelling-error-in-copyright (Lintian).
+ * Fix description-synopsis-starts-with-article (Lintian).
+ * Fix no-homepage-field (Lintian).
+
+ -- Jari Aalto <[email protected]> Mon, 30 Apr 2012 17:15:07 +0300
+
cryptcat (20031202-4) unstable; urgency=low
* Removed "-s" in original Makefile to accomodate
@@ -91,7 +105,3 @@ cryptcat (0.0.950915-1) unstable; urgency=low
* Sent manpage upstream
-- Lars Bahner <[email protected]> Wed, 11 Jul 2001 15:58:38 +0200
-
-Local variables:
-mode: debian-changelog
-End:
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 cc63036..25be9c3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,14 @@ Source: cryptcat
Section: net
Priority: optional
Maintainer: Lars Bahner <[email protected]>
-Build-Depends: debhelper (>> 5.0.0), dpatch
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
+Homepage: http://sourceforge.net/projects/cryptcat
Package: cryptcat
Architecture: any
-Depends: ${shlibs:Depends}
-Description: A lightweight version netcat extended with twofish encryption
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: lightweight version netcat extended with twofish encryption
Cryptcat is a simple Unix utility which reads and writes data across
network connections, using TCP or UDP protocol while encrypting the
data being transmitted.
diff --git a/debian/copyright b/debian/copyright
index 9c116ed..575fb96 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,16 +2,20 @@ This package was debianized by Lars Bahner <[email protected]> on
Wed, 11 Jul 2001 15:58:38 +0200.
It was downloaded from http://farm9.com/content/Free_Tools/cryptcat_linux2.tar
+which as of 2012-04-30 no longer exists. See instead
+http://sourceforge.net/projects/cryptcat
-Upstream Author: farm9 <[email protected]>
+Upstream Author:
+
+ Copyright (C) 2000-2003 farm9 <[email protected]>, <[email protected]>
Contributors: Dan F, Jeff Nathan, Matt W, Frank Knobbe, Dragos, Bill Weiss,
Jimmy
Copyright:
-The Gnu Public License v2 is available from /usr/share/common-licenses/GPL-2
-on a Debian system http://www.fsf.org/licenses/info/GPLv2orLater.html.
+On Debian systems, the complete text of the GNU General
+Public License can be found in "/usr/share/common-licenses/GPL-2".
Netcat
======
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 72c3d30..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_makefile
-02_fix_listen_mode_segfault
diff --git a/debian/patches/01_makefile b/debian/patches/01-makefile.patch
similarity index 62%
rename from debian/patches/01_makefile
rename to debian/patches/01-makefile.patch
index e7c7fea..278a615 100644
--- a/debian/patches/01_makefile
+++ b/debian/patches/01-makefile.patch
@@ -1,29 +1,9 @@
-#!/bin/sh -e
-## DP: Debian conformance patch for the Debian pyca-package
-## DP: This patch consists mainly of FHS (2.2) stuff
-## Copyright @ 2003 by Lars Bahner <[email protected]>
+From: Lars Bahner <[email protected]>
+Subject: Debian conformance patch for the Debian pyca-package
+ This patch consists mainly of FHS (2.2) stuff
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p0 < $0;;
- -unpatch) patch $patch_opts -p0 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
---- Makefile.orig 2008-08-21 22:48:42.000000000 +0000
-+++ Makefile 2008-08-21 22:51:09.000000000 +0000
+--- a/Makefile.orig 2008-08-21 22:48:42.000000000 +0000
++++ b/Makefile 2008-08-21 22:51:09.000000000 +0000
@@ -5,18 +5,22 @@
### PREDEFINES
diff --git a/debian/patches/02_fix_listen_mode_segfault b/debian/patches/02-fix-listen-mode-segfault.patch
similarity index 65%
rename from debian/patches/02_fix_listen_mode_segfault
rename to debian/patches/02-fix-listen-mode-segfault.patch
index 8585245..8109fb0 100644
--- a/debian/patches/02_fix_listen_mode_segfault
+++ b/debian/patches/02-fix-listen-mode-segfault.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_listen_mode_segfault by Niek Linnenbank <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix segfault in listen mode (Closes: #431010)
+From: Niek Linnenbank <[email protected]>
+Subject: Fix segfault in listen mode (Closes: #431010)
-@DPATCH@
diff -urNad cryptcat-20031202~/farm9crypt.cc cryptcat-20031202/farm9crypt.cc
--- cryptcat-20031202~/farm9crypt.cc 2003-12-03 09:17:58.000000000 +0930
+++ cryptcat-20031202/farm9crypt.cc 2007-11-25 18:33:28.000000000 +0930
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..196595e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-makefile.patch
+02-fix-listen-mode-segfault.patch
diff --git a/debian/rules b/debian/rules
index 0e631c3..58bc542 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,18 +2,21 @@
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
-include /usr/share/dpatch/dpatch.make
configure:
dh_testdir
-build: patch
+
+build-arch: build
+build-indep: build
+
+build:
dh_testdir
$(MAKE) linux
-clean: unpatch
+clean:
dh_testdir
dh_testroot
@@ -25,7 +28,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/cryptcat
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.10
