Jari: I'm fine whit it, thanks for your help. Feel free to NMU. Damián.
On Sun, Apr 29, 2012 at 09:25:18AM +0300, jari.aa...@cante.net wrote: > Package: yeahconsole > 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 28d37feaea4c725583df5c5a81241156fb499b25 Mon Sep 17 00:00:00 2001 > From: Jari Aalto <jari.aa...@cante.net> > Date: Sun, 29 Apr 2012 09:24: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 <jari.aa...@cante.net> > --- > debian/changelog | 10 ++++++++++ > debian/compat | 2 +- > debian/control | 6 +++--- > debian/copyright | 2 +- > debian/patches/00list | 2 -- > debian/patches/{50_display.dpatch => 50-display.patch} | 8 ++------ > debian/patches/{50_makefile.dpatch => 50-makefile.patch} | 8 ++------ > debian/patches/series | 2 ++ > debian/rules | 13 ++++++++----- > debian/source/format | 1 + > 10 files changed, 30 insertions(+), 24 deletions(-) > delete mode 100644 debian/patches/00list > rename debian/patches/{50_display.dpatch => 50-display.patch} (67%) > rename debian/patches/{50_makefile.dpatch => 50-makefile.patch} (75%) > create mode 100644 debian/patches/series > create mode 100644 debian/source/format > > diff --git a/debian/changelog b/debian/changelog > index 574f5f5..205ce69 100644 > --- a/debian/changelog > +++ b/debian/changelog > @@ -1,3 +1,13 @@ > +yeahconsole (0.3.4-2.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. > + * Add build-arch and build-indep targets; use dh_prep in rules file. > + * Fix copyright-refers-to-symlink-license (Lintian). > + > + -- Jari Aalto <jari.aa...@cante.net> Sun, 29 Apr 2012 09:24:10 +0300 > + > yeahconsole (0.3.4-2) unstable; urgency=low > > * Updated standards version to 3.7.3 > 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 8448163..10a827f 100644 > --- a/debian/control > +++ b/debian/control > @@ -2,12 +2,12 @@ Source: yeahconsole > Section: x11 > Priority: optional > Maintainer: Damián Viano <d...@debian.org> > -Build-Depends: debhelper (>= 5.0.0), libx11-dev, xsltproc, docbook-xsl, > dpatch > -Standards-Version: 3.7.3 > +Build-Depends: debhelper (>= 9), libx11-dev, xsltproc, docbook-xsl > +Standards-Version: 3.9.3 > > Package: yeahconsole > Architecture: any > -Depends: ${shlibs:Depends}, xterm (>= 168) | rxvt-unicode | rxvt-unicode-ml > | rxvt-unicode-lite | mrxvt > +Depends: ${misc:Depends}, ${shlibs:Depends}, xterm (>= 168) | rxvt-unicode | > rxvt-unicode-ml | rxvt-unicode-lite | mrxvt > Homepage: http://phrat.de/yeahtools.html > Description: drop-down X terminal emulator wrapper > Yeahconsole puts an X terminal emulator window on top of your screen that > diff --git a/debian/copyright b/debian/copyright > index 9907be8..caca276 100644 > --- a/debian/copyright > +++ b/debian/copyright > @@ -22,5 +22,5 @@ License: > Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > > On Debian systems, the complete text of the GNU General > -Public License can be found in `/usr/share/common-licenses/GPL'. > +Public License can be found in `/usr/share/common-licenses/GPL-2'. > > diff --git a/debian/patches/00list b/debian/patches/00list > deleted file mode 100644 > index 27facee..0000000 > --- a/debian/patches/00list > +++ /dev/null > @@ -1,2 +0,0 @@ > -50_makefile > -50_display > diff --git a/debian/patches/50_display.dpatch > b/debian/patches/50-display.patch > similarity index 67% > rename from debian/patches/50_display.dpatch > rename to debian/patches/50-display.patch > index 8fa9e28..f981fce 100644 > --- a/debian/patches/50_display.dpatch > +++ b/debian/patches/50-display.patch > @@ -1,10 +1,6 @@ > -#! /bin/sh /usr/share/dpatch/dpatch-run > -## 50_display.dpatch by Damián Viano <deb...@damianv.com.ar> > -## > -## All lines beginning with `## DP:' are a description of the patch. > -## DP: Fixes segfault when $DISPLAY is not defined/can't be opened > +From: Damián Viano <deb...@damianv.com.ar> > +Subject: Fixes segfault when $DISPLAY is not defined/can't be opened > > -@DPATCH@ > diff -Nura yeahconsole-0.3.4/yeahconsole.c > yeahconsole-0.3.4.r.bk/yeahconsole.c > --- yeahconsole-0.3.4/yeahconsole.c 2006-03-11 15:26:00.000000000 -0300 > +++ yeahconsole-0.3.4.r.bk/yeahconsole.c 2006-07-01 17:49:14.000000000 > -0300 > diff --git a/debian/patches/50_makefile.dpatch > b/debian/patches/50-makefile.patch > similarity index 75% > rename from debian/patches/50_makefile.dpatch > rename to debian/patches/50-makefile.patch > index 991646c..f19c4aa 100644 > --- a/debian/patches/50_makefile.dpatch > +++ b/debian/patches/50-makefile.patch > @@ -1,10 +1,6 @@ > -#! /bin/sh /usr/share/dpatch/dpatch-run > -## 50_makefile.dpatch by Damián Viano <deb...@damianv.com.ar> > -## > -## All lines beginning with `## DP:' are a description of the patch. > -## DP: Fixes Makefile to make it more flexible and cleaner > +From: Damián Viano <deb...@damianv.com.ar> > +Subject: Fixes Makefile to make it more flexible and cleaner > > -@DPATCH@ > diff -Nura yeahconsole-0.3.4/Makefile yeahconsole-0.3.4.r.bk/Makefile > --- yeahconsole-0.3.4/Makefile 2006-01-14 12:54:05.000000000 -0300 > +++ yeahconsole-0.3.4.r.bk/Makefile 2006-07-01 17:38:06.000000000 -0300 > diff --git a/debian/patches/series b/debian/patches/series > new file mode 100644 > index 0000000..ed0ee7d > --- /dev/null > +++ b/debian/patches/series > @@ -0,0 +1,2 @@ > +50-makefile.patch > +50-display.patch > diff --git a/debian/rules b/debian/rules > index ed64b74..21c78e2 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -6,7 +6,6 @@ > DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl > XP=xsltproc -''-nonet > > -include /usr/share/dpatch/dpatch.make > > CFLAGS = -Wall -g > > @@ -16,9 +15,13 @@ else > CFLAGS += -O2 > endif > > + > +build-arch: build > +build-indep: build > + > build: build-stamp yeahconsole.1 > > -build-stamp: patch > +build-stamp: > dh_testdir > > # Add here commands to compile the package. > @@ -26,7 +29,7 @@ build-stamp: patch > > touch build-stamp > > -clean: unpatch > +clean: > dh_testdir > dh_testroot > rm -f build-stamp yeahconsole.1 > @@ -39,7 +42,7 @@ clean: unpatch > install: build > dh_testdir > dh_testroot > - dh_clean -k > + dh_prep > dh_installdirs > > # Add here commands to install the package into debian/yeahconsole. > @@ -77,4 +80,4 @@ yeahconsole.1: debian/yeahconsole.xml > sed -i -e "s/\xe1/\\\['a]/g" $@ > > binary: binary-indep binary-arch > -.PHONY: build clean binary-indep binary-arch binary install patch unpatch > +.PHONY: build clean binary-indep binary-arch binary install > 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.10 > -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
