Package: sloccount
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 982f82bd64c1eece349a0f0c85ec6aa927d64952 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 11 Apr 2012 13:24:28 +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/README.source | 4 ----
debian/changelog | 9 +++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 8 --------
..._code.dpatch => 01_restore_pristine_code.patch} | 8 ++------
...{10_fix_manpage.dpatch => 10_fix_manpage.patch} | 7 ++-----
...rt.dpatch => 20_bts462392_erlang_support.patch} | 7 ++-----
...patch => 30_bts466827_enhance_bison_flex.patch} | 7 ++-----
...h => 40_bts281293_ignore_autotools_files.patch} | 7 ++-----
...ze.dpatch => 50_bts379448_ruby_recognize.patch} | 7 ++-----
...port.dpatch => 60_bts508557_vhdl_support.patch} | 8 ++------
...pport.dpatch => 70_bts508556_xml_support.patch} | 8 ++------
debian/patches/series | 8 ++++++++
debian/rules | 11 +++++++----
debian/source/format | 1 +
16 files changed, 44 insertions(+), 62 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_restore_pristine_code.dpatch => 01_restore_pristine_code.patch} (99%)
rename debian/patches/{10_fix_manpage.dpatch => 10_fix_manpage.patch} (87%)
rename debian/patches/{20_bts462392_erlang_support.dpatch => 20_bts462392_erlang_support.patch} (92%)
rename debian/patches/{30_bts466827_enhance_bison_flex.dpatch => 30_bts466827_enhance_bison_flex.patch} (91%)
rename debian/patches/{40_bts281293_ignore_autotools_files.dpatch => 40_bts281293_ignore_autotools_files.patch} (89%)
rename debian/patches/{50_bts379448_ruby_recognize.dpatch => 50_bts379448_ruby_recognize.patch} (73%)
rename debian/patches/{60_bts508557_vhdl_support.dpatch => 60_bts508557_vhdl_support.patch} (89%)
rename debian/patches/{70_bts508556_xml_support.dpatch => 70_bts508556_xml_support.patch} (94%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 0d0aa40..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-This package uses dpatch to handle patches against upstream source code; you
-can find additional information about dpatch at
-
- /usr/share/doc/dpatch/
diff --git a/debian/changelog b/debian/changelog
index 95add05..992d6ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sloccount (2.26-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.1 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Wed, 11 Apr 2012 13:21:24 +0300
+
sloccount (2.26-5) unstable; urgency=low
* New maintainer (Closes: #634212).
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 a50096b..c086762 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: sloccount
Section: devel
Priority: optional
Maintainer: Uwe Hermann <u...@debian.org>
-Build-Depends: debhelper (>= 5), flex, dpatch
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), flex
+Standards-Version: 3.9.3.1
Homepage: http://www.dwheeler.com/sloccount/
Package: sloccount
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 8b13142..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,8 +0,0 @@
-01_restore_pristine_code
-10_fix_manpage
-20_bts462392_erlang_support
-30_bts466827_enhance_bison_flex
-40_bts281293_ignore_autotools_files
-50_bts379448_ruby_recognize
-60_bts508557_vhdl_support
-70_bts508556_xml_support
diff --git a/debian/patches/01_restore_pristine_code.dpatch b/debian/patches/01_restore_pristine_code.patch
similarity index 99%
rename from debian/patches/01_restore_pristine_code.dpatch
rename to debian/patches/01_restore_pristine_code.patch
index e350ffb..c257b4a 100644
--- a/debian/patches/01_restore_pristine_code.dpatch
+++ b/debian/patches/01_restore_pristine_code.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_restore_pristine_code.dpatch by Sandro Tosi <matrixh...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from sloccount 2.26-2.1 diff.gz
+From: Sandro Tosi <matrixh...@gmail.com>
+Subject: New patch generated from sloccount 2.26-2.1 diff.gz
-@DPATCH@
--- sloccount-2.26.orig/jsp_count.c
+++ sloccount-2.26/jsp_count.c
diff --git a/debian/patches/10_fix_manpage.dpatch b/debian/patches/10_fix_manpage.patch
similarity index 87%
rename from debian/patches/10_fix_manpage.dpatch
rename to debian/patches/10_fix_manpage.patch
index 9e74dec..af34701 100644
--- a/debian/patches/10_fix_manpage.dpatch
+++ b/debian/patches/10_fix_manpage.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_fix_manpage.dpatch by Sandro Tosi <matrixh...@gmail.com>
-##
-## DP: Fix minus signes used as hyphen (lintian warning
+From: Sandro Tosi <matrixh...@gmail.com>
+Subject: Fix minus signes used as hyphen (lintian warning
-@DPATCH@
diff -urNad sloccount~/sloccount.1 sloccount/sloccount.1
--- sloccount~/sloccount.1 2008-02-17 16:49:52.000000000 +0100
+++ sloccount/sloccount.1 2008-03-16 14:49:07.188245715 +0100
diff --git a/debian/patches/20_bts462392_erlang_support.dpatch b/debian/patches/20_bts462392_erlang_support.patch
similarity index 92%
rename from debian/patches/20_bts462392_erlang_support.dpatch
rename to debian/patches/20_bts462392_erlang_support.patch
index 14568c1..2610ac9 100644
--- a/debian/patches/20_bts462392_erlang_support.dpatch
+++ b/debian/patches/20_bts462392_erlang_support.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_bts462392_erlang_support.dpatch by Michael Gebetsroither <g...@grml.org>
-##
-## DP: BTS 462392: add support to Erlang
+From: Michael Gebetsroither <g...@grml.org>
+Subject: BTS 462392: add support to Erlang
-@DPATCH@
diff -urNad sloccount~/break_filelist sloccount/break_filelist
--- sloccount~/break_filelist 2008-02-17 16:49:52.000000000 +0100
+++ sloccount/break_filelist 2009-01-23 23:35:43.507253080 +0100
diff --git a/debian/patches/30_bts466827_enhance_bison_flex.dpatch b/debian/patches/30_bts466827_enhance_bison_flex.patch
similarity index 91%
rename from debian/patches/30_bts466827_enhance_bison_flex.dpatch
rename to debian/patches/30_bts466827_enhance_bison_flex.patch
index a684d45..e60f4da 100644
--- a/debian/patches/30_bts466827_enhance_bison_flex.dpatch
+++ b/debian/patches/30_bts466827_enhance_bison_flex.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_bts466827_enhance_bison_flex.dpatch by Ronald Aigner <r...@os.inf.tu-dresden.de>
-##
-## DP: Enhance the recognition of bison/flex source files
+From: Ronald Aigner <r...@os.inf.tu-dresden.de>
+Subject: Enhance the recognition of bison/flex source files
-@DPATCH@
diff -u sloccount-2.26/break_filelist sloccount-2.26-bison-flex/break_filelist
--- sloccount-2.26/break_filelist 2004-08-01 06:17:28.000000000 +0200
diff --git a/debian/patches/40_bts281293_ignore_autotools_files.dpatch b/debian/patches/40_bts281293_ignore_autotools_files.patch
similarity index 89%
rename from debian/patches/40_bts281293_ignore_autotools_files.dpatch
rename to debian/patches/40_bts281293_ignore_autotools_files.patch
index d5979a5..b8b1490 100644
--- a/debian/patches/40_bts281293_ignore_autotools_files.dpatch
+++ b/debian/patches/40_bts281293_ignore_autotools_files.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_bts281293_ignore_autotools_files.dpatch by Ronald Aigner <r...@os.inf.tu-dresden.de>
-##
-## DP: Ignore autotools generated files
+From: Ronald Aigner <r...@os.inf.tu-dresden.de>
+Subject: Ignore autotools generated files
-@DPATCH@
diff -u sloccount-2.26/break_filelist sloccount-2.26-autotool/break_filelist
--- sloccount-2.26/break_filelist 2004-08-01 06:17:28.000000000 +0200
diff --git a/debian/patches/50_bts379448_ruby_recognize.dpatch b/debian/patches/50_bts379448_ruby_recognize.patch
similarity index 73%
rename from debian/patches/50_bts379448_ruby_recognize.dpatch
rename to debian/patches/50_bts379448_ruby_recognize.patch
index 625ab42..7d2c546 100644
--- a/debian/patches/50_bts379448_ruby_recognize.dpatch
+++ b/debian/patches/50_bts379448_ruby_recognize.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_bts379448_ruby_recognize.dpatch by Ronald Aigner <r...@os.inf.tu-dresden.de>
-##
-## DP: Recognize ruby script by shebang
+From: Ronald Aigner <r...@os.inf.tu-dresden.de>
+Subject: Recognize ruby script by shebang
-@DPATCH@
diff -u sloccount-2.26/break_filelist sloccount-2.26-ruby/break_filelist
--- sloccount-2.26/break_filelist 2004-08-01 06:17:28.000000000 +0200
diff --git a/debian/patches/60_bts508557_vhdl_support.dpatch b/debian/patches/60_bts508557_vhdl_support.patch
similarity index 89%
rename from debian/patches/60_bts508557_vhdl_support.dpatch
rename to debian/patches/60_bts508557_vhdl_support.patch
index 8051188..711ba2c 100644
--- a/debian/patches/60_bts508557_vhdl_support.dpatch
+++ b/debian/patches/60_bts508557_vhdl_support.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60_bts508557_vhdl_support.dpatch by Elie De Brauwer <e...@newtec.eu>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Enable VHDL support
+From: Elie De Brauwer <e...@newtec.eu>
+Subject: Enable VHDL support
-@DPATCH@
diff -urNad sloccount~/break_filelist sloccount/break_filelist
--- sloccount~/break_filelist 2009-01-23 23:53:57.091752874 +0100
+++ sloccount/break_filelist 2009-01-23 23:53:57.183752871 +0100
diff --git a/debian/patches/70_bts508556_xml_support.dpatch b/debian/patches/70_bts508556_xml_support.patch
similarity index 94%
rename from debian/patches/70_bts508556_xml_support.dpatch
rename to debian/patches/70_bts508556_xml_support.patch
index 78392b1..2a9ab1e 100644
--- a/debian/patches/70_bts508556_xml_support.dpatch
+++ b/debian/patches/70_bts508556_xml_support.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_bts508556_xml_support.dpatch by Elie De Brauwer <e...@newtec.eu>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Enable XML support
+From: Elie De Brauwer <e...@newtec.eu>
+Subject: Enable XML support
-@DPATCH@
diff -urNad sloccount~/break_filelist sloccount/break_filelist
--- sloccount~/break_filelist 2009-01-23 23:59:58.843753006 +0100
+++ sloccount/break_filelist 2009-01-24 00:01:05.027752302 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..268616b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,8 @@
+01_restore_pristine_code.patch
+10_fix_manpage.patch
+20_bts462392_erlang_support.patch
+30_bts466827_enhance_bison_flex.patch
+40_bts281293_ignore_autotools_files.patch
+50_bts379448_ruby_recognize.patch
+60_bts508557_vhdl_support.patch
+70_bts508556_xml_support.patch
diff --git a/debian/rules b/debian/rules
index 66e7a9a..40264a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
LINKMANPAGES= \
break_filelist \
@@ -54,8 +53,12 @@ LINKMANPAGES_GC= \
sh_count \
tcl_count
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
# Add here commands to compile the package.
@@ -63,7 +66,7 @@ build-stamp: patch-stamp
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -80,7 +83,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs usr/bin
# Add here commands to install the package into debian/sloccount.
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.5
