Package: txt2regex
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.
Thanks,
Jari
>From 1b4790b3727c94babbe7c9b5e23b8ed25d8f42d9 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Fri, 13 Apr 2012 23:19:51 +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 | 16 +++++++++
debian/compat | 2 +-
debian/control | 11 +++---
debian/copyright | 12 +++----
debian/patches/00list | 4 ---
debian/patches/01-fix-makefile.patch | 15 ++++++++
debian/patches/01_fix_makefile.dpatch | 37 --------------------
...2_add_fr_FR.po.dpatch => 02-add-fr-FR.po.patch} | 8 ++---
.../{03_add_ca.po.dpatch => 03-add-ca.po.patch} | 8 ++---
.../{04_bash_3_1.dpatch => 04-bash-3-1.patch} | 8 ++---
debian/patches/series | 4 +++
debian/rules | 13 ++++---
debian/source/format | 1 +
13 files changed, 61 insertions(+), 78 deletions(-)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/01-fix-makefile.patch
delete mode 100644 debian/patches/01_fix_makefile.dpatch
rename debian/patches/{02_add_fr_FR.po.dpatch => 02-add-fr-FR.po.patch} (98%)
rename debian/patches/{03_add_ca.po.dpatch => 03-add-ca.po.patch} (97%)
rename debian/patches/{04_bash_3_1.dpatch => 04-bash-3-1.patch} (71%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 93735ff..2b3bca4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+txt2regex (0.8-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.1 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix debian-rules-ignores-make-clean-error (Lintian).
+ * Fix old-fsf-address-in-copyright-file (Lintian).
+ * Fix capitalization-error-in-description for Python (Lintian)
+ * Fix no-homepage-field (Lintian).
+ * Fix debian-rules-ignores-make-clean-error (Lintian).
+ * Fix description-synopsis-starts-with-article (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Fri, 13 Apr 2012 23:08:51 +0300
+
txt2regex (0.8-4) unstable; urgency=low
* fix 02_add_fr_FR.po.dpatch and 03_add_ca.po.dpatch to apply
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index 9f6ee3f..69f5c93 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,16 @@ Source: txt2regex
Section: utils
Priority: optional
Maintainer: Rene Engelhard <r...@debian.org>
-Build-Depends: debhelper (>> 4.0.0), gettext, dpatch
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 9), gettext
+Standards-Version: 3.9.3
+Homepage: http://freecode.com/projects/txt2regex
Package: txt2regex
Architecture: all
Depends: bash (>> 2.04), ${misc:Depends}
-Description: A Regular Expression "wizard", all written with bash2 builtins
+Description: regular expression "wizard" written with bash2 builtins
^txt2regex$ is a Regular Expression "wizard", all written with bash2
builtins, that converts human sentences to RegExs. With a simple
interface, you just answer to questions and build your own RegEx for a
- large variety of programs, like awk, emacs, grep, perl, php, procmail,
- python, sed and vim. There are more than 20 supported programs.
+ large variety of programs, like awk, Emacs, grep, Perl, php, procmail,
+ Python, sed and Vim. There are more than 20 supported programs.
diff --git a/debian/copyright b/debian/copyright
index f431f9f..66ca642 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
This package was debianized by Martin Butterweck <ble...@debian.org> on
Wed, 9 Jan 2002 13:58:19 +0100.
-It was downloaded from http://txt2regex.sourceforge.net/
+It was downloaded from http://txt2regex.sourceforge.net
Upstream Author: aurélio marinho jargas <ve...@verde666.org>
@@ -15,13 +15,9 @@ later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+GNU General Public License for more details at
+<http://www.gnu.org/licenses/>.
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 3501d2d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_fix_makefile
-02_add_fr_FR.po
-03_add_ca.po
-04_bash_3_1
diff --git a/debian/patches/01-fix-makefile.patch b/debian/patches/01-fix-makefile.patch
new file mode 100644
index 0000000..1a8d788
--- /dev/null
+++ b/debian/patches/01-fix-makefile.patch
@@ -0,0 +1,15 @@
+From: Rene Engelhard <r...@debian.org>
+Subject: fix install target in Makefile
+
+diff -urNad /home/rene/Debian/Pakete/txt2regex/txt2regex-0.7/Makefile txt2regex-0.7/Makefile
+--- /home/rene/Debian/Pakete/txt2regex/txt2regex-0.7/Makefile 2003-04-23 18:29:40.000000000 +0200
++++ txt2regex-0.7/Makefile 2003-04-23 18:42:16.000000000 +0200
+@@ -94,7 +94,7 @@
+ [ -d $$modir ] || mkdir -p $$modir; \
+ install -m644 $(PODIR)/$$pot $$modir/$(NAME).mo; \
+ done; \
+- sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(LOCALEDIR),' \
++ sed -e '/^TEXTDOMAINDIR=/s,=.*,=/usr/share/locale,' \
+ -e '/^VERSION=/s/=.*/=$(VERSION)/' $(SHSKEL) > $(BINDIR)/$(NAME) && \
+ chmod +x $(BINDIR)/$(NAME) && \
+ echo "program '$(NAME)' installed. just run $(BINDIR)/$(NAME)"
diff --git a/debian/patches/01_fix_makefile.dpatch b/debian/patches/01_fix_makefile.dpatch
deleted file mode 100644
index 94875ef..0000000
--- a/debian/patches/01_fix_makefile.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-## 01_fix_makefile.dpatch by Rene Engelhard <r...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix install target in Makefile
-
-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 -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/rene/Debian/Pakete/txt2regex/txt2regex-0.7/Makefile txt2regex-0.7/Makefile
---- /home/rene/Debian/Pakete/txt2regex/txt2regex-0.7/Makefile 2003-04-23 18:29:40.000000000 +0200
-+++ txt2regex-0.7/Makefile 2003-04-23 18:42:16.000000000 +0200
-@@ -94,7 +94,7 @@
- [ -d $$modir ] || mkdir -p $$modir; \
- install -m644 $(PODIR)/$$pot $$modir/$(NAME).mo; \
- done; \
-- sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(LOCALEDIR),' \
-+ sed -e '/^TEXTDOMAINDIR=/s,=.*,=/usr/share/locale,' \
- -e '/^VERSION=/s/=.*/=$(VERSION)/' $(SHSKEL) > $(BINDIR)/$(NAME) && \
- chmod +x $(BINDIR)/$(NAME) && \
- echo "program '$(NAME)' installed. just run $(BINDIR)/$(NAME)"
diff --git a/debian/patches/02_add_fr_FR.po.dpatch b/debian/patches/02-add-fr-FR.po.patch
similarity index 98%
rename from debian/patches/02_add_fr_FR.po.dpatch
rename to debian/patches/02-add-fr-FR.po.patch
index 25cef56..f2c7d56 100644
--- a/debian/patches/02_add_fr_FR.po.dpatch
+++ b/debian/patches/02-add-fr-FR.po.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_add_fr_FR.po.dpatch by <rene@zero>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Rene Engelhard <rene@zero>
+Subject: No description.
-@DPATCH@
diff -urNad txt2regex-0.8/po/fr_FR.po /tmp/dpep.GH6Pdp/txt2regex-0.8/po/fr_FR.po
--- txt2regex-0.8/po/fr_FR.po 1970-01-01 01:00:00.000000000 +0100
+++ txt2regex-0.8/po/fr_FR.po 2004-09-29 21:21:24.000000000 +0200
diff --git a/debian/patches/03_add_ca.po.dpatch b/debian/patches/03-add-ca.po.patch
similarity index 97%
rename from debian/patches/03_add_ca.po.dpatch
rename to debian/patches/03-add-ca.po.patch
index db64580..2018a39 100644
--- a/debian/patches/03_add_ca.po.dpatch
+++ b/debian/patches/03-add-ca.po.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_add_ca_CA.po.dpatch by <rene@zero>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Rene Engelhard <rene@zero>
+Subject: No description.
-@DPATCH@
diff -urNad txt2regex-0.8/po/ca.po /tmp/dpep.iwtAuJ/txt2regex-0.8/po/ca.po
--- txt2regex-0.8/po/ca.po 1970-01-01 01:00:00.000000000 +0100
+++ txt2regex-0.8/po/ca.po 2004-11-17 16:06:34.000000000 +0100
diff --git a/debian/patches/04_bash_3_1.dpatch b/debian/patches/04-bash-3-1.patch
similarity index 71%
rename from debian/patches/04_bash_3_1.dpatch
rename to debian/patches/04-bash-3-1.patch
index bc32948..d663958 100644
--- a/debian/patches/04_bash_3_1.dpatch
+++ b/debian/patches/04-bash-3-1.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_bash_3_1.dpatch by <rene@frodo>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Rene Engelhard <rene@frodo>
+Subject: No description.
-@DPATCH@
diff -urNad txt2regex-0.8~/txt2regex-0.8.sh txt2regex-0.8/txt2regex-0.8.sh
--- txt2regex-0.8~/txt2regex-0.8.sh 2004-09-28 21:51:01.000000000 +0200
+++ txt2regex-0.8/txt2regex-0.8.sh 2006-01-23 23:23:53.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..add7189
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01-fix-makefile.patch
+02-add-fr-FR.po.patch
+03-add-ca.po.patch
+04-bash-3-1.patch
diff --git a/debian/rules b/debian/rules
index 31bea5f..5bcd0ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,24 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: configure-stamp
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- -$(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) clean
rm -f po/*.mo
dh_clean
@@ -23,7 +26,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/txt2regex
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
