r12929 - in packages/trunk/xmoto/debian: . source

Stephen Kitt steve-guest at alioth.debian.org
Mon Dec 5 00:07:09 UTC 2011 

Author: steve-guest
Date: 2011-12-05 00:07:08 +0000 (Mon, 05 Dec 2011)
New Revision: 12929

Added:
   packages/trunk/xmoto/debian/source/
   packages/trunk/xmoto/debian/source/format
Modified:
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/compat
   packages/trunk/xmoto/debian/control
   packages/trunk/xmoto/debian/rules
   packages/trunk/xmoto/debian/xmoto.install
Log:
Switch to dh 9 with simple rules.
Use source format "3.0 (quilt)".
Add ${misc:Depends} where appropriate.


Modified: packages/trunk/xmoto/debian/changelog
===================================================================
--- packages/trunk/xmoto/debian/changelog	2011-12-04 21:57:00 UTC (rev 12928)
+++ packages/trunk/xmoto/debian/changelog	2011-12-05 00:07:08 UTC (rev 12929)
@@ -6,8 +6,11 @@
   * Update patches:
     + fix_segfault.patch: refresh, add DEP-3 header;
     + desktop.patch: re-apply, add German translation (closes: #641822).
+  * Switch to dh 9 with simple rules.
+  * Use source format "3.0 (quilt)".
+  * Add ${misc:Depends} where appropriate.
 
- -- Stephen Kitt <steve at sk2.org>  Wed, 10 Aug 2011 07:12:24 +0200
+ -- Stephen Kitt <steve at sk2.org>  Mon, 05 Dec 2011 01:04:52 +0100
 
 xmoto (0.5.5-1) unstable; urgency=low
 

Modified: packages/trunk/xmoto/debian/compat
===================================================================
--- packages/trunk/xmoto/debian/compat	2011-12-04 21:57:00 UTC (rev 12928)
+++ packages/trunk/xmoto/debian/compat	2011-12-05 00:07:08 UTC (rev 12929)
@@ -1 +1 @@
-5
+9

Modified: packages/trunk/xmoto/debian/control
===================================================================
--- packages/trunk/xmoto/debian/control	2011-12-04 21:57:00 UTC (rev 12928)
+++ packages/trunk/xmoto/debian/control	2011-12-05 00:07:08 UTC (rev 12929)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Samuel Mimram <smimram at debian.org>,
  Barry deFreese <bdefreese at debian.org>,
-Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.13.19), autotools-dev, quilt,
+Build-Depends: debhelper (>= 8.1.3), dpkg-dev (>= 1.13.19), autotools-dev,
  libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev,
  libjpeg-dev, libpng12-dev | libpng-dev, zlib1g-dev, libgl1-mesa-dev | libgl-dev,
  libode-dev, liblua5.1-0-dev, libcurl4-gnutls-dev, libbz2-dev, libsqlite3-dev,
@@ -16,7 +16,7 @@
 
 Package: xmoto
 Architecture: any
-Depends: ${shlibs:Depends}, xmoto-data (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, xmoto-data (= ${source:Version})
 Description: 2D motocross platform game
  X-Moto is a challenging 2D motocross platform game, where physics play
  an all important role in the gameplay. You need to control your bike to
@@ -25,6 +25,7 @@
 
 Package: xmoto-data
 Architecture: all
+Depends: ${misc:Depends}
 Suggests: xmoto (>= ${source:Version}), ttf-dejavu-core
 Description: 2D motocross platform game - data files
  X-Moto is a challenging 2D motocross platform game, where physics play

Modified: packages/trunk/xmoto/debian/rules
===================================================================
--- packages/trunk/xmoto/debian/rules	2011-12-04 21:57:00 UTC (rev 12928)
+++ packages/trunk/xmoto/debian/rules	2011-12-05 00:07:08 UTC (rev 12929)
@@ -3,113 +3,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+%:
+	dh $@
 
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += --build $(DEB_HOST_GNU_TYPE)
-else
-  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-patch-stamp: patch
-patch:
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
-	touch patch-stamp
-
-config.status: configure patch
-	dh_testdir
-	CFLAGS="$(CFLAGS) -Wl,-z,defs -DdDOUBLE"; \
-	CXXFLAGS="$(CFLAGS) -Wl,-z,defs -DdDOUBLE"; \
-	    if ! ./configure $(confflags) \
-	    	--prefix=/usr \
-	    	--bindir=\$${prefix}/games \
-	    	--datadir=\$${prefix}/share/games \
-	    	--mandir=\$${prefix}/share/man \
-		--localedir=\$${prefix}/share/games/locale; \
-	    then \
-		cat config.log; \
-		exit 1; \
-	fi
-
-
-build: patch-stamp build-stamp
-build-stamp: config.status
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp patch-stamp
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.log
-
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install --sourcedir=debian/tmp --list-missing
-	rm -f debian/xmoto/usr/share/games/xmoto/Textures/Fonts/DejaVuSans.ttf
-	cp extra/xmoto.desktop debian/xmoto/usr/share/applications/
-	cp extra/xmoto.xpm debian/xmoto/usr/share/pixmaps/
-
-
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i ChangeLog
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installmenu -i
-	dh_link -i
-	dh_strip -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a ChangeLog
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installmenu -a
-	dh_installmime -a
-	dh_installman -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--prefix=/usr \
+		--bindir=\$${prefix}/games \
+		--datadir=\$${prefix}/share/games \
+		--mandir=\$${prefix}/share/man \
+		--localedir=\$${prefix}/share/games/locale

Added: packages/trunk/xmoto/debian/source/format
===================================================================
--- packages/trunk/xmoto/debian/source/format	                        (rev 0)
+++ packages/trunk/xmoto/debian/source/format	2011-12-05 00:07:08 UTC (rev 12929)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: packages/trunk/xmoto/debian/xmoto.install
===================================================================
--- packages/trunk/xmoto/debian/xmoto.install	2011-12-04 21:57:00 UTC (rev 12928)
+++ packages/trunk/xmoto/debian/xmoto.install	2011-12-05 00:07:08 UTC (rev 12929)
@@ -1,3 +1,5 @@
 usr/games/xmoto
 usr/share/games/locale
 usr/share/man/man6/*
+extra/xmoto.desktop /usr/share/applications
+extra/xmoto.xpm /usr/share/pixmaps

More information about the Pkg-games-commits mailing list