Package: qmc
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 0f3b359409e58018c44f5b0aaf65f8b28b3ffa59 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Fri, 13 Apr 2012 22:47:02 +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 | 11 ++++++++
debian/compat | 2 +-
debian/control | 4 +--
debian/copyright | 7 +++--
debian/patches/00list | 2 --
debian/patches/01-wish-in-shebang.patch | 14 ++++++++++
debian/patches/01_wish_in_shebang.dpatch | 36 ------------------------
debian/patches/02-run-sensible-browser.patch | 15 ++++++++++
debian/patches/02_run_sensible-browser.dpatch | 37 -------------------------
debian/patches/series | 2 ++
debian/rules | 11 +++++---
debian/source/format | 1 +
12 files changed, 58 insertions(+), 84 deletions(-)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/01-wish-in-shebang.patch
delete mode 100644 debian/patches/01_wish_in_shebang.dpatch
create mode 100644 debian/patches/02-run-sensible-browser.patch
delete mode 100644 debian/patches/02_run_sensible-browser.dpatch
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 419ddad..fc43073 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+qmc (0.94-3.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-without-copyright-notice (Lintian).
+ * Fix copyright-refers-to-symlink-license (Lintian).
+
+ -- Jari Aalto <[email protected]> Fri, 13 Apr 2012 22:42:33 +0300
+
qmc (0.94-3) unstable; urgency=low
* Suggest only www-browser again, this in the real virtual package
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 9081855..ecabb2d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: qmc
Section: science
Priority: optional
Maintainer: Rene Engelhard <[email protected]>
-Build-Depends: debhelper (>= 4.0.0), dpatch
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: qmc
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 06dc5cf..08a14a1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,14 @@
This package was debianized by Rene Engelhard <[email protected]> on
Sun, 2 Nov 2003 01:24:58 +0100.
-It was downloaded from http://qmc.pollaknet.at/
+It was downloaded from http://qmc.pollaknet.at/ which as of
+2012-04-13 no longer exists.
Upstream Author: Thomas Pollak <[email protected]>
Copyright:
+ Copyright (C) 2000 Thomas Pollak <[email protected]>
+
GNU GPL, on Debian systems you can find the full text of the GPL
-under /usr/share/common-licenses/GPL
+under /usr/share/common-licenses/GPL-2
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 6ba9c10..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_wish_in_shebang
-02_run_sensible-browser
diff --git a/debian/patches/01-wish-in-shebang.patch b/debian/patches/01-wish-in-shebang.patch
new file mode 100644
index 0000000..79e4a05
--- /dev/null
+++ b/debian/patches/01-wish-in-shebang.patch
@@ -0,0 +1,14 @@
+From: Rene Engelhard <[email protected]>
+Subject: No description.
+
+diff -urNad /home/rene/Debian/Pakete/ITP/qmc/qmc-0.94/qmc-gui.tcl qmc-0.94/qmc-gui.tcl
+--- /home/rene/Debian/Pakete/ITP/qmc/qmc-0.94/qmc-gui.tcl 2003-10-30 16:30:21.000000000 +0100
++++ qmc-0.94/qmc-gui.tcl 2003-12-03 04:45:56.000000000 +0100
+@@ -1,6 +1,4 @@
+-#!/bin/sh
+-#\
+-exec wish "$0"
++#!/usr/bin/wish
+
+ set qmc(status) "Status: waiting for input"
+ set qmc(output) ""
diff --git a/debian/patches/01_wish_in_shebang.dpatch b/debian/patches/01_wish_in_shebang.dpatch
deleted file mode 100644
index 29f3dcb..0000000
--- a/debian/patches/01_wish_in_shebang.dpatch
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh -e
-## 01_wish_in_shebang.dpatch by Rene Engelhard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-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/ITP/qmc/qmc-0.94/qmc-gui.tcl qmc-0.94/qmc-gui.tcl
---- /home/rene/Debian/Pakete/ITP/qmc/qmc-0.94/qmc-gui.tcl 2003-10-30 16:30:21.000000000 +0100
-+++ qmc-0.94/qmc-gui.tcl 2003-12-03 04:45:56.000000000 +0100
-@@ -1,6 +1,4 @@
--#!/bin/sh
--#\
--exec wish "$0"
-+#!/usr/bin/wish
-
- set qmc(status) "Status: waiting for input"
- set qmc(output) ""
diff --git a/debian/patches/02-run-sensible-browser.patch b/debian/patches/02-run-sensible-browser.patch
new file mode 100644
index 0000000..570f83e
--- /dev/null
+++ b/debian/patches/02-run-sensible-browser.patch
@@ -0,0 +1,15 @@
+From: Rene Engelhard <[email protected]>
+Subject: No description.
+
+diff -urNad /home/rene/Debian/Pakete/ITP/qmc/qmc-0.94/qmc-gui.tcl qmc-0.94/qmc-gui.tcl
+--- /home/rene/Debian/Pakete/ITP/qmc/qmc-0.94/qmc-gui.tcl 2003-10-30 16:30:21.000000000 +0100
++++ qmc-0.94/qmc-gui.tcl 2003-12-03 04:45:12.000000000 +0100
+@@ -13,7 +13,7 @@
+
+ if {$qmc(opt_browser) > 0} {
+ exec "qmc" -G $qmc(opt_time) $qmc(opt_av_ast) -s $qmc(equation) > ~/.qmc_gui_tmp
+- exec "konqueror" "~/.qmc_gui_tmp" &
++ exec "sensible-browser" "~/.qmc_gui_tmp" &
+ } else {
+ exec "qmc" $qmc(opt_table) $qmc(opt_time) $qmc(opt_av_ast) -s $qmc(equation) > ~/.qmc_gui_tmp
+ set fp [open "~/.qmc_gui_tmp" r]
diff --git a/debian/patches/02_run_sensible-browser.dpatch b/debian/patches/02_run_sensible-browser.dpatch
deleted file mode 100644
index ed455bf..0000000
--- a/debian/patches/02_run_sensible-browser.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-## 02_run_sensible-browser.dpatch by Rene Engelhard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-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/ITP/qmc/qmc-0.94/qmc-gui.tcl qmc-0.94/qmc-gui.tcl
---- /home/rene/Debian/Pakete/ITP/qmc/qmc-0.94/qmc-gui.tcl 2003-10-30 16:30:21.000000000 +0100
-+++ qmc-0.94/qmc-gui.tcl 2003-12-03 04:45:12.000000000 +0100
-@@ -13,7 +13,7 @@
-
- if {$qmc(opt_browser) > 0} {
- exec "qmc" -G $qmc(opt_time) $qmc(opt_av_ast) -s $qmc(equation) > ~/.qmc_gui_tmp
-- exec "konqueror" "~/.qmc_gui_tmp" &
-+ exec "sensible-browser" "~/.qmc_gui_tmp" &
- } else {
- exec "qmc" $qmc(opt_table) $qmc(opt_time) $qmc(opt_av_ast) -s $qmc(equation) > ~/.qmc_gui_tmp
- set fp [open "~/.qmc_gui_tmp" r]
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..527e255
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-wish-in-shebang.patch
+02-run-sensible-browser.patch
diff --git a/debian/rules b/debian/rules
index 2a623ff..7170e42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
CFLAGS = -Wall -g
@@ -18,11 +17,15 @@ CXX=g++
CFLAGS+= -I.
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
dh_testdir
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: configure-stamp
@@ -31,7 +34,7 @@ build-stamp: configure-stamp
for i in *.cc; do $(CXX) $(CFLAGS) -c $$i; done && $(CXX) -o qmc *.o
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -42,7 +45,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
install -m755 qmc debian/qmc/usr/bin
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
