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

Evgeni Golov sargentd-guest at alioth.debian.org
Tue Jan 13 10:28:34 UTC 2009 

Author: sargentd-guest
Date: 2009-01-13 10:28:33 +0000 (Tue, 13 Jan 2009)
New Revision: 8641

Added:
   packages/trunk/yabause/debian/patches/01-fix_qt_build.patch
   packages/trunk/yabause/debian/yabause-common.install
   packages/trunk/yabause/debian/yabause-gtk.install
   packages/trunk/yabause/debian/yabause-qt.install
Modified:
   packages/trunk/yabause/debian/changelog
   packages/trunk/yabause/debian/control
   packages/trunk/yabause/debian/patches/series
   packages/trunk/yabause/debian/rules
Log:
  * New upstream release.
  * debian/control:
    + Update the short-descriptions.
    + Add a new yabause-common package, containing images and translations.
    + Add Build-Dep on libmini18n-dev, so we can enable translations.
      Closes: #508166
  * debian/rules:
    + Upstream now supports --programm-postfix, so we don't need to rename
      files on our own so much.
    + Rename build-%/Makefile to build-%/config-stamp, so the Makefile
      isn't erased.
  * debian/patches:
    + Add 01-fix_qt_build.patch so the Qt build does not FTBFS when built
      out of source.



Modified: packages/trunk/yabause/debian/changelog
===================================================================
--- packages/trunk/yabause/debian/changelog	2009-01-12 21:38:56 UTC (rev 8640)
+++ packages/trunk/yabause/debian/changelog	2009-01-13 10:28:33 UTC (rev 8641)
@@ -1,8 +1,21 @@
-yabause (0.9.8-2) UNRELEASED; urgency=low
+yabause (0.9.9-1) UNRELEASED; urgency=low
 
-  * Update the short-description.
+  * New upstream release.
+  * debian/control:
+    + Update the short-descriptions.
+    + Add a new yabause-common package, containing images and translations.
+    + Add Build-Dep on libmini18n-dev, so we can enable translations.
+      Closes: #508166
+  * debian/rules:
+    + Upstream now supports --programm-postfix, so we don't need to rename
+      files on our own so much.
+    + Rename build-%/Makefile to build-%/config-stamp, so the Makefile
+      isn't erased.
+  * debian/patches:
+    + Add 01-fix_qt_build.patch so the Qt build does not FTBFS when built
+      out of source.
 
- -- Evgeni Golov <sargentd at die-welt.net>  Thu, 18 Dec 2008 22:43:41 +0100
+ -- Evgeni Golov <sargentd at die-welt.net>  Tue, 13 Jan 2009 11:27:10 +0100
 
 yabause (0.9.8-1) unstable; urgency=low
 

Modified: packages/trunk/yabause/debian/control
===================================================================
--- packages/trunk/yabause/debian/control	2009-01-12 21:38:56 UTC (rev 8640)
+++ packages/trunk/yabause/debian/control	2009-01-13 10:28:33 UTC (rev 8641)
@@ -6,7 +6,7 @@
 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
+ libqt4-dev, libqt4-opengl-dev, libmini18n-dev
 Standards-Version: 3.8.0
 Homepage: http://yabause.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/yabause/
@@ -30,9 +30,27 @@
  This package is a metapackage, which installs either the Qt or the Gtk
  version of Yabause.
 
+Package: yabause-common
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: yabause-qt | yabause-gtk
+Description: beautiful and under-rated Saturn emulator - common files
+ Yabause is a Sega Saturn emulator. It has the following features:
+  * booting games from CD-ROM and ISO files
+  * booting games with either an emulated or original BIOS
+  * screenshot support
+  * savegame backups
+  * cheat system
+  * fullscreen playing
+  * multiple debugging options
+  * joystick support
+  * region select
+ .
+ This package contains arch-independend files like images and translations.
+
 Package: yabause-gtk
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, yabause-common (= ${source:Version})
 Description: beautiful and under-rated Saturn emulator - Gtk port
  Yabause is a Sega Saturn emulator. It has the following features:
   * booting games from CD-ROM and ISO files
@@ -49,7 +67,7 @@
 
 Package: yabause-qt
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, yabause-common (= ${source:Version})
 Description: beautiful and under-rated Saturn emulator - Qt port
  Yabause is a Sega Saturn emulator. It has the following features:
   * booting games from CD-ROM and ISO files

Added: packages/trunk/yabause/debian/patches/01-fix_qt_build.patch
===================================================================
--- packages/trunk/yabause/debian/patches/01-fix_qt_build.patch	                        (rev 0)
+++ packages/trunk/yabause/debian/patches/01-fix_qt_build.patch	2009-01-13 10:28:33 UTC (rev 8641)
@@ -0,0 +1,16 @@
+From: Guillaume Duhamel <guillaume at yabause.org>
+Date: 2009-01-13 10:41:00 +0100
+Subject: Fix Qt build by including relative paths
+License: GPL-2+
+
+--- yabause/src/qt/yabause.pro.in	2009-01-02 23:03:21.000000000 +0100
++++ yabause/src/qt/yabause.pro.in	2009-01-13 10:41:00.000000000 +0100
+@@ -21,7 +21,7 @@
+ mac:TARGET	= Yabause
+ CONFIG	+= debug_and_release x86 ppc
+ QT	+= opengl
+-INCLUDEPATH	+= . ui
++INCLUDEPATH	+= @srcdir@ @srcdir@/ui
+ LIBS	+= -L../ -lyabause @LIBS@ @LDFLAGS@
+ AC_DEFS = @DEFS@
+ CPPFLAGS = @CPPFLAGS@

Modified: packages/trunk/yabause/debian/patches/series
===================================================================
--- packages/trunk/yabause/debian/patches/series	2009-01-12 21:38:56 UTC (rev 8640)
+++ packages/trunk/yabause/debian/patches/series	2009-01-13 10:28:33 UTC (rev 8641)
@@ -1 +1 @@
-#
+01-fix_qt_build.patch

Modified: packages/trunk/yabause/debian/rules
===================================================================
--- packages/trunk/yabause/debian/rules	2009-01-12 21:38:56 UTC (rev 8640)
+++ packages/trunk/yabause/debian/rules	2009-01-13 10:28:33 UTC (rev 8641)
@@ -29,14 +29,16 @@
 endif
 	touch $@
 
-build-%/Makefile: config-common
+build-%/config-stamp: config-common
 	dh_testdir
 	mkdir -p build-$*
 	cd build-$* && \
 		CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \
-		$(CURDIR)/configure $(configure-flags) --with-port=$*
+		$(CURDIR)/configure $(configure-flags) --with-port=$* \
+		--program-suffix=-$*
+	touch $@
 
-build-%-stamp: build-%/Makefile
+build-%-stamp: build-%/config-stamp
 	dh_testdir
 	$(MAKE) -C build-$*
 	touch $@
@@ -57,20 +59,18 @@
 	dh_prep
 	dh_installdirs
 
+	$(MAKE) -C build-gtk install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C build-qt install DESTDIR=$(CURDIR)/debian/tmp
+
 	# install yabause-gtk
-	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
+	sed -i -e 's,yabause,yabause-gtk,' $(CURDIR)/debian/tmp/usr/share/applications/yabause-gtk.desktop
 
 	# install yabause-qt
-	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
+	sed -i -e 's,yabause,yabause-qt,' $(CURDIR)/debian/tmp/usr/share/applications/yabause-qt.desktop
 
+	dh_install
+
 # Build architecture-independent files here.
 binary-indep: install
 	dh binary-indep

Added: packages/trunk/yabause/debian/yabause-common.install
===================================================================
--- packages/trunk/yabause/debian/yabause-common.install	                        (rev 0)
+++ packages/trunk/yabause/debian/yabause-common.install	2009-01-13 10:28:33 UTC (rev 8641)
@@ -0,0 +1,2 @@
+usr/share/yabause/
+src/gtk/yabause.png usr/share/pixmaps

Added: packages/trunk/yabause/debian/yabause-gtk.install
===================================================================
--- packages/trunk/yabause/debian/yabause-gtk.install	                        (rev 0)
+++ packages/trunk/yabause/debian/yabause-gtk.install	2009-01-13 10:28:33 UTC (rev 8641)
@@ -0,0 +1,4 @@
+usr/bin/yabause-gtk
+usr/share/applications/yabause-gtk.desktop
+usr/share/pixmaps/yabause-gtk.png
+usr/share/man/man1/yabause-gtk.1

Added: packages/trunk/yabause/debian/yabause-qt.install
===================================================================
--- packages/trunk/yabause/debian/yabause-qt.install	                        (rev 0)
+++ packages/trunk/yabause/debian/yabause-qt.install	2009-01-13 10:28:33 UTC (rev 8641)
@@ -0,0 +1,4 @@
+usr/bin/yabause-qt
+usr/share/applications/yabause-qt.desktop
+usr/share/pixmaps/yabause-qt.png
+#usr/share/man/man1/yabause-qt.1

More information about the Pkg-games-commits mailing list