r14376 - in packages/trunk/mmpong/debian: . patches

Barry deFreese bdefreese at alioth.debian.org
Sun Jun 30 17:56:54 UTC 2013 

Author: bdefreese
Date: 2013-06-30 17:56:54 +0000 (Sun, 30 Jun 2013)
New Revision: 14376

Added:
   packages/trunk/mmpong/debian/mmpong-gl-data.links
   packages/trunk/mmpong/debian/patches/0004_rollup_enabled.patch
   packages/trunk/mmpong/debian/patches/0005_desktop_encoding.patch
Modified:
   packages/trunk/mmpong/debian/changelog
   packages/trunk/mmpong/debian/compat
   packages/trunk/mmpong/debian/control
   packages/trunk/mmpong/debian/patches/series
   packages/trunk/mmpong/debian/rules
Log:
Patch to RollUpEnabled.  Move packaging to dh. Update standards, etc

Modified: packages/trunk/mmpong/debian/changelog
===================================================================
--- packages/trunk/mmpong/debian/changelog	2013-06-30 16:50:23 UTC (rev 14375)
+++ packages/trunk/mmpong/debian/changelog	2013-06-30 17:56:54 UTC (rev 14376)
@@ -1,3 +1,15 @@
+mmpong (0.9.1-3) unstable; urgency=low
+
+  * Acknowledge NMU.
+  * Add patch for RollupEnabled to RollUpEnabled. (Closes: #684602).
+  * Add patch to remove Encoding from desktop file.
+  * Move from CDBS build system to dh.
+  * Use canonical VCS tags.
+  * Bump debhelper build-dep and compat to 9.
+  * Bump Standards Version to 3.9.4.
+
+ -- Barry deFreese <bdefreese at debian.org>  Sun, 30 Jun 2013 05:26:42 -0400
+
 mmpong (0.9.1-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -15,7 +27,7 @@
   * Standards-Version: updated to 3.9.2 (no changes required).
   * Escaped dashes in manpage source (lintian warning).
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Sat, 17 Dec 2011 09:23:26 -0500
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Sat, 10 Dec 2011 23:30:46 -0500
 
 mmpong (0.9.1-1) unstable; urgency=low
 

Modified: packages/trunk/mmpong/debian/compat
===================================================================
--- packages/trunk/mmpong/debian/compat	2013-06-30 16:50:23 UTC (rev 14375)
+++ packages/trunk/mmpong/debian/compat	2013-06-30 17:56:54 UTC (rev 14376)
@@ -1 +1 @@
-7
+9

Modified: packages/trunk/mmpong/debian/control
===================================================================
--- packages/trunk/mmpong/debian/control	2013-06-30 16:50:23 UTC (rev 14375)
+++ packages/trunk/mmpong/debian/control	2013-06-30 17:56:54 UTC (rev 14376)
@@ -3,12 +3,12 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: André Gaul <gaul at web-yard.de>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, cmake, libsdl1.2-dev,
+Build-Depends: debhelper (>= 9), cmake, libsdl1.2-dev,
  libsdl-image1.2-dev, libsdl-mixer1.2-dev, libcaca-dev (>=0.99.beta16),
  libcegui-mk2-dev (>= 0.7), pkg-config
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/mmpong
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/mmpong/?op=log
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/mmpong
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/mmpong/
 Homepage: http://www.mmpong.net
 
 Package: libmmpong0.9

Added: packages/trunk/mmpong/debian/mmpong-gl-data.links
===================================================================
--- packages/trunk/mmpong/debian/mmpong-gl-data.links	                        (rev 0)
+++ packages/trunk/mmpong/debian/mmpong-gl-data.links	2013-06-30 17:56:54 UTC (rev 14376)
@@ -0,0 +1 @@
+/usr/share/fonts/truetype/freefont/FreeSansBold.ttf usr/share/games/mmpong-gl/CEGUI/fonts/FreeSansBold.ttf

Added: packages/trunk/mmpong/debian/patches/0004_rollup_enabled.patch
===================================================================
--- packages/trunk/mmpong/debian/patches/0004_rollup_enabled.patch	                        (rev 0)
+++ packages/trunk/mmpong/debian/patches/0004_rollup_enabled.patch	2013-06-30 17:56:54 UTC (rev 14376)
@@ -0,0 +1,17 @@
+Description: Fix CEGUI error on startup.
+ RollupEnabled should be RollUpEnabled..
+Author: Barry deFreese <bdefreese at debian.org>
+Last-Update: 2013-06-30
+Index: mmpong-0.9.1/resources/CEGUI/layouts/mmpong-gl.layout
+===================================================================
+--- mmpong-0.9.1.orig/resources/CEGUI/layouts/mmpong-gl.layout	2010-03-31 13:58:21.000000000 -0400
++++ mmpong-0.9.1/resources/CEGUI/layouts/mmpong-gl.layout	2013-06-30 05:26:32.000000000 -0400
+@@ -82,7 +82,7 @@
+             <Property Name="Visible" Value="false" />
+             <Property Name="TitlebarFont" Value="FreeSans-10" />
+             <Property Name="TitlebarEnabled" Value="True" />
+-            <Property Name="RollupEnabled" Value="false" />
++            <Property Name="RollUpEnabled" Value="false" />
+             <Property Name="CloseButtonEnabled" Value="false" />
+             <Property Name="UnifiedPosition" Value="{{0.25,0},{0.35,0}}" />
+             <Property Name="UnifiedSize" Value="{{0.5,0},{0.3,0}}" />

Added: packages/trunk/mmpong/debian/patches/0005_desktop_encoding.patch
===================================================================
--- packages/trunk/mmpong/debian/patches/0005_desktop_encoding.patch	                        (rev 0)
+++ packages/trunk/mmpong/debian/patches/0005_desktop_encoding.patch	2013-06-30 17:56:54 UTC (rev 14376)
@@ -0,0 +1,12 @@
+Description: Remove Encoding tag from upsream desktop file.
+Author: Barry deFreese <bdefreese at debian.org>
+Index: mmpong-0.9.1/resources/applications/mmpong-gl.desktop
+===================================================================
+--- mmpong-0.9.1.orig/resources/applications/mmpong-gl.desktop	2009-01-12 12:53:12.000000000 -0500
++++ mmpong-0.9.1/resources/applications/mmpong-gl.desktop	2013-06-30 09:49:51.000000000 -0400
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=mmpong-gl
+ Icon=mmpong-gl

Modified: packages/trunk/mmpong/debian/patches/series
===================================================================
--- packages/trunk/mmpong/debian/patches/series	2013-06-30 16:50:23 UTC (rev 14375)
+++ packages/trunk/mmpong/debian/patches/series	2013-06-30 17:56:54 UTC (rev 14376)
@@ -1,3 +1,5 @@
 0001-manpages.patch
 0002-cegui-mk2-0.7.5.patch
 0003-FTBFS-gcc-4.7.patch
+0004_rollup_enabled.patch
+0005_desktop_encoding.patch

Modified: packages/trunk/mmpong/debian/rules
===================================================================
--- packages/trunk/mmpong/debian/rules	2013-06-30 16:50:23 UTC (rev 14375)
+++ packages/trunk/mmpong/debian/rules	2013-06-30 17:56:54 UTC (rev 14376)
@@ -1,13 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
+%:
+	dh $@ --buildsystem=cmake
 
-DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(DEB_DESTDIR)
-
-install/mmpong-gl-data::
-		rm ./debian/tmp/usr/share/games/mmpong-gl/CEGUI/fonts/FreeSansBold.ttf
-		ln -s /usr/share/fonts/truetype/freefont/FreeSansBold.ttf ./debian/tmp/usr/share/games/mmpong-gl/CEGUI/fonts/FreeSansBold.ttf
-	  rm ./debian/tmp/usr/share/games/mmpong-gl/CEGUI/copyright
-	  rm ./debian/tmp/usr/share/games/mmpong-gl/sounds/copyright 
-
+override_dh_install:
+	rm -f debian/tmp/usr/share/games/mmpong-gl/CEGUI/fonts/FreeSansBold.ttf
+	rm -f debian/tmp/usr/share/games/mmpong-gl/CEGUI/copyright
+	rm -f debian/tmp/usr/share/games/mmpong-gl/sounds/copyright
+	dh_install

More information about the Pkg-games-commits mailing list