r8474 - in packages/trunk/yabause/debian: . patches

Evgeni Golov sargentd-guest at alioth.debian.org
Wed Dec 3 18:50:54 UTC 2008 

Author: sargentd-guest
Date: 2008-12-03 18:50:54 +0000 (Wed, 03 Dec 2008)
New Revision: 8474

Modified:
   packages/trunk/yabause/debian/
   packages/trunk/yabause/debian/changelog
   packages/trunk/yabause/debian/compat
   packages/trunk/yabause/debian/control
   packages/trunk/yabause/debian/patches/series
   packages/trunk/yabause/debian/rules
Log:
* New upstream release.
* debian/rules:
  + Don't use rm in the clean target, use dh_clean instead.
  + Use more debhelper 7 helpers.
  + Use $(QUILT_STAMPFN) instead of patch, so configure isn't run twice.
  + Use more make magic to build the two interfaces.
* debian/control:
  + Add alternatives to Build-Depends.
  + Build-Depend on debhelper 7.
  + Add ${misc:Depends} to yabause's Depends to please lintian.
* debian/series:
  + Make lintian happy by putting a single # into series.




Property changes on: packages/trunk/yabause/debian
___________________________________________________________________
Name: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/yabause_0.9.7.orig.tar.gz
   + http://pkg-games.alioth.debian.org/tarballs/yabause_0.9.8.orig.tar.gz

Modified: packages/trunk/yabause/debian/changelog
===================================================================
--- packages/trunk/yabause/debian/changelog	2008-12-03 16:14:01 UTC (rev 8473)
+++ packages/trunk/yabause/debian/changelog	2008-12-03 18:50:54 UTC (rev 8474)
@@ -1,9 +1,19 @@
-yabause (0.9.7-2) UNRELEASED; urgency=low
+yabause (0.9.8-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+  * debian/rules:
+    + Don't use rm in the clean target, use dh_clean instead.
+    + Use more debhelper 7 helpers.
+    + Use $(QUILT_STAMPFN) instead of patch, so configure isn't run twice.
+    + Use more make magic to build the two interfaces.
   * debian/control:
     + Add alternatives to Build-Depends.
+    + Build-Depend on debhelper 7.
+    + Add ${misc:Depends} to yabause's Depends to please lintian.
+  * debian/series:
+    + Make lintian happy by putting a single # into series.
 
- -- Evgeni Golov <sargentd at die-welt.net>  Sun, 26 Oct 2008 12:38:12 +0100
+ -- Evgeni Golov <sargentd at die-welt.net>  Wed, 03 Dec 2008 19:41:09 +0100
 
 yabause (0.9.7-1) unstable; urgency=low
 

Modified: packages/trunk/yabause/debian/compat
===================================================================
--- packages/trunk/yabause/debian/compat	2008-12-03 16:14:01 UTC (rev 8473)
+++ packages/trunk/yabause/debian/compat	2008-12-03 18:50:54 UTC (rev 8474)
@@ -1 +1 @@
-6
+7

Modified: packages/trunk/yabause/debian/control
===================================================================
--- packages/trunk/yabause/debian/control	2008-12-03 16:14:01 UTC (rev 8473)
+++ packages/trunk/yabause/debian/control	2008-12-03 18:50:54 UTC (rev 8474)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Evgeni Golov <sargentd at die-welt.net>
-Build-Depends: debhelper (>= 6), autotools-dev, pkg-config, quilt (>= 0.40),
+Build-Depends: debhelper (>= 7), autotools-dev, pkg-config, quilt (>= 0.40),
  libgl1-mesa-dev | libgl-dev, freeglut3-dev | libglut-dev, libglu1-mesa-dev | libglu-dev,
  libsdl1.2-dev, libglib2.0-dev, libgtk2.0-dev, libgtkglext1-dev,
  libqt4-dev, libqt4-opengl-dev
@@ -14,7 +14,7 @@
 
 Package: yabause
 Architecture: all
-Depends: yabause-qt | yabause-gtk
+Depends: yabause-qt | yabause-gtk, ${misc:Depends}
 Description: Yet Another Buggy And Uncomplete Saturn Emulator
  Yabause is a Sega Saturn emulator. It has the following features:
   * booting games from CD-ROM and ISO files

Modified: packages/trunk/yabause/debian/patches/series
===================================================================
--- packages/trunk/yabause/debian/patches/series	2008-12-03 16:14:01 UTC (rev 8473)
+++ packages/trunk/yabause/debian/patches/series	2008-12-03 18:50:54 UTC (rev 8474)
@@ -0,0 +1 @@
+#

Modified: packages/trunk/yabause/debian/rules
===================================================================
--- packages/trunk/yabause/debian/rules	2008-12-03 16:14:01 UTC (rev 8473)
+++ packages/trunk/yabause/debian/rules	2008-12-03 18:50:54 UTC (rev 8474)
@@ -16,7 +16,10 @@
 	CROSS= --build $(DEB_BUILD_GNU_TYPE)
 endif
 
-config-common: patch
+configure-flags=$(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info
+
+config-common: $(QUILT_STAMPFN)
 	dh_testdir
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -24,99 +27,57 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-
-config-gtk: config-stamp-gtk
-config-stamp-gtk: config-common
-	dh_testdir
-	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man \
-	--infodir=\$${prefix}/share/info --with-port=gtk \
-	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
 	touch $@
 
-config-qt: config-stamp-qt
-config-stamp-qt: config-common
+build-%/Makefile: config-common
 	dh_testdir
-	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man \
-	--infodir=\$${prefix}/share/info --with-port=qt \
-	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
-	touch $@
+	mkdir -p build-$*
+	cd build-$* && \
+		CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \
+		$(CURDIR)/configure $(configure-flags) --with-port=$*
 
-build-gtk: build-stamp-gtk
-build-stamp-gtk: config-gtk
+build-%-stamp: build-%/Makefile
 	dh_testdir
-	$(MAKE)
+	$(MAKE) -C build-$*
 	touch $@
 
-build-qt: build-stamp-qt
-build-stamp-qt: config-qt
-	dh_testdir
-	$(MAKE)
-	touch $@
+build: build-gtk-stamp build-qt-stamp
 
-build: build-gtk build-qt
-
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp-gtk build-stamp-qt config-stamp-gtk config-stamp-qt
 
-	[ ! -f Makefile ] || $(MAKE) distclean
-	[ ! -f src/qt/Makefile ] || $(MAKE) -C src/qt distclean
-	[ ! -f src/gtk/Makefile ] || $(MAKE) -C src/gtk distclean
-	rm -f config.sub config.guess
+	$(RM) -r build-gtk build-qt
 
-	dh_clean 
+	dh_clean config-common config.sub config.guess
 
-install:
+install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	dh_installdirs
 
 	# install yabause-gtk
-	install -D src/gtk/yabause $(CURDIR)/debian/yabause-gtk/usr/bin/yabause-gtk
-	install -D doc/yabause.1 $(CURDIR)/debian/yabause-gtk/usr/share/man/man1/yabause-gtk.1
+	install -D build-gtk/src/gtk/yabause $(CURDIR)/debian/yabause-gtk/usr/bin/yabause-gtk
+	install -D src/gtk/doc/yabause.1 $(CURDIR)/debian/yabause-gtk/usr/share/man/man1/yabause-gtk.1
 	install -D src/gtk/yabause.desktop $(CURDIR)/debian/yabause-gtk/usr/share/applications/yabause-gtk.desktop
 	install -D -m 0644 src/gtk/yabause.png $(CURDIR)/debian/yabause-gtk/usr/share/pixmaps/yabause-gtk.png
 	sed -i -e 's,yabause,yabause-gtk,' $(CURDIR)/debian/yabause-gtk/usr/share/applications/yabause-gtk.desktop
 
 	# install yabause-qt
-	install -D src/qt/yabause $(CURDIR)/debian/yabause-qt/usr/bin/yabause-qt
-	install -D doc/yabause.1 $(CURDIR)/debian/yabause-qt/usr/share/man/man1/yabause-qt.1
+	install -D build-qt/src/qt/yabause $(CURDIR)/debian/yabause-qt/usr/bin/yabause-qt
+	install -D src/gtk/doc/yabause.1 $(CURDIR)/debian/yabause-qt/usr/share/man/man1/yabause-qt.1
 	install -D src/qt/yabause.desktop $(CURDIR)/debian/yabause-qt/usr/share/applications/yabause-qt.desktop
 	install -D -m 0644 src/qt/resources/icons/yabause.png $(CURDIR)/debian/yabause-qt/usr/share/pixmaps/yabause-qt.png
 	sed -i -e 's,yabause,yabause-qt,' $(CURDIR)/debian/yabause-qt/usr/share/applications/yabause-qt.desktop
 
 # Build architecture-independent files here.
-binary-indep:
-	dh_testdir
-	dh_testroot
-	dh_clean -i -k
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_compress -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+binary-indep: install
+	dh binary-indep
 
 # Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -a ChangeLog
-	dh_installdocs -a
-	dh_installman -a
-	dh_desktop -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+binary-arch: install
+	dh binary-arch
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install

More information about the Pkg-games-commits mailing list