Package: xsok
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 77426525b4ed1a7d525a24ba7088a52151d5feab Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 3 Mar 2012 05:02:26 -0500
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 | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 9 ---------
.../{build_tweaks.dpatch => build_tweaks.patch} | 8 ++------
debian/patches/{config.dpatch => config.patch} | 8 ++------
.../{drag_segfault.dpatch => drag_segfault.patch} | 11 ++++-------
debian/patches/{manpage.dpatch => manpage.patch} | 8 ++------
.../patches/{no_gunzip.dpatch => no_gunzip.patch} | 11 ++++-------
debian/patches/{overflow.dpatch => overflow.patch} | 8 ++------
...ity_paranoia.dpatch => security_paranoia.patch} | 15 ++++++---------
debian/patches/series | 9 +++++++++
.../{undo_nowrap.dpatch => undo_nowrap.patch} | 9 +++------
.../patches/{wm_delete.dpatch => wm_delete.patch} | 8 ++------
debian/rules | 7 +++----
debian/source/format | 1 +
16 files changed, 51 insertions(+), 75 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{build_tweaks.dpatch => build_tweaks.patch} (96%)
rename debian/patches/{config.dpatch => config.patch} (83%)
rename debian/patches/{drag_segfault.dpatch => drag_segfault.patch} (63%)
rename debian/patches/{manpage.dpatch => manpage.patch} (89%)
rename debian/patches/{no_gunzip.dpatch => no_gunzip.patch} (92%)
rename debian/patches/{overflow.dpatch => overflow.patch} (67%)
rename debian/patches/{security_paranoia.dpatch => security_paranoia.patch} (96%)
create mode 100644 debian/patches/series
rename debian/patches/{undo_nowrap.dpatch => undo_nowrap.patch} (63%)
rename debian/patches/{wm_delete.dpatch => wm_delete.patch} (96%)
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index b80a899..761597a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xsok (1.02-17.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.
+
+ -- Jari Aalto <[email protected]> Sat, 03 Mar 2012 04:59:17 -0500
+
xsok (1.02-17) unstable; urgency=low
* Policy 3.8.0: move /usr/X11R6/lib to /usr/lib.
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 24dfa91..7fbf42b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: xsok
Priority: optional
Section: games
Maintainer: Peter Samuelson <[email protected]>
-Standards-Version: 3.8.0
-Build-Depends: dpatch, debhelper, xutils-dev,
+Standards-Version: 3.9.3
+Build-Depends: debhelper, xutils-dev,
libx11-dev, libxt-dev, libxaw7-dev, libxpm-dev
Package: xsok
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 8b0c15d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,9 +0,0 @@
-build_tweaks
-config
-overflow
-wm_delete
-undo_nowrap
-drag_segfault
-manpage
-no_gunzip
-security_paranoia
diff --git a/debian/patches/build_tweaks.dpatch b/debian/patches/build_tweaks.patch
similarity index 96%
rename from debian/patches/build_tweaks.dpatch
rename to debian/patches/build_tweaks.patch
index b6a5122..569c68b 100644
--- a/debian/patches/build_tweaks.dpatch
+++ b/debian/patches/build_tweaks.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## build_tweaks.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Random hacks to build + install xsok.
+From: <[email protected]>
+Subject: Random hacks to build + install xsok.
-@DPATCH@
diff -urNad xsok-1.02/Makefile xsok-1.02/Makefile
--- xsok-1.02/Makefile
+++ xsok-1.02/Makefile
diff --git a/debian/patches/config.dpatch b/debian/patches/config.patch
similarity index 83%
rename from debian/patches/config.dpatch
rename to debian/patches/config.patch
index 5c58ce1..022622f 100644
--- a/debian/patches/config.dpatch
+++ b/debian/patches/config.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## config.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Configuration changes / fixes.
+From: <[email protected]>
+Subject: Configuration changes / fixes.
-@DPATCH@
diff -urNad xsok-1.02/src/Tableau.h xsok-1.02/src/Tableau.h
--- xsok-1.02/src/Tableau.h 1994-11-24 05:00:00.000000000 -0600
+++ xsok-1.02/src/Tableau.h 2005-08-05 08:08:28.000000000 -0500
diff --git a/debian/patches/drag_segfault.dpatch b/debian/patches/drag_segfault.patch
similarity index 63%
rename from debian/patches/drag_segfault.dpatch
rename to debian/patches/drag_segfault.patch
index cf6c513..db3e538 100644
--- a/debian/patches/drag_segfault.dpatch
+++ b/debian/patches/drag_segfault.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## drag_segfault.dpatch by <[email protected]>
-##
-## DP: Avoid segfault when trying to drag the player with the middle button.
-## DP: Dragging the player does nothing, you're supposed to drag a box,
-## DP: but at least it shouldn't crash.
+From: <[email protected]>
+Subject: Avoid segfault when trying to drag the player with the middle button.
+ Dragging the player does nothing, you're supposed to drag a box,
+ but at least it shouldn't crash.
-@DPATCH@
diff -urNad xsok-1.02/src/mousemove.c xsok-1.02/src/mousemove.c
--- xsok-1.02/src/mousemove.c
+++ xsok-1.02/src/mousemove.c
diff --git a/debian/patches/manpage.dpatch b/debian/patches/manpage.patch
similarity index 89%
rename from debian/patches/manpage.dpatch
rename to debian/patches/manpage.patch
index 971d365..8133a8c 100644
--- a/debian/patches/manpage.dpatch
+++ b/debian/patches/manpage.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## manpage.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Small manpage fixes.
+From: <[email protected]>
+Subject: Small manpage fixes.
-@DPATCH@
diff -urNad xsok-1.02/src/xsok.man xsok-1.02/src/xsok.man
--- xsok-1.02/src/xsok.man 1996-05-23 13:07:13.000000000 -0500
+++ xsok-1.02/src/xsok.man 2005-08-05 08:08:33.000000000 -0500
diff --git a/debian/patches/no_gunzip.dpatch b/debian/patches/no_gunzip.patch
similarity index 92%
rename from debian/patches/no_gunzip.dpatch
rename to debian/patches/no_gunzip.patch
index 1941266..8e79322 100644
--- a/debian/patches/no_gunzip.dpatch
+++ b/debian/patches/no_gunzip.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no_gunzip.dpatch by <[email protected]>
-##
-## DP: Remove all traces of gzipped data files, and opening thereof.
-## DP: This is a setgid program; no need to be calling external binaries.
-## DP: Also rip out artificial 7-char limit on game types, which is related.
+From: <[email protected]>
+Subject: Remove all traces of gzipped data files, and opening thereof.
+ This is a setgid program; no need to be calling external binaries.
+ Also rip out artificial 7-char limit on game types, which is related.
-@DPATCH@
diff -urNad xsok-1.02/lib/Makefile xsok-1.02/lib/Makefile
--- xsok-1.02/lib/Makefile
+++ xsok-1.02/lib/Makefile
diff --git a/debian/patches/overflow.dpatch b/debian/patches/overflow.patch
similarity index 67%
rename from debian/patches/overflow.dpatch
rename to debian/patches/overflow.patch
index f22cda2..877b421 100644
--- a/debian/patches/overflow.dpatch
+++ b/debian/patches/overflow.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## overflow.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Prevent buffer overflow from the environment.
+From: <[email protected]>
+Subject: Prevent buffer overflow from the environment.
-@DPATCH@
diff -urNad xsok-1.02/src/loadsave.c xsok-1.02/src/loadsave.c
--- xsok-1.02/src/loadsave.c 1995-11-03 12:38:14.000000000 -0600
+++ xsok-1.02/src/loadsave.c 2005-08-05 08:08:43.000000000 -0500
diff --git a/debian/patches/security_paranoia.dpatch b/debian/patches/security_paranoia.patch
similarity index 96%
rename from debian/patches/security_paranoia.dpatch
rename to debian/patches/security_paranoia.patch
index 3a3e373..ae83a41 100644
--- a/debian/patches/security_paranoia.dpatch
+++ b/debian/patches/security_paranoia.patch
@@ -1,13 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## security_paranoia.dpatch by <[email protected]>
-##
-## DP: Replace some sprintf with snprintf, and strcpy with strncpy.
-## DP: I haven't attempted to prove that any of these are exploitable,
-## DP: but it looks as though some may well be.
-## DP:
-## DP: Note also that I haven't done any kind of formal audit.
+From: <[email protected]>
+Subject: Replace some sprintf with snprintf, and strcpy with strncpy.
+ I haven't attempted to prove that any of these are exploitable,
+ but it looks as though some may well be.
+ .
+ Note also that I haven't done any kind of formal audit.
-@DPATCH@
diff -urNad xsok-1.02/src/X-gfx.c xsok-1.02/src/X-gfx.c
--- xsok-1.02/src/X-gfx.c
+++ xsok-1.02/src/X-gfx.c
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..aa709db
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,9 @@
+build_tweaks.patch
+config.patch
+overflow.patch
+wm_delete.patch
+undo_nowrap.patch
+drag_segfault.patch
+manpage.patch
+no_gunzip.patch
+security_paranoia.patch
diff --git a/debian/patches/undo_nowrap.dpatch b/debian/patches/undo_nowrap.patch
similarity index 63%
rename from debian/patches/undo_nowrap.dpatch
rename to debian/patches/undo_nowrap.patch
index 92e04de..eca4cf8 100644
--- a/debian/patches/undo_nowrap.dpatch
+++ b/debian/patches/undo_nowrap.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## undo_nowrap.dpatch by <[email protected]>
-##
-## DP: Do not let undo wrap around to the original end of the game. This
-## DP: behavior was not a bug, but it is unintuitive and undocumented.
+From: <[email protected]>
+Subject: Do not let undo wrap around to the original end of the game.
+ This behavior was not a bug, but it is unintuitive and undocumented.
-@DPATCH@
diff -urNad xsok-1.02/src/commands.c xsok-1.02/src/commands.c
--- xsok-1.02/src/commands.c
+++ xsok-1.02/src/commands.c
diff --git a/debian/patches/wm_delete.dpatch b/debian/patches/wm_delete.patch
similarity index 96%
rename from debian/patches/wm_delete.dpatch
rename to debian/patches/wm_delete.patch
index 6e74b25..faa3ea3 100644
--- a/debian/patches/wm_delete.dpatch
+++ b/debian/patches/wm_delete.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## wm_delete.dpatch by Peter De Wachter <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support ICCCM ... or at least WM_DELETE_WINDOW.
+From: Peter De Wachter <[email protected]>
+Subject: Support ICCCM ... or at least WM_DELETE_WINDOW.
-@DPATCH@
diff -urNad xsok-1.02/src/X-sok.h xsok-1.02/src/X-sok.h
--- xsok-1.02/src/X-sok.h 1996-03-16 10:58:58.000000000 -0600
+++ xsok-1.02/src/X-sok.h 2005-08-05 08:08:48.000000000 -0500
diff --git a/debian/rules b/debian/rules
index c3570cc..b97d679 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,10 +10,9 @@ else
OPTIMIZE :=
endif
-include /usr/share/dpatch/dpatch.make
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
$(MAKE) $(OPTIMIZE) \
LOCAL_LIBRARIES='-lXpm -lXaw -lXt -lX11' \
@@ -21,7 +20,7 @@ build-stamp: patch-stamp
XSOKSAVEDIR=/var/games/xsok
touch build-stamp
-clean: clean1 unpatch
+clean: clean1
clean1:
dh_testdir
@@ -75,4 +74,4 @@ source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary patch unpatch clean1
+.PHONY: build clean binary-indep binary-arch binary clean1
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
