Package: cfi
Followup-For: Bug #661031
See attached patch to migrate to new package format. Note that all
files in debian/patches/* are canocalized to *.patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (990, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-1-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
>From a13ee61ae26cb914032d3ce11c539998af76ff0d Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 25 Feb 2012 07:39:28 -0500
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 | 11 +++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 2 --
debian/patches/{10_cfi.dpatch => 10_cfi.patch} | 7 ++-----
.../{20_ch17web.dpatch => 20_ch17web.patch} | 7 ++-----
debian/patches/series | 2 ++
debian/rules | 9 +++------
debian/source/format | 1 +
9 files changed, 24 insertions(+), 21 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{10_cfi.dpatch => 10_cfi.patch} (77%)
rename debian/patches/{20_ch17web.dpatch => 20_ch17web.patch} (86%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index dc04db0..436e167 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+cfi (3.0-8.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ Upgrade to packaging format "3.0 quilt".
+ * debian/rules: Remove dpatch.
+ * debian/control: (Standards-Version) Bumped to 3.9.3.
+ (Build-Depends): Update debhelper to 9.
+ * debian/patches: Convert to quilt format.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 25 Feb 2012 07:38:20 -0500
+
cfi (3.0-8) unstable; urgency=low
* New maintainer (closes: #488603)
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 169ff11..c7e9ab1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: cfi
Section: doc
Priority: optional
Maintainer: Krzysztof Burghardt <krzysz...@burghardt.pl>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: texlive
-Standards-Version: 3.8.0
+Standards-Version: 3.9.3
Package: cfi-sv
Architecture: all
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index fbd5ba6..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-10_cfi.dpatch
-20_ch17web.dpatch
diff --git a/debian/patches/10_cfi.dpatch b/debian/patches/10_cfi.patch
similarity index 77%
rename from debian/patches/10_cfi.dpatch
rename to debian/patches/10_cfi.patch
index 8dfeb8f..32b56f5 100644
--- a/debian/patches/10_cfi.dpatch
+++ b/debian/patches/10_cfi.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_cfi.dpatch by Krzysztof Burghardt <krzysz...@burghardt.pl>
-##
-## DP: Use ifpdf package for pdflatex detection.
+From: Krzysztof Burghardt <krzysz...@burghardt.pl>
+Subject: Use ifpdf package for pdflatex detection.
-@DPATCH@
diff -urNad cfi-3.0~/sv/cfi.tex cfi-3.0/sv/cfi.tex
--- cfi-3.0~/sv/cfi.tex 2001-06-13 14:17:24.000000000 +0200
+++ cfi-3.0/sv/cfi.tex 2008-09-17 22:00:18.347906664 +0200
diff --git a/debian/patches/20_ch17web.dpatch b/debian/patches/20_ch17web.patch
similarity index 86%
rename from debian/patches/20_ch17web.dpatch
rename to debian/patches/20_ch17web.patch
index c12c24f..ad9aa14 100644
--- a/debian/patches/20_ch17web.dpatch
+++ b/debian/patches/20_ch17web.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_ch17web.dpatch by Krzysztof Burghardt <krzysz...@burghardt.pl>
-##
-## DP: Fix upercase filename in link.
+From: Krzysztof Burghardt <krzysz...@burghardt.pl>
+Subject: Fix upercase filename in link.
-@DPATCH@
diff -urNad cfi-3.0~/en/ch17web.htm cfi-3.0/en/ch17web.htm
--- cfi-3.0~/en/ch17web.htm 2001-06-13 14:17:24.000000000 +0200
+++ cfi-3.0/en/ch17web.htm 2008-09-17 22:01:07.983900066 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3d2a9da
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10_cfi.patch
+20_ch17web.patch
diff --git a/debian/rules b/debian/rules
index 4ec0e3d..0eb21fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,16 +4,13 @@
#export DH_VERBOSE=1
# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
-build: build-stamp
-build-stamp: patch-stamp
+build:
dh_testdir
cd sv && latex cfi
touch build-stamp
-clean: clean-real unpatch
-clean-real:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -49,4 +46,4 @@ binary-arch: build install
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install \
- unpatch clean-real
+ clean-real
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
