[adonthell-data] 17/60: More packaging cleanup

Markus Koschany apo at moszumanska.debian.org
Tue Jul 12 23:23:19 UTC 2016 

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository adonthell-data.

commit 62e1f7e3321446805ab44585fe431b354e74b881
Author: Barry deFreese <bdefreese at debian.org>
Date:   Sat May 25 01:38:19 2013 +0000

    More packaging cleanup
---
 debian/changelog                        | 25 +++++++++++-
 debian/control                          | 12 +++---
 debian/manpages                         |  1 +
 debian/patches/01_do_not_ship_pyc_files |  2 +
 debian/patches/02_player_text.py.diff   |  2 +
 debian/patches/no_avatar_font.patch     | 15 +++++++
 debian/patches/series                   |  1 +
 debian/rules                            | 69 +++++++--------------------------
 debian/source/format                    |  1 +
 debian/watch                            |  2 +
 10 files changed, 67 insertions(+), 63 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7844858..dd98d04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,31 @@
-adonthell-data (0.3.5-2) UNRELEASED; urgency=low
+adonthell-data (0.3.5+dfsg-1) unstable; urgency=low
 
+  [ Iain Lane ]
   * NOT RELEASED YET
   * debian/control: Remove myself from Uploaders
   * DONT USE THIS, archive has 0.3.4.cvs.20080529-2, needs merging.
 
- -- Iain Lane <laney at ubuntu.com>  Wed, 30 Jun 2010 10:54:45 +0100
+  [ Barry deFreese ]
+  * Acknowledge NMU.
+  * New upstream release.
+  * REALLY include upstream desktop file this time. (Closes: #708933).
+  * Packaging cleanup.
+    - Update Homepage to new address.
+    - Update to dh7 style rules.
+    - Change to Source format 3.0 (quilt).
+    - Add ${misc:Depends} to dependencies.
+  * Add patch to not build removed avatar.ttf.
+  * Bump Standards Version to 3.9.4.
+
+ -- Barry deFreese <bdefreese at debian.org>  Tue, 21 May 2013 18:24:40 -0400
+
+adonthell-data (0.3.4.cvs.20080529+dfsg-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * No-change sourceful upload to get rid of python2.6 dependencies
+    (Closes: #679730, 707898).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 12 May 2013 16:27:08 +0200
 
 adonthell-data (0.3.5-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 1a81ec8..b964e0e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,17 @@ Source: adonthell-data
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Barry deFreese <bddebian at comcast.net>
-Build-Depends-Indep: autotools-dev, python-dev, adonthell (>= 0.3), adonthell (<< 0.4), python-support (>= 0.4.0)
-Build-Depends: debhelper (>= 5), quilt (>= 0.40)
-Standards-Version: 3.8.0
-Homepage: http://adonthell.linuxgames.com/
+Uploaders: Barry deFreese <bdefreese at debian.org>
+Build-Depends-Indep: autotools-dev, python, adonthell (>= 0.3), adonthell (<< 0.4)
+Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~)
+Standards-Version: 3.9.4
+Homepage: http://adonthell.nongnu.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/adonthell-data/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/adonthell-data/?op=log
 
 Package: adonthell-data
 Architecture: all
-Depends: ${python:Depends}, adonthell (>= 0.3.3.cvs.20031022), adonthell (<< 0.4)
+Depends: ${misc:Depends}, ${python:Depends}, adonthell (>= 0.3.3.cvs.20031022), adonthell (<< 0.4)
 Description: Data files needed by Adonthell
  This is the official game for Adonthell 0.3
  .
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..bbf5592
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+debian/adonthell-wastesedge.6
diff --git a/debian/patches/01_do_not_ship_pyc_files b/debian/patches/01_do_not_ship_pyc_files
index 0c50fee..72a39a0 100644
--- a/debian/patches/01_do_not_ship_pyc_files
+++ b/debian/patches/01_do_not_ship_pyc_files
@@ -1,3 +1,5 @@
+Author: Unknown
+Description: Remove compiled Python .pyc files for deb.
 Index: wastesedge-0.3.5/scripts/Makefile.am
 ===================================================================
 --- wastesedge-0.3.5.orig/scripts/Makefile.am	2002-05-06 14:47:17.000000000 +0100
diff --git a/debian/patches/02_player_text.py.diff b/debian/patches/02_player_text.py.diff
index 32c3fcc..3778463 100644
--- a/debian/patches/02_player_text.py.diff
+++ b/debian/patches/02_player_text.py.diff
@@ -1,3 +1,5 @@
+Author: Unknown
+Description: Fix extra space in player text strings.
 --- a/scripts/modules/player_text.py.orig	2006-10-28 22:31:49.000000000 +0200
 +++ b/scripts/modules/player_text.py	2006-10-28 22:30:34.000000000 +0200
 @@ -1,4 +1,4 @@
diff --git a/debian/patches/no_avatar_font.patch b/debian/patches/no_avatar_font.patch
new file mode 100644
index 0000000..6518039
--- /dev/null
+++ b/debian/patches/no_avatar_font.patch
@@ -0,0 +1,15 @@
+Author: Barry deFreese <bdefreese at debian.org>
+Description: Avatar.ttf was removed from upstream tarball so patch to not install it.
+Index: wastesedge-0.3.5/gfx/window/font/Makefile.in
+===================================================================
+--- wastesedge-0.3.5.orig/gfx/window/font/Makefile.in	2008-06-28 15:48:42.000000000 -0400
++++ wastesedge-0.3.5/gfx/window/font/Makefile.in	2013-05-21 19:15:09.000000000 -0400
+@@ -108,7 +108,7 @@
+ install_sh = @install_sh@
+ SUBDIRS = blue green original red silverleaf violet white yellow
+ 
+-pkgdata_DATA = avatar.ttf
++pkgdata_DATA = 
+ 
+ EXTRA_DIST = $(pkgdata_DATA)
+ subdir = gfx/window/font
diff --git a/debian/patches/series b/debian/patches/series
index f0acc3f..a62ebec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_do_not_ship_pyc_files
 02_player_text.py.diff
+no_avatar_font.patch
diff --git a/debian/rules b/debian/rules
index 3dde21f..66c528a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -16,9 +17,10 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
-config.status: configure $(QUILT_STAMPFN)
-	dh_testdir
+%:
+	dh $@ --with python2, yes
 
+override_dh_auto_configure:
 	-test -r /usr/share/misc/config.sub && \
 	  cp -f /usr/share/misc/config.sub config.sub
 	-test -r /usr/share/misc/config.guess && \
@@ -32,20 +34,20 @@ config.status: configure $(QUILT_STAMPFN)
                     --with-adonthell-binary=/usr/games/adonthell \
                     --bindir=\$${prefix}/games
 
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
+override_dh_auto_build:
 	$(MAKE) wastesedge.desktop
 	$(MAKE) INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
                 DESTDIR="$(CURDIR)/debian/adonthell-data"
 	touch build-stamp
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
+override_dh_auto_install:
+	$(MAKE) install DESTDIR="$(CURDIR)/debian/adonthell-data" \
+                INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
+#                gamedatadir="$(CURDIR)/debian/adonthell-data/usr/share/games/adonthell-data"
+	mkdir -p $(CURDIR)/debian/adonthell-data/usr/share/applications
+	install -m 644 $(CURDIR)/wastesedge.desktop $(CURDIR)/debian/adonthell-data/usr/share/applications/adonthell-data.desktop
 
+override_dh_clean:
 	[ ! -f Makefile ] || $(MAKE) distclean
 
 	-rm -f config.status
@@ -53,50 +55,7 @@ clean: unpatch
 	-rm -f `find . -name "*.pyc"`
 	-rm -f po/*.gmo
 	-rm -f config.sub config.guess
+	find $(CURDIR)/debian -type d -empty -delete
 
 	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) install DESTDIR="$(CURDIR)/debian/adonthell-data" \
-                INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
-#                gamedatadir="$(CURDIR)/debian/adonthell-data/usr/share/games/adonthell-data"
-	mkdir -p $(CURDIR)/debian/adonthell-data/usr/share/applications
-	install -m 644 $(CURDIR)/wastesedge.desktop $(CURDIR)/debian/adonthell-data/usr/share/applications/adonthell-data.desktop
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installmenu
-	dh_installman debian/adonthell-wastesedge.6
-	dh_installchangelogs ChangeLog
-	dh_pysupport -V $(PYVERSION) adonthell-wastesedge \
-          /usr/share/games/adonthell/games/wastesedge/scripts/init.py \
-          /usr/share/games/adonthell/games/wastesedge/scripts/actions \
-          /usr/share/games/adonthell/games/wastesedge/scripts/dialogues \
-          /usr/share/games/adonthell/games/wastesedge/scripts/game_events \
-          /usr/share/games/adonthell/games/wastesedge/scripts/modules \
-          /usr/share/games/adonthell/games/wastesedge/scripts/schedules
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.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)
diff --git a/debian/watch b/debian/watch
index 38c273d..ff71627 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
 version=3
+
+opts="dversionmangle=s/\\+dfsg//" \
 http://savannah.nongnu.org/download/adonthell/wastesedge-src-(.*).tar.gz debian

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/adonthell-data.git

More information about the Pkg-games-commits mailing list