Package: supertransball2
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 21de91e4fa946d24c944e7174afdea2abe19b757 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sun, 8 Apr 2012 15:03:45 +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 | 11 +++++++++++
debian/compat | 2 +-
debian/control | 5 +++--
debian/menu | 2 +-
debian/patches/00list | 4 ----
...akefile => 01_install-target-in-makefile.patch} | 8 ++------
..._unix-paths-fixup => 02_unix-paths-fixup.patch} | 8 ++------
...fig_patch_fixup => 03_config_patch_fixup.patch} | 10 +++-------
debian/patches/04_changelevelpack_fixup | 20 --------------------
debian/patches/04_changelevelpack_fixup.patch | 16 ++++++++++++++++
debian/patches/series | 4 ++++
debian/rules | 13 ++++++++-----
debian/source/format | 1 +
13 files changed, 52 insertions(+), 52 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_install-target-in-makefile => 01_install-target-in-makefile.patch} (82%)
rename debian/patches/{02_unix-paths-fixup => 02_unix-paths-fixup.patch} (97%)
rename debian/patches/{03_config_patch_fixup => 03_config_patch_fixup.patch} (66%)
delete mode 100644 debian/patches/04_changelevelpack_fixup
create mode 100644 debian/patches/04_changelevelpack_fixup.patch
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 6195364..1736e94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+supertransball2 (1.5-3.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.1 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Correct menu section.
+ * Add Homepage field to control file.
+
+ -- Jari Aalto <[email protected]> Sun, 08 Apr 2012 15:01:45 +0300
+
supertransball2 (1.5-3) unstable; urgency=low
* Patch to fix config file recreation. (closes: #334841)
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 447d195..f8e5e8a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: supertransball2
Section: games
Priority: optional
Maintainer: Gürkan Sengün <[email protected]>
-Build-Depends: debhelper (>= 4.0.0), libsdl-sge-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl1.2-dev, libsdl-sound1.2-dev, dpatch (>= 1.11)
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 9), libsdl-sge-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl1.2-dev, libsdl-sound1.2-dev
+Standards-Version: 3.9.3.1
+Homepage: http://www.braingames.getput.com/stransball2
Package: supertransball2
Architecture: any
diff --git a/debian/menu b/debian/menu
index da15b19..41cf9ac 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
-?package(supertransball2):needs="X11" section="Games/Arcade"\
+?package(supertransball2):needs="X11" section="Games/Strategy"\
title="Super Transball 2" command="/usr/games/supertransball2"
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 062060a..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_install-target-in-makefile
-02_unix-paths-fixup
-03_config_patch_fixup
-04_changelevelpack_fixup
diff --git a/debian/patches/01_install-target-in-makefile b/debian/patches/01_install-target-in-makefile.patch
similarity index 82%
rename from debian/patches/01_install-target-in-makefile
rename to debian/patches/01_install-target-in-makefile.patch
index 4237ba8..38f8146 100644
--- a/debian/patches/01_install-target-in-makefile
+++ b/debian/patches/01_install-target-in-makefile.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_install-target-in-makefile.dpatch by Gurkan Sengun <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add an install target to the Makefile and fix binary name
+From: Gurkan Sengun <[email protected]>
+Subject: Add an install target to the Makefile and fix binary name
-@DPATCH@
--- supertransball2-1.5.orig/sources/Makefile
+++ supertransball2-1.5/sources/Makefile
diff --git a/debian/patches/02_unix-paths-fixup b/debian/patches/02_unix-paths-fixup.patch
similarity index 97%
rename from debian/patches/02_unix-paths-fixup
rename to debian/patches/02_unix-paths-fixup.patch
index 4b480b3..7136b8a 100644
--- a/debian/patches/02_unix-paths-fixup
+++ b/debian/patches/02_unix-paths-fixup.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_unix-paths-fixup.dpatch by Gurkan Sengun <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: UNIX paths fixup (add and use datadir/confdir)
+From: Gurkan Sengun <[email protected]>
+Subject: UNIX paths fixup (add and use datadir/confdir)
-@DPATCH@
--- supertransball2-1.5.orig/sources/configuration.cpp
+++ supertransball2-1.5/sources/configuration.cpp
diff --git a/debian/patches/03_config_patch_fixup b/debian/patches/03_config_patch_fixup.patch
similarity index 66%
rename from debian/patches/03_config_patch_fixup
rename to debian/patches/03_config_patch_fixup.patch
index c0811b8..eb1b566 100644
--- a/debian/patches/03_config_patch_fixup
+++ b/debian/patches/03_config_patch_fixup.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_config_patch_fixup JusTiCe8 <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: patch "UNIX paths fixup" use bad config file checks and makes it to be
-## DP: always recreated with default values.
+From: Unknown
+Subject: patch "UNIX paths fixup" use bad config file checks and makes it to
+ be always recreated with default values.
-@DPATCH@
--- supertransball2-1.5.orig/sources/main.cpp
+++ supertransball2-1.5/sources/main.cpp
diff --git a/debian/patches/04_changelevelpack_fixup b/debian/patches/04_changelevelpack_fixup
deleted file mode 100644
index d915133..0000000
--- a/debian/patches/04_changelevelpack_fixup
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_changelevelpack_fixup JusTiCe8 <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: patch "UNIX paths fixup" use bad config file checks and makes it to be
-## DP: always recreated with default values.
-
-@DPATCH@
-
---- supertransball2-1.5.orig/sources/game.cpp
-+++ supertransball2-1.5/sources/game.cpp
-@@ -173,6 +173,8 @@
-
- if (NLEVELS==-1) return false;
-
-+ chdir(datadir);
-+
- switch(STATE) {
- case 0: if (!state_logo_cycle(screen,sx,sy,keyboard)) return false;
- break;
diff --git a/debian/patches/04_changelevelpack_fixup.patch b/debian/patches/04_changelevelpack_fixup.patch
new file mode 100644
index 0000000..3d82496
--- /dev/null
+++ b/debian/patches/04_changelevelpack_fixup.patch
@@ -0,0 +1,16 @@
+From: Unknown
+Subject: patch "UNIX paths fixup" use bad config file checks and makes it to
+ be always recreated with default values.
+
+
+--- supertransball2-1.5.orig/sources/game.cpp
++++ supertransball2-1.5/sources/game.cpp
+@@ -173,6 +173,8 @@
+
+ if (NLEVELS==-1) return false;
+
++ chdir(datadir);
++
+ switch(STATE) {
+ case 0: if (!state_logo_cycle(screen,sx,sy,keyboard)) return false;
+ break;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c119c26
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01_install-target-in-makefile.patch
+02_unix-paths-fixup.patch
+03_config_patch_fixup.patch
+04_changelevelpack_fixup.patch
diff --git a/debian/rules b/debian/rules
index 99dd05b..0addd4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,6 @@
PACKAGE = supertransball2
-include /usr/share/dpatch/dpatch.make
CFLAGS = -Wall -g
@@ -18,25 +17,29 @@ else
CFLAGS += -O2
endif
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
cd sources && $(MAKE)
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
-(cd sources && $(MAKE) clean)
- rm -f supertransball2
+ rm -f supertransball2 stransball2
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
cd sources && $(MAKE) install DESTDIR=$(CURDIR)/debian/supertransball2
cd sources && $(MAKE) install-data DESTDIR=$(CURDIR)/debian/supertransball2-data
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.1
