Package: stymulator
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 12caa6c6e30857f015d2097b206303f74bb1f401 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 25 Feb 2012 10:35:08 -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 ++--
...h_Makefile.dpatch => 000-Liblzh_Makefile.patch} | 7 ++-----
...kefile.dpatch => 001-Stsoundlib_Makefile.patch} | 7 ++-----
...kefile.dpatch => 002-Stymulator_Makefile.patch} | 19 ++++++++-----------
debian/patches/00list | 3 ---
debian/patches/series | 3 +++
debian/rules | 5 ++---
debian/source/format | 1 +
10 files changed, 29 insertions(+), 30 deletions(-)
rename debian/patches/{000-Liblzh_Makefile.dpatch => 000-Liblzh_Makefile.patch} (76%)
rename debian/patches/{001-Stsoundlib_Makefile.dpatch => 001-Stsoundlib_Makefile.patch} (86%)
rename debian/patches/{002-Stymulator_Makefile.dpatch => 002-Stymulator_Makefile.patch} (82%)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 9d7820e..8930eaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+stymulator (0.21a~dfsg-1.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> Sat, 25 Feb 2012 10:33:00 -0500
+
stymulator (0.21a~dfsg-1) unstable; urgency=low
* Initial release (Closes: #415676).
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 6f874fc..48e951e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: stymulator
Section: sound
Priority: extra
Maintainer: Adam Cécile (Le_Vert) <gand...@le-vert.net>
-Build-Depends: debhelper (>= 5), dpatch, libncurses5-dev, libasound2-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9), libncurses5-dev, libasound2-dev
+Standards-Version: 3.9.3
Package: stymulator
Architecture: any
diff --git a/debian/patches/000-Liblzh_Makefile.dpatch b/debian/patches/000-Liblzh_Makefile.patch
similarity index 76%
rename from debian/patches/000-Liblzh_Makefile.dpatch
rename to debian/patches/000-Liblzh_Makefile.patch
index fa240b2..d678b62 100644
--- a/debian/patches/000-Liblzh_Makefile.dpatch
+++ b/debian/patches/000-Liblzh_Makefile.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 000-Liblzh_Makefile.dpatch by Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## DP: Fix Liblzh Makefile to handle CXXFLAGS var.
+From: Adam Cécile (Le_Vert) <gand...@le-vert.net>
+Subject: Fix Liblzh Makefile to handle CXXFLAGS var.
-@DPATCH@
diff -u stymulator-0.21.dfsg/src/stsoundlib/lzh/Makefile stymulator-0.21.dfsg/src/stsoundlib/lzh/Makefile.new
--- stymulator-0.21.dfsg/src/stsoundlib/lzh/Makefile 2006-07-11 18:20:42.000000000 +0200
diff --git a/debian/patches/001-Stsoundlib_Makefile.dpatch b/debian/patches/001-Stsoundlib_Makefile.patch
similarity index 86%
rename from debian/patches/001-Stsoundlib_Makefile.dpatch
rename to debian/patches/001-Stsoundlib_Makefile.patch
index 4be8c83..c2568b2 100644
--- a/debian/patches/001-Stsoundlib_Makefile.dpatch
+++ b/debian/patches/001-Stsoundlib_Makefile.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001-Stsoundlib_Makefile.dpatch by Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## DP: Fix StSoundLib Makefile to handle CXXFLAGS var.
+From: Adam Cécile (Le_Vert) <gand...@le-vert.net>
+Subject: Fix StSoundLib Makefile to handle CXXFLAGS var.
-@DPATCH@
diff -u stymulator-0.21.dfsg/src/stsoundlib/Makefile stymulator-0.21.dfsg/src/stsoundlib/Makefile.new
--- stymulator-0.21.dfsg/src/stsoundlib/Makefile 2006-07-11 18:34:22.000000000 +0200
diff --git a/debian/patches/002-Stymulator_Makefile.dpatch b/debian/patches/002-Stymulator_Makefile.patch
similarity index 82%
rename from debian/patches/002-Stymulator_Makefile.dpatch
rename to debian/patches/002-Stymulator_Makefile.patch
index 90405e1..45c1565 100644
--- a/debian/patches/002-Stymulator_Makefile.dpatch
+++ b/debian/patches/002-Stymulator_Makefile.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 002-Stymulator_Makefile.dpatch by Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## DP: Fix Stymulator Makefile to handle CXXFLAGS and CXX var.
-## DP: Handle DESTDIR and PREFIX too.
-## DP: Pass variables to stsoundlib and liblzh Makefiles.
+From: Adam Cécile (Le_Vert) <gand...@le-vert.net>
+Subject: Fix Stymulator Makefile to handle CXXFLAGS and CXX var.
+ Handle DESTDIR and PREFIX too.
+ Pass variables to stsoundlib and liblzh Makefiles.
-@DPATCH@
diff -u stymulator-0.21.dfsg/src/Makefile stymulator-0.21.dfsg/src/Makefile.new
--- stymulator-0.21.dfsg/src/Makefile 2006-07-11 18:36:39.000000000 +0200
@@ -24,15 +21,15 @@ diff -u stymulator-0.21.dfsg/src/Makefile stymulator-0.21.dfsg/src/Makefile.new
+RM = rm -f
+CXX = g++
+MAKE = make
-+INSTALL = /usr/bin/install -c
++INSTALL = /usr/bin/install -c
+
+DESTDIR =
+PREFIX = /usr/local
+BINDIR = $(PREFIX)/bin
+CXXFLAGS = -Wall
-+LZH = stsoundlib/lzh
-+STLIB = stsoundlib
-+INCLUDE = -L$(LZH) -L$(STLIB)
++LZH = stsoundlib/lzh
++STLIB = stsoundlib
++INCLUDE = -L$(LZH) -L$(STLIB)
all: libs ymplayer ym2wav
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index a81e410..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-000-Liblzh_Makefile.dpatch
-001-Stsoundlib_Makefile.dpatch
-002-Stymulator_Makefile.dpatch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..25a55fe
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+000-Liblzh_Makefile.patch
+001-Stsoundlib_Makefile.patch
+002-Stymulator_Makefile.patch
diff --git a/debian/rules b/debian/rules
index 1e34708..06c429f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
CXXFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -13,12 +12,12 @@ else
endif
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
$(MAKE) CXXFLAGS="$(CXXFLAGS)" CXX="g++" -C src/
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
