As we spoke before, here is the proposed NMU patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload with these changes.
Thanks,
Jari
>From dee51d5383090d08168d1363c0420719651a5471 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 25 Feb 2012 07:31:22 -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/README.source | 2 --
debian/changelog | 11 +++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
.../{01_album.1.dpatch => 01_album.1.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 5 ++---
debian/source/format | 1 +
9 files changed, 20 insertions(+), 15 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_album.1.dpatch => 01_album.1.patch} (76%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 998de28..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-This package uses dpatch to fix some errors.
-To know more about dpatch, see /usr/share/doc/dpatch/README.source.gz file.
diff --git a/debian/changelog b/debian/changelog
index 0fb8385..5db776a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+album (4.06-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ - Upgrade to packaging format "3.0 quilt".
+ * debian/rules:
+ - Remove dpatch.
+ * debian/control:
+ - Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 25 Feb 2012 07:29:03 -0500
+
album (4.06-2) unstable; urgency=low
* debian/control:
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 0439f8b..1046562 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: album
Section: non-free/web
Priority: extra
Maintainer: Joao Eriberto Mota Filho <eribe...@eriberto.pro.br>
-Build-Depends: debhelper (>= 7), dpatch
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/debian-br-team/packages/album
Vcs-Browser: http://svn.debian.org/wsvn/debian-br-team/packages/album
Homepage: http://marginalhacks.com/Hacks/album
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 06edf35..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_album.1.dpatch
diff --git a/debian/patches/01_album.1.dpatch b/debian/patches/01_album.1.patch
similarity index 76%
rename from debian/patches/01_album.1.dpatch
rename to debian/patches/01_album.1.patch
index 099fedb..7829882 100644
--- a/debian/patches/01_album.1.dpatch
+++ b/debian/patches/01_album.1.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_album.1.dpatch by Joao Eriberto Mota Filho <eribe...@eriberto.pro.br>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix album.1.
+From: Joao Eriberto Mota Filho <eribe...@eriberto.pro.br>
+Subject: Fix album.1.
-@DPATCH@
diff -urNad album-4.06~/album.1 album-4.06/album.1
--- album-4.06~/album.1 2010-01-06 18:14:33.000000000 -0200
+++ album-4.06/album.1 2010-01-06 18:15:36.000000000 -0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6f0782e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_album.1.patch
diff --git a/debian/rules b/debian/rules
index 0970ad2..8e72d20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,18 +4,17 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
DESTDIR = $(CURDIR)/debian/album
-clean: unpatch
+clean:
dh_testdir
dh_testroot
dh_clean
build:
-install: patch-stamp
+install:
dh_testdir
dh_testroot
dh_prep
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
