[deutex] 03/03: big overhaul of packaging for new version
Jonathan Dowland
jmtd at moszumanska.debian.org
Wed Jul 26 15:21:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
jmtd pushed a commit to annotated tag debian/5.0.0_beta.2-1
in repository deutex.
commit 7791bbccf14aa780a5af653160e30303ece54f0e
Author: Jonathan Dowland <jmtd at debian.org>
Date: Tue Jul 25 23:49:43 2017 +0100
big overhaul of packaging for new version
* remove explicit quilt and all patches (applied upstream)
* dh 9 style short rules file
* auto-infer docs,dirs so no need for those
* update watch file for new upstream location
---
debian/README.source | 2 --
debian/changelog | 16 +++++++++
debian/compat | 2 +-
debian/control | 6 ++--
debian/dirs | 3 --
debian/docs | 3 --
debian/menu | 6 ----
debian/patches/destdir_hack.patch | 37 -------------------
debian/patches/iwad_search_path.patch | 22 ------------
debian/patches/logging_segv.patch | 53 ---------------------------
debian/patches/manpage_charset.patch | 33 -----------------
debian/patches/series | 4 ---
debian/rules | 67 +++--------------------------------
debian/source/format | 1 +
debian/watch | 4 +--
15 files changed, 27 insertions(+), 232 deletions(-)
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index ea0f703..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-See /usr/share/doc/quilt/README.source for an explanation of how
-this package manages patches.
diff --git a/debian/changelog b/debian/changelog
index feeaf21..4680668 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+deutex (5.0.0~beta.2-1) unstable; urgency=medium
+
+ * New upstream version (!)
+ * deusf binary no longer supplied
+ * old docs files removed
+ * now supports PNGs
+ * Major packaging overhaul:
+ * move to dh 9 and use dh auto rules in Makefile.
+ * All patches merged upstream so delete debian/patches
+ * Use source format 3.0 (Quilt), no need for explicit quilt dependency
+ * bump standards version.
+ * partially fix watch file.
+ * Update my full name in Uploaders: header.
+
+ -- Jonathan Dowland <jmtd at debian.org> Wed, 26 Jul 2017 11:39:26 +0100
+
deutex (4.4.902-13) unstable; urgency=low
* Recommend either boom-wad or doom-wad, since the latter is
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 34e17a1..76de71e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: deutex
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Jon Dowland <jmtd at debian.org>
-Build-Depends: debhelper (>= 7.0.0), quilt
-Standards-Version: 3.9.1
+Uploaders: Jonathan Dowland <jmtd at debian.org>
+Build-Depends: debhelper (>= 7.0.0), libpng-dev
+Standards-Version: 3.9.8
Vcs-Git: git://git.debian.org/git/pkg-games/deutex.git
Vcs-Browser: http://git.debian.org/?p=pkg-games/deutex.git
Homepage: http://www.teaser.fr/~amajorel/deutex/
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 622aa02..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/games
-usr/share/man
-usr/share/man/man6
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index f25eb9b..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,3 +0,0 @@
-dtexman6.txt
-README
-TODO
diff --git a/debian/menu b/debian/menu
index 942b8ed..ecc40a4 100644
--- a/debian/menu
+++ b/debian/menu
@@ -3,9 +3,3 @@
title="deutex" \
hints="Doom" \
command="/usr/games/deutex"
-
-?package(deutex):needs="text" \
- section="Games/Tools" \
- title="deusf" \
- hints="Doom" \
- command="/usr/games/deusf"
diff --git a/debian/patches/destdir_hack.patch b/debian/patches/destdir_hack.patch
deleted file mode 100644
index 7f1c202..0000000
--- a/debian/patches/destdir_hack.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-install to /usr/games + DESTDIR hack
-
---- deutex-4.4.902.orig/configure
-+++ deutex-4.4.902/configure
-@@ -466,7 +466,7 @@
- #
- if expr "$PREFIX" : '//*usr/*$' >/dev/null
- then
-- BINDIR=/usr/bin # FHS-ly correct is /usr/games
-+ BINDIR=/usr/games
- ETCDIR=/etc/$APPNAME/%v
- ETCDIRNV=/etc/$APPNAME
- MANDIR=/usr/share/man
-@@ -509,17 +509,17 @@
- echo "# DO NOT EDIT -- generated by ./configure"
- echo
- echo "AWK = $AWK"
-- echo "BINDIR = $BINDIR"
-+ echo "BINDIR = \$(DESTDIR)/$BINDIR"
- echo "CC = $CC"
- echo "CFLAGS = $CFLAGS"
-- echo "ETCDIR = $ETCDIR" | sed "s/%v/$VERSION/g"
-- echo "ETCDIRNV = $ETCDIRNV"
-+ echo "ETCDIR = \$(DESTDIR)/$ETCDIR" | sed "s/%v/$VERSION/g"
-+ echo "ETCDIRNV = \$(DESTDIR)/$ETCDIRNV"
- echo "HAVE_INTTYPES = $HAVE_INTTYPES"
- echo "HAVE_SNPRINTF = $HAVE_SNPRINTF"
- echo "LDFLAGS = $LDFLAGS"
-- echo "MANDIR = $MANDIR"
-- echo "SHAREDIR = $SHAREDIR" | sed "s/%v/$VERSION/g"
-- echo "SHAREDIRNV = $SHAREDIRNV"
-+ echo "MANDIR = \$(DESTDIR)/$MANDIR"
-+ echo "SHAREDIR = \$(DESTDIR)/$SHAREDIR" | sed "s/%v/$VERSION/g"
-+ echo "SHAREDIRNV = \$(DESTDIR)/$SHAREDIRNV"
- echo
- cat Makefile.in
- ) >Makefile
diff --git a/debian/patches/iwad_search_path.patch b/debian/patches/iwad_search_path.patch
deleted file mode 100644
index 6a6e97c..0000000
--- a/debian/patches/iwad_search_path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Look in /usr/share/games/doom for IWADs
-
---- deutex-4.4.902.orig/src/deutex.c
-+++ deutex-4.4.902/src/deutex.c
-@@ -1118,6 +1118,17 @@
- }
- }
- if (! gotit)
-+ {
-+ for (w = wads; *w != NULL; w++)
-+ {
-+ if (MakeFileName (MainWAD, "/usr/share/games/doom", "", "", *w, "wad") == TRUE)
-+ {
-+ gotit = 1;
-+ break;
-+ }
-+ }
-+ }
-+ if (! gotit)
- ProgError ("AA18",
- "Can't find any of doom.wad, doom2.wad, doompres.wad,"
- " heretic.wad, hexen.wad, strife1.wad");
diff --git a/debian/patches/logging_segv.patch b/debian/patches/logging_segv.patch
deleted file mode 100644
index 4d2a829..0000000
--- a/debian/patches/logging_segv.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Fix a segfault when we aren't logging
-
---- deutex-4.4.902.orig/src/log.c
-+++ deutex-4.4.902/src/log.c
-@@ -40,10 +40,10 @@
- {
- if (logfp == &nolog)
- return 1;
-- if (logfp == NULL)
-+ if (logfp == NULL || logfp == &nolog)
- {
- logfp = fopen (logfile, "w");
-- if (logfp == NULL)
-+ if (logfp == NULL || logfp == &nolog)
- {
- /* Can't use Warning(), we would loop. */
- fflush (stdout);
-@@ -65,7 +65,7 @@
- */
- void lputc (char c)
- {
-- if (logfp == NULL)
-+ if (logfp == NULL || logfp == &nolog)
- return;
- fputc (c, logfp);
- fflush (logfp); /* We don't want a segfault to truncate the log */
-@@ -77,7 +77,7 @@
- */
- void lputs (const char *str)
- {
-- if (logfp == NULL)
-+ if (logfp == NULL || logfp == &nolog)
- return;
- fputs (str, logfp);
- fflush (logfp); /* We don't want a segfault to truncate the log */
-@@ -91,7 +91,7 @@
- {
- va_list list;
-
-- if (logfp == NULL)
-+ if (logfp == NULL || logfp == &nolog)
- return;
- va_start (list, fmt);
- vlprintf (fmt, list);
-@@ -104,7 +104,7 @@
- */
- void vlprintf (const char *fmt, va_list list)
- {
-- if (logfp == NULL)
-+ if (logfp == NULL || logfp == &nolog)
- return;
- vfprintf (logfp, fmt, list);
- fflush (logfp); /* We don't want a segfault to truncate the log */
diff --git a/debian/patches/manpage_charset.patch b/debian/patches/manpage_charset.patch
deleted file mode 100644
index fa3830b..0000000
--- a/debian/patches/manpage_charset.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Fix charset issues in manpages
-
---- deutex-4.4.902.orig/deutex.6
-+++ deutex-4.4.902/deutex.6
-@@ -3,8 +3,8 @@
- .\" DeuTex incorporates code derived from DEU 5.21 that was put in the
- .\" public domain in 1994 by Rapha�l Quinet and Brendon Wyber.
- .\"
--.\" DeuTex is Copyright � 1994-1995 Olivier Montanuy,
--.\" Copyright � 1999-2005 Andr� Majorel.
-+.\" DeuTex is Copyright \(co 1994-1995 Olivier Montanuy,
-+.\" Copyright \(co 1999-2005 Andr\o"\(aae" Majorel.
- .\"
- .\" This program is free software; you can redistribute it and/or modify it
- .\" under the terms of the GNU General Public License as published by the
-@@ -533,7 +533,7 @@
- .SH BUGS
- See \fBTODO\fP.
- .SH LEGAL
--DeuTex is copyright � 1994-1995 Olivier Montanuy, copyright � 1999-2005 Andr�
-+DeuTex is copyright \(co 1994-1995 Olivier Montanuy, copyright \(co 1999-2005 Andr\o"\(aae"
- Majorel.
- .PP
- Most of this program is GPL'd but some of it is available under other licenses.
-@@ -551,7 +551,7 @@
- <mark.mathews=channel1+com> and Chuck Rossi.
- The original manual was written by Kevin McGrail <hevkev=sfo+com>.
- .PP
--As of version 4 (1999), the maintainer is Andr� Majorel
-+As of version 4 (1999), the maintainer is Andr\o"\(aae" Majorel
- <URL:http://www.teaser.fr/~amajorel/>.
- .PP
- Questions and bug reports should be sent to the current maintainer, \fInot\fP
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 210b513..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-destdir_hack.patch
-iwad_search_path.patch
-logging_segv.patch
-manpage_charset.patch
diff --git a/debian/rules b/debian/rules
index aeb6a97..c62edd2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,65 +1,6 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-include /usr/share/quilt/quilt.make
+%:
+ dh $@ --with-autoreconf
-CFLAGS = -Wall
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- $(MAKE) -f /usr/share/quilt/quilt.make patch
- ./configure --prefix=/usr --cflags="$(CFLAGS)"
- touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
- $(MAKE)
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- [ ! -f Makefile ] || $(MAKE) clean
- -rm Makefile src/config.h
-
- $(MAKE) -f /usr/share/quilt/quilt.make unpatch
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- $(MAKE) install DESTDIR=./debian/deutex
-
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGES
- dh_installdocs FAQ
- dh_installmenu
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_auto_configure:
+ dh_auto_configure -- --bindir /usr/games
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)
diff --git a/debian/watch b/debian/watch
index 785a567..05163ff 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
-http://www.teaser.fr/~amajorel/deutex/ deutex-(.*)\.tar\.gz
-
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/Doom-Utils-$1\.tar\.gz/ \
+ https://github.com/Doom-Utils/deutex/tags .*/v?(\d\S+)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/deutex.git
More information about the Pkg-games-commits
mailing list