Package: prosper
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 a55acfeb4c4fa97268abce0802364683ba19be56 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Fri, 20 Apr 2012 22:57:23 +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                     |   15 +++++++++++----
 debian/compat                        |    2 +-
 debian/control                       |    5 +++--
 debian/patches/00list                |    1 -
 debian/patches/01-kill-pstcol.patch  |   15 +++++++++++++++
 debian/patches/01_kill_pstcol.dpatch |   33 ---------------------------------
 debian/patches/series                |    1 +
 debian/rules                         |   12 ++++++------
 debian/source/format                 |    1 +
 debian/watch                         |    2 ++
 10 files changed, 40 insertions(+), 47 deletions(-)
 delete mode 100644 debian/patches/00list
 create mode 100644 debian/patches/01-kill-pstcol.patch
 delete mode 100644 debian/patches/01_kill_pstcol.dpatch
 create mode 100644 debian/patches/series
 create mode 100644 debian/source/format
 create mode 100644 debian/watch

diff --git a/debian/changelog b/debian/changelog
index 0192b9f..11c3691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+prosper (1.00.4+cvs.2007.05.01-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 and debhelper to 9.
+  * Add build-arch and build-indep targets; use dh_prep in rules file.
+  * Fix no-homepage-field (Lintian).
+  * Fix debian-watch-file-is-missing (Lintian).
+
+ -- Jari Aalto <[email protected]>  Fri, 20 Apr 2012 22:55:41 +0300
+
 prosper (1.00.4+cvs.2007.05.01-4) unstable; urgency=low
 
   * Bumped to Standards-Version: 3.8.0.
@@ -163,7 +174,3 @@ prosper (1.00.4-1) unstable; urgency=low
   * Initial Release. (closes: #82783)
 
  -- Adrian Bunk <[email protected]>  Fri, 16 Feb 2001 23:17:45 +0100
-
-Local variables:
-mode: debian-changelog
-End:
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 efba7c9..4168f1f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,10 @@ Source: prosper
 Section: tex
 Priority: optional
 Maintainer: Masayuki Hatta (mhatta) <[email protected]>
-Build-Depends: debhelper (>> 4.0.0), dpatch
+Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: tex-common (>= 0.16)
-Standards-Version: 3.8.0
+Standards-Version: 3.9.3
+Homepage: http://freecode.com/projects/prosper
 
 Package: prosper
 Architecture: all
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 2cc0fc4..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_kill_pstcol
diff --git a/debian/patches/01-kill-pstcol.patch b/debian/patches/01-kill-pstcol.patch
new file mode 100644
index 0000000..a96da32
--- /dev/null
+++ b/debian/patches/01-kill-pstcol.patch
@@ -0,0 +1,15 @@
+From: Masayuki Hatta <[email protected]>
+Subject: Makes prosper.cls not require pstcol, it has been causing much problem.
+
+diff -urN prosper-1.00.4+cvs.2004.03.29.orig/prosper.cls prosper-1.00.4+cvs.2004.03.29/prosper.cls
+--- prosper-1.00.4+cvs.2004.03.29.orig/prosper.cls	2004-03-29 00:03:48.000000000 +0900
++++ prosper-1.00.4+cvs.2004.03.29/prosper.cls	2004-03-29 00:04:35.000000000 +0900
+@@ -85,7 +85,7 @@
+ 
+ \ProcessOptions\relax
+ 
+-\RequirePackage{pstcol}
++%\RequirePackage{pstcol}
+ \RequirePackage{graphicx} % MUST be loaded *before* seminar
+ 
+ % Trying to detect VTeX automatically.
diff --git a/debian/patches/01_kill_pstcol.dpatch b/debian/patches/01_kill_pstcol.dpatch
deleted file mode 100644
index 0e5fae0..0000000
--- a/debian/patches/01_kill_pstcol.dpatch
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh -e
-## 01_kill_pstcol.dpatch by Masayuki Hatta <[email protected]>
-##
-## All lines beginning with \`## DP:' are a description of the patch.
-## DP: Makes prosper.cls not require pstcol, it has been causing much problem.
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-        -patch) patch -f --no-backup-if-mismatch --dry-run -p1 < $0 && patch -f --no-backup-if-mismatch -p1 < $0
-;;
-        -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-diff -urN prosper-1.00.4+cvs.2004.03.29.orig/prosper.cls prosper-1.00.4+cvs.2004.03.29/prosper.cls
---- prosper-1.00.4+cvs.2004.03.29.orig/prosper.cls	2004-03-29 00:03:48.000000000 +0900
-+++ prosper-1.00.4+cvs.2004.03.29/prosper.cls	2004-03-29 00:04:35.000000000 +0900
-@@ -85,7 +85,7 @@
- 
- \ProcessOptions\relax
- 
--\RequirePackage{pstcol}
-+%\RequirePackage{pstcol}
- \RequirePackage{graphicx} % MUST be loaded *before* seminar
- 
- % Trying to detect VTeX automatically.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ba0ba1b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-kill-pstcol.patch
diff --git a/debian/rules b/debian/rules
index 40679e1..d45305c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -15,7 +12,10 @@ configure-stamp:
 
 	touch configure-stamp
 
-build: patch configure-stamp build-stamp
+build-arch: build
+build-indep: build
+
+build: configure-stamp build-stamp
 build-stamp:
 	dh_testdir
 
@@ -23,7 +23,7 @@ build-stamp:
 
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -36,7 +36,7 @@ clean: unpatch
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	# Add here commands to install the package into debian/prosper.
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)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..e4298c7
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/prosper/prosper-(.+)\.tar\.gz
-- 
1.7.9.5

Reply via email to