Hi,
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 d6c79938a0edacaee04df160d1b1d569674a1434 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Fri, 24 Feb 2012 13:22:42 -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 | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 2 --
...ge_Makefile.dpatch => 01_change_Makefile.patch} | 8 ++------
...ation.dpatch => 02_change_level_location.patch} | 9 ++-------
debian/patches/series | 2 ++
debian/rules | 5 ++---
debian/source/format | 1 +
9 files changed, 20 insertions(+), 21 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_change_Makefile.dpatch => 01_change_Makefile.patch} (82%)
rename debian/patches/{02_change_level_location.dpatch => 02_change_level_location.patch} (71%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 3f235a3..a5e0885 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pacman4console (1.2-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Fri, 24 Feb 2012 13:21:42 -0500
+
pacman4console (1.2-2) unstable; urgency=low
* Cleaned debian/rules file.
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 7453700..6bafa0c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: pacman4console
Section: games
Priority: extra
Maintainer: Joao Eriberto Mota Filho <eribe...@eriberto.pro.br>
-Build-Depends: debhelper (>= 5), libncurses5-dev, dpatch
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5), libncurses5-dev,
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/debian-br-team/unstable/pacman4console
Vcs-Browser: http://svn.debian.org/wsvn/debian-br-team/unstable/pacman4console
Homepage: http://doctormike.googlepages.com/pacman.html
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 4151e92..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_change_Makefile.dpatch
-02_change_level_location.dpatch
diff --git a/debian/patches/01_change_Makefile.dpatch b/debian/patches/01_change_Makefile.patch
similarity index 82%
rename from debian/patches/01_change_Makefile.dpatch
rename to debian/patches/01_change_Makefile.patch
index e09b89e..bf507cd 100644
--- a/debian/patches/01_change_Makefile.dpatch
+++ b/debian/patches/01_change_Makefile.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_change_Makefile.dpatch by Joao Eriberto Mota Filho <eribe...@eriberto.pro.br>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make Makefile compliant with FHS.
+From: Joao Eriberto Mota Filho <eribe...@eriberto.pro.br>
+Subject: Make Makefile compliant with FHS.
-@DPATCH@
diff -urNad pacman4console-1.2~/Makefile pacman4console-1.2/Makefile
--- pacman4console-1.2~/Makefile 2007-07-09 01:05:30.000000000 -0300
+++ pacman4console-1.2/Makefile 2007-07-09 01:11:33.000000000 -0300
diff --git a/debian/patches/02_change_level_location.dpatch b/debian/patches/02_change_level_location.patch
similarity index 71%
rename from debian/patches/02_change_level_location.dpatch
rename to debian/patches/02_change_level_location.patch
index 599a5eb..976d061 100644
--- a/debian/patches/02_change_level_location.dpatch
+++ b/debian/patches/02_change_level_location.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_change_level_location.dpatch by Joao Eriberto Mota Filho
-## <eribe...@eriberto.pro.br>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make level location compliant with FHS
+From: Joao Eriberto Mota Filho
+Subject: Make level location compliant with FHS
-@DPATCH@
diff -Naur pacman4console-1.0.orig/pacman.h pacman4console-1.0/pacman.h
--- pacman4console-1.0.orig/pacman.h 2006-06-12 07:41:40.000000000 -0300
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e5ae6f7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_change_Makefile.patch
+02_change_level_location.patch
diff --git a/debian/rules b/debian/rules
index 0e46225..3fa9cb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,16 +3,15 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
$(MAKE)
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
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
