Package: texpower
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 638ea4577650745d33265f7f349330fdfde4419c Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 14 Apr 2012 00:47:04 +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 | 12 ++++++++
debian/compat | 2 +-
debian/control | 6 ++--
debian/copyright | 6 ++--
debian/patches/00list | 5 ----
debian/patches/{01_set_e.dpatch => 01-set-e.patch} | 8 ++---
debian/patches/02-no-redirect.patch | 30 +++++++++++++++++++
debian/patches/02_no_redirect.dpatch | 31 --------------------
.../{03_tpslifonts.dpatch => 03-tpslifonts.patch} | 21 +++++++------
debian/patches/04-no-pp4.patch | 17 +++++++++++
debian/patches/04_no_pp4.dpatch | 18 ------------
debian/patches/05-no-foilsdemo.patch | 17 +++++++++++
debian/patches/05_no_foilsdemo.dpatch | 18 ------------
debian/patches/series | 6 ++++
debian/rules | 7 ++---
debian/source/format | 1 +
16 files changed, 105 insertions(+), 100 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_set_e.dpatch => 01-set-e.patch} (67%)
create mode 100644 debian/patches/02-no-redirect.patch
delete mode 100644 debian/patches/02_no_redirect.dpatch
rename debian/patches/{03_tpslifonts.dpatch => 03-tpslifonts.patch} (51%)
create mode 100644 debian/patches/04-no-pp4.patch
delete mode 100644 debian/patches/04_no_pp4.dpatch
create mode 100644 debian/patches/05-no-foilsdemo.patch
delete mode 100644 debian/patches/05_no_foilsdemo.dpatch
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index fe161d0..8da6948 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+texpower (0.2-7.2) 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).
+ * New patch 00: in-line changes to original sources.
+ * Update patches with "quilt refresh" to make them apply cleanly.
+
+ -- Jari Aalto <[email protected]> Sat, 14 Apr 2012 00:26:49 +0300
+
texpower (0.2-7.1) unstable; urgency=low
* Non-maintainer upload.
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 094e7d4..2a96cd4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: tex
Priority: optional
Maintainer: Rene Engelhard <[email protected]>
Build-Depends-Indep: texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra, ghostscript, tex-common, texlive-math-extra, context, texlive-pstricks, prosper
-Build-Depends: debhelper (>> 4.0.0), dpatch
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: texpower
Architecture: all
@@ -44,7 +44,7 @@ Description: manual for the TeXpower macro bundle
Package: texpower-examples
Architecture: all
Section: doc
-Depends: xpdf | pdf-viewer
+Depends: ${misc:Depends}, xpdf | pdf-viewer
Recommends: texpower
Replaces: texpower (<= 0.0.8h-7)
Description: TeXpower examples
diff --git a/debian/copyright b/debian/copyright
index 70acd29..3251423 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,7 @@ Upstream Author: Stephan Lehmke <[email protected]>
Copyright:
GPL, on Debian systems you can find the full text of the GPL in
-/usr/share/common-licenses/GPL
+/usr/share/common-licenses/GPL-2
The texpower distribution contains a contrib directory with different
copyright, as described below.
@@ -22,7 +22,7 @@ Upstream Author: Holger Wenzel <[email protected]>
Copyright:
GPL, on Debian systems you can find the full text of the GPL in
-/usr/share/common-licenses/GPL
+/usr/share/common-licenses/GPL-2
DVIPS-LANDSCAPEPLUS
-------------------
@@ -31,7 +31,7 @@ Upstream Author: Berthold Crysmann <[email protected]>
Copyright:
GPL, on Debian systems you can find the full text of the GPL in
-/usr/share/common-licenses/GPL
+/usr/share/common-licenses/GPL-2
From [email protected] Thu Nov 14 08:35:10 2002
Return-path: <[email protected]>
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 0a21947..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-01_set_e
-02_no_redirect
-03_tpslifonts
-04_no_pp4
-05_no_foilsdemo
diff --git a/debian/patches/01_set_e.dpatch b/debian/patches/01-set-e.patch
similarity index 67%
rename from debian/patches/01_set_e.dpatch
rename to debian/patches/01-set-e.patch
index 22e6566..c7eec61 100644
--- a/debian/patches/01_set_e.dpatch
+++ b/debian/patches/01-set-e.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_set_e.dpatch by Rene Engelhard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Rene Engelhard <[email protected]>
+Subject: No description.
-@DPATCH@
diff -urNad texpower-0.2~/MakeExamples.sh texpower-0.2/MakeExamples.sh
--- texpower-0.2~/MakeExamples.sh 2007-04-24 01:16:46.000000000 +0200
+++ texpower-0.2/MakeExamples.sh 2007-05-22 10:50:33.000000000 +0200
diff --git a/debian/patches/02-no-redirect.patch b/debian/patches/02-no-redirect.patch
new file mode 100644
index 0000000..899400d
--- /dev/null
+++ b/debian/patches/02-no-redirect.patch
@@ -0,0 +1,30 @@
+From: Rene Engelhard <[email protected]>
+Subject: No description.
+
+---
+ MakeExamples.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/MakeExamples.sh
++++ b/MakeExamples.sh
+@@ -24,8 +24,8 @@
+ seminardemo
+ do
+ echo "Compiling $file.tex"
+- latex -interaction=batchmode $file.tex
+- latex -interaction=batchmode $file.tex
++ latex $file.tex
++ latex $file.tex
+ dvips $file.dvi
+ ps2pdf $file.ps
+ done
+@@ -42,7 +42,7 @@
+ slidesdemo
+ do
+ echo "Compiling $file.tex"
+- pdflatex -interaction=batchmode $file
+- pdflatex -interaction=batchmode $file
++ pdflatex $file
++ pdflatex $file
+ done
+
diff --git a/debian/patches/02_no_redirect.dpatch b/debian/patches/02_no_redirect.dpatch
deleted file mode 100644
index a5a5eba..0000000
--- a/debian/patches/02_no_redirect.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_no_redirect.dpatch by Rene Engelhard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad texpower-0.2~/MakeExamples.sh texpower-0.2/MakeExamples.sh
---- texpower-0.2~/MakeExamples.sh 2007-04-24 01:16:46.000000000 +0200
-+++ texpower-0.2/MakeExamples.sh 2007-05-22 10:51:39.000000000 +0200
-@@ -22,8 +22,8 @@
- seminardemo
- do
- echo "Compiling $file.tex"
-- latex -interaction=batchmode $file.tex
-- latex -interaction=batchmode $file.tex
-+ latex $file.tex
-+ latex $file.tex
- dvips $file.dvi
- ps2pdf $file.ps
- done
-@@ -40,7 +40,7 @@
- slidesdemo
- do
- echo "Compiling $file.tex"
-- pdflatex -interaction=batchmode $file
-- pdflatex -interaction=batchmode $file
-+ pdflatex $file
-+ pdflatex $file
- done
-
diff --git a/debian/patches/03_tpslifonts.dpatch b/debian/patches/03-tpslifonts.patch
similarity index 51%
rename from debian/patches/03_tpslifonts.dpatch
rename to debian/patches/03-tpslifonts.patch
index 6573ade..d3d8a43 100644
--- a/debian/patches/03_tpslifonts.dpatch
+++ b/debian/patches/03-tpslifonts.patch
@@ -1,14 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_tpslifonts.dpatch by Rene Engelhard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Rene Engelhard <[email protected]>
+Subject: No description.
-@DPATCH@
-diff -urNad texpower-0.2~/MakeExamples.sh texpower-0.2/MakeExamples.sh
---- texpower-0.2~/MakeExamples.sh 2007-04-24 01:16:46.000000000 +0200
-+++ texpower-0.2/MakeExamples.sh 2007-05-22 10:53:09.000000000 +0200
-@@ -22,8 +22,8 @@
+---
+ MakeExamples.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/MakeExamples.sh
++++ b/MakeExamples.sh
+@@ -24,8 +24,8 @@
seminardemo
do
echo "Compiling $file.tex"
@@ -19,7 +18,7 @@ diff -urNad texpower-0.2~/MakeExamples.sh texpower-0.2/MakeExamples.sh
dvips $file.dvi
ps2pdf $file.ps
done
-@@ -40,7 +40,7 @@
+@@ -42,7 +42,7 @@
slidesdemo
do
echo "Compiling $file.tex"
diff --git a/debian/patches/04-no-pp4.patch b/debian/patches/04-no-pp4.patch
new file mode 100644
index 0000000..c966896
--- /dev/null
+++ b/debian/patches/04-no-pp4.patch
@@ -0,0 +1,17 @@
+From: Rene Engelhard <[email protected]>
+Subject: No description.
+
+---
+ MakeExamples.sh | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/MakeExamples.sh
++++ b/MakeExamples.sh
+@@ -38,7 +38,6 @@
+ pdfslidemo \
+ simpledemo \
+ pdfscrdemo \
+- pp4sldemo \
+ slidesdemo
+ do
+ echo "Compiling $file.tex"
diff --git a/debian/patches/04_no_pp4.dpatch b/debian/patches/04_no_pp4.dpatch
deleted file mode 100644
index 8be1815..0000000
--- a/debian/patches/04_no_pp4.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_no_pp4.dpatch by Rene Engelhard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad texpower-0.2~/MakeExamples.sh texpower-0.2/MakeExamples.sh
---- texpower-0.2~/MakeExamples.sh 2007-05-22 10:58:46.000000000 +0200
-+++ texpower-0.2/MakeExamples.sh 2007-05-29 11:50:44.000000000 +0200
-@@ -36,7 +36,6 @@
- pdfslidemo \
- simpledemo \
- pdfscrdemo \
-- pp4sldemo \
- slidesdemo
- do
- echo "Compiling $file.tex"
diff --git a/debian/patches/05-no-foilsdemo.patch b/debian/patches/05-no-foilsdemo.patch
new file mode 100644
index 0000000..67d74c0
--- /dev/null
+++ b/debian/patches/05-no-foilsdemo.patch
@@ -0,0 +1,17 @@
+From: Rene Engelhard <[email protected]>
+Subject: No description.
+
+---
+ MakeExamples.sh | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/MakeExamples.sh
++++ b/MakeExamples.sh
+@@ -33,7 +33,6 @@
+ # Examples/demos which can be compiled with pdflatex:
+ for file in \
+ verbexample \
+- foilsdemo \
+ ifmslidemo \
+ pdfslidemo \
+ simpledemo \
diff --git a/debian/patches/05_no_foilsdemo.dpatch b/debian/patches/05_no_foilsdemo.dpatch
deleted file mode 100644
index 33ae9e2..0000000
--- a/debian/patches/05_no_foilsdemo.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_no_foilsdemo.dpatch by Rene Engelhard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad texpower-0.2~/MakeExamples.sh texpower-0.2/MakeExamples.sh
---- texpower-0.2~/MakeExamples.sh 2007-06-29 08:58:55.000000000 +0200
-+++ texpower-0.2/MakeExamples.sh 2007-06-29 09:38:10.000000000 +0200
-@@ -31,7 +31,6 @@
- # Examples/demos which can be compiled with pdflatex:
- for file in \
- verbexample \
-- foilsdemo \
- ifmslidemo \
- pdfslidemo \
- simpledemo \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..46df232
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+00-debian-local-changes.patch
+01-set-e.patch
+02-no-redirect.patch
+03-tpslifonts.patch
+04-no-pp4.patch
+05-no-foilsdemo.patch
diff --git a/debian/rules b/debian/rules
index 4c3deff..a9a01cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,9 @@
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
dh_testdir
touch configure-stamp
@@ -26,7 +25,7 @@ build-indep-stamp:
build: build-arch build-indep
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-arch-stamp build-indep-stamp configure-stamp
@@ -42,7 +41,7 @@ install: DH_OPTIONS=
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# install texpower
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
