r15032 - in packages/trunk/ri-li/debian: . patches

[Markus Koschany]

Author: apo-guest
Date: 2014-04-18 11:55:41 +0000 (Fri, 18 Apr 2014)
New Revision: 15032

Modified:
   packages/trunk/ri-li/debian/changelog
   packages/trunk/ri-li/debian/control
   packages/trunk/ri-li/debian/patches/series
   packages/trunk/ri-li/debian/ri-li-data.install
   packages/trunk/ri-li/debian/ri-li.6
   packages/trunk/ri-li/debian/ri-li.install
   packages/trunk/ri-li/debian/rules
Log:
Debian release 2.0.1+ds-1

Add fix-compiler-warnings.patch
Install icons to arch-independent package
Add Breaks and Replaces accordingly



Modified: packages/trunk/ri-li/debian/changelog
===================================================================
--- packages/trunk/ri-li/debian/changelog	2014-04-18 01:32:06 UTC (rev 15031)
+++ packages/trunk/ri-li/debian/changelog	2014-04-18 11:55:41 UTC (rev 15032)
@@ -1,4 +1,4 @@
-ri-li (2.0.1+ds-1) UNRELEASED; urgency=medium
+ri-li (2.0.1+ds-1) unstable; urgency=medium
 
   [ Miguel Telleria de Esteban ]
   * Added Spanish comment translation in ri-li.desktop file.
@@ -39,7 +39,8 @@
     - 20_remove_gentoo_dir.diff.
     - 50_remove_-lpthread.diff.
   * Rename the remaining patch to fix-gcc4.3-ftbfs.patch. Refresh and update
-    it for the new files in data-src.
+    it for the new files in data-src. Add DEP-3 header.
+  * Add fix-compiler-warnings.patch to fix deprecated code conventions.
   * Update debian/watch. Mangle the version correctly. Improve extension regex.
   * Fix spelling and grammar errors in package description.
     - Thanks to Chris King and Justin B Rye for the report and patch
@@ -55,8 +56,11 @@
     - Thanks Ronny Standtke for the report. (Closes: #725181)
   * Simplify debian/rules by using dh sequencer.
   * Update debian/copyright to copyright format 3.0.
+  * Add clean file. Ensure that Ri-li can be built twice in a row.
+  * Add Breaks and Replaces to ri-li-data since the icons have been moved to
+    the arch-independent package.
 
- -- Markus Koschany <apo at gambaru.de>  Thu, 17 Apr 2014 19:01:25 +0200
+ -- Markus Koschany <apo at gambaru.de>  Fri, 18 Apr 2014 13:26:07 +0200
 
 ri-li (2.0.1-2) unstable; urgency=low
 

Modified: packages/trunk/ri-li/debian/control
===================================================================
--- packages/trunk/ri-li/debian/control	2014-04-18 01:32:06 UTC (rev 15031)
+++ packages/trunk/ri-li/debian/control	2014-04-18 11:55:41 UTC (rev 15032)
@@ -46,6 +46,8 @@
  ${misc:Depends}
 Suggests:
  ri-li
+Breaks: ri-li (<< 2.0.1+ds-1)
+Replaces: ri-li (<< 2.0.1+ds-1)
 Description: toy train simulation game - data files
  Ri-li is a game in which you drive a wooden toy steam locomotive across many
  levels and collect all the coaches to win.

Modified: packages/trunk/ri-li/debian/patches/series
===================================================================
--- packages/trunk/ri-li/debian/patches/series	2014-04-18 01:32:06 UTC (rev 15031)
+++ packages/trunk/ri-li/debian/patches/series	2014-04-18 11:55:41 UTC (rev 15032)
@@ -1 +1,2 @@
 fix-gcc4.3-ftbfs.patch
+fix-compiler-warnings.patch

Modified: packages/trunk/ri-li/debian/ri-li-data.install
===================================================================
--- packages/trunk/ri-li/debian/ri-li-data.install	2014-04-18 01:32:06 UTC (rev 15031)
+++ packages/trunk/ri-li/debian/ri-li-data.install	2014-04-18 11:55:41 UTC (rev 15032)
@@ -1,2 +1,3 @@
 ri-li.png usr/share/icons/hicolor/128x128/apps
+ri-li.xpm usr/share/pixmaps
 usr/share/games

Modified: packages/trunk/ri-li/debian/ri-li.6
===================================================================
--- packages/trunk/ri-li/debian/ri-li.6	2014-04-18 01:32:06 UTC (rev 15031)
+++ packages/trunk/ri-li/debian/ri-li.6	2014-04-18 11:55:41 UTC (rev 15032)
@@ -30,9 +30,5 @@
 H. S. Teoh hsteoh at quickfur.ath.cx for
 the \fBDebian\fP system (but may be used by others).  Permission is
 granted to copy, distribute and/or modify this document under
-the terms of the GNU General Public License, Version 2 any
+the terms of the GNU General Public License, Version 2 or any
 later version published by the Free Software Foundation.
-
-.PP
-On Debian systems, the complete text of the GNU General Public
-

Modified: packages/trunk/ri-li/debian/ri-li.install
===================================================================
--- packages/trunk/ri-li/debian/ri-li.install	2014-04-18 01:32:06 UTC (rev 15031)
+++ packages/trunk/ri-li/debian/ri-li.install	2014-04-18 11:55:41 UTC (rev 15032)
@@ -1,3 +1,2 @@
 debian/ri-li.desktop usr/share/applications
-ri-li.xpm usr/share/pixmaps
 usr/games/ri-li

Modified: packages/trunk/ri-li/debian/rules
===================================================================
--- packages/trunk/ri-li/debian/rules	2014-04-18 01:32:06 UTC (rev 15031)
+++ packages/trunk/ri-li/debian/rules	2014-04-18 11:55:41 UTC (rev 15032)
@@ -26,13 +26,10 @@
 	convert -monitor data-src/pov/Textures/Ri-li.ico ri-li.png
 
 override_dh_install:
-	find debian/tmp -name '*.ebuild' -delete
 	mv debian/tmp/usr/games/Ri_li debian/tmp/usr/games/ri-li
 	rm -f debian/tmp/usr/share/games/ri-li/Ri-li/COPYING.Music
 	dh_install
 
-override_dh_clean:
-	dh_clean data/language.* data/sprites.dat ri-li.*
 
 ## http://wiki.debian.org/onlyjob/get-orig-source
 .PHONY: get-orig-source