Package: lsat
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 e4b2cc844ffaa56524e8cb478257396983506711 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 04:28:41 -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>
---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
....dpatch => 001_segmentation_fault_output.patch} | 7 ++-----
...cknet_sunos.dpatch => 002_checknet_sunos.patch} | 7 ++-----
...heckftpusers.dpatch => 003_checkftpusers.patch} | 7 ++-----
...04_checkpasswd.dpatch => 004_checkpasswd.patch} | 7 ++-----
debian/patches/00list | 4 ----
debian/patches/series | 4 ++++
debian/rules | 14 +++-----------
debian/source/format | 1 +
11 files changed, 27 insertions(+), 38 deletions(-)
rename debian/patches/{001_segmentation_fault_output.dpatch => 001_segmentation_fault_output.patch} (94%)
rename debian/patches/{002_checknet_sunos.dpatch => 002_checknet_sunos.patch} (80%)
rename debian/patches/{003_checkftpusers.dpatch => 003_checkftpusers.patch} (91%)
rename debian/patches/{004_checkpasswd.dpatch => 004_checkpasswd.patch} (84%)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index f84c34d..4428ce4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lsat (0.9.7.1-2.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:24:59 -0500
+
lsat (0.9.7.1-2) unstable; urgency=low
* Updated debian/control (Standard-Version).
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 86b380b..47564f1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: utils
Priority: extra
Maintainer: Juan Angulo Moreno <j...@apuntale.com>
HomePage: http://usat.sourceforge.net
-Build-Depends: debhelper (>= 5), dpatch
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: lsat
Architecture: any
diff --git a/debian/patches/001_segmentation_fault_output.dpatch b/debian/patches/001_segmentation_fault_output.patch
similarity index 94%
rename from debian/patches/001_segmentation_fault_output.dpatch
rename to debian/patches/001_segmentation_fault_output.patch
index f511252..bfca563 100644
--- a/debian/patches/001_segmentation_fault_output.dpatch
+++ b/debian/patches/001_segmentation_fault_output.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001_segmentation_fault_output.dpatch by TomaszN <nowak2...@poczta.onet.pl>
-##
-## DP: Segmentation fault when setting output file
+From: TomaszN <nowak2...@poczta.onet.pl>
+Subject: Segmentation fault when setting output file
-@DPATCH@
diff -urNad lsat-0.9.7.1~/lsatmain.c lsat-0.9.7.1/lsatmain.c
--- lsat-0.9.7.1~/lsatmain.c 2008-05-04 08:47:28.000000000 -0430
+++ lsat-0.9.7.1/lsatmain.c 2009-06-29 10:53:28.000000000 -0430
diff --git a/debian/patches/002_checknet_sunos.dpatch b/debian/patches/002_checknet_sunos.patch
similarity index 80%
rename from debian/patches/002_checknet_sunos.dpatch
rename to debian/patches/002_checknet_sunos.patch
index e2b39b2..7551e94 100644
--- a/debian/patches/002_checknet_sunos.dpatch
+++ b/debian/patches/002_checknet_sunos.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 002_checknet_sunos.dpatch by TomaszN <nowak2...@poczta.onet.pl>
-##
-## DP: awk invocation in checknet for sunos doesn't work
+From: TomaszN <nowak2...@poczta.onet.pl>
+Subject: awk invocation in checknet for sunos doesn't work
-@DPATCH@
diff -urNad lsat-0.9.7.1~/checknet.c lsat-0.9.7.1/checknet.c
--- lsat-0.9.7.1~/checknet.c 2008-05-04 08:47:28.000000000 -0430
+++ lsat-0.9.7.1/checknet.c 2009-06-29 10:56:09.000000000 -0430
diff --git a/debian/patches/003_checkftpusers.dpatch b/debian/patches/003_checkftpusers.patch
similarity index 91%
rename from debian/patches/003_checkftpusers.dpatch
rename to debian/patches/003_checkftpusers.patch
index 9e11071..699eb70 100644
--- a/debian/patches/003_checkftpusers.dpatch
+++ b/debian/patches/003_checkftpusers.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 003_checkftpusers.dpatch by TomaszN <nowak2...@poczta.onet.pl>
-##
-## DP: Hardcoded number of accounts too low
+From: TomaszN <nowak2...@poczta.onet.pl>
+Subject: Hardcoded number of accounts too low
-@DPATCH@
diff -urNad lsat-0.9.7.1~/checkftpusers.c lsat-0.9.7.1/checkftpusers.c
--- lsat-0.9.7.1~/checkftpusers.c 2008-05-04 08:47:28.000000000 -0430
+++ lsat-0.9.7.1/checkftpusers.c 2009-06-29 11:05:46.000000000 -0430
diff --git a/debian/patches/004_checkpasswd.dpatch b/debian/patches/004_checkpasswd.patch
similarity index 84%
rename from debian/patches/004_checkpasswd.dpatch
rename to debian/patches/004_checkpasswd.patch
index d954406..4f2a615 100644
--- a/debian/patches/004_checkpasswd.dpatch
+++ b/debian/patches/004_checkpasswd.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 004_checkpasswd.dpatch by TomaszN <nowak2...@poczta.onet.pl>
-##
-## DP: checkpasswd module closes random file
+From: TomaszN <nowak2...@poczta.onet.pl>
+Subject: checkpasswd module closes random file
-@DPATCH@
diff -urNad lsat-0.9.7.1~/checkpasswd.c lsat-0.9.7.1/checkpasswd.c
--- lsat-0.9.7.1~/checkpasswd.c 2008-05-04 08:47:28.000000000 -0430
+++ lsat-0.9.7.1/checkpasswd.c 2009-06-29 11:13:38.000000000 -0430
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index fdcfd1f..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-001_segmentation_fault_output.dpatch
-002_checknet_sunos.dpatch
-003_checkftpusers.dpatch
-004_checkpasswd.dpatch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4b5dd12
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+001_segmentation_fault_output.patch
+002_checknet_sunos.patch
+003_checkftpusers.patch
+004_checkpasswd.patch
diff --git a/debian/rules b/debian/rules
index 1a9601c..7892a4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,21 +18,13 @@ endif
build: build-stamp
-build-stamp: patch config.status
+build-stamp: config.status
dh_testdir
$(MAKE)
$(MAKE) manpage
touch $@
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all -v
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -69,4 +61,4 @@ binary-arch: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary patch unpatch install
+.PHONY: build clean binary-indep binary-arch binary install
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
