This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository ri-li.

commit 8403265caf147800f616289d5dd6366a43b30439
Author: Markus Koschany <[email protected]>
Date:   Fri Apr 18 11:55:41 2014 +0000

    Debian release 2.0.1+ds-1
    
    Add fix-compiler-warnings.patch
    Install icons to arch-independent package
    Add Breaks and Replaces accordingly
---
 debian/changelog          | 10 +++++++---
 debian/control            |  2 ++
 debian/patches/series     |  1 +
 debian/ri-li-data.install |  1 +
 debian/ri-li.6            |  6 +-----
 debian/ri-li.install      |  1 -
 debian/rules              |  3 ---
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36196fb..acec102 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 @@ ri-li (2.0.1+ds-1) UNRELEASED; urgency=medium
     - 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 @@ ri-li (2.0.1+ds-1) UNRELEASED; urgency=medium
     - 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 <[email protected]>  Thu, 17 Apr 2014 19:01:25 +0200
+ -- Markus Koschany <[email protected]>  Fri, 18 Apr 2014 13:26:07 +0200
 
 ri-li (2.0.1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b4d2ab7..34e368a 100644
--- a/debian/control
+++ b/debian/control
@@ -46,6 +46,8 @@ Depends:
  ${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.
diff --git a/debian/patches/series b/debian/patches/series
index b5787c8..ca64563 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-gcc4.3-ftbfs.patch
+fix-compiler-warnings.patch
diff --git a/debian/ri-li-data.install b/debian/ri-li-data.install
index 84ab3a8..40d69d7 100644
--- a/debian/ri-li-data.install
+++ b/debian/ri-li-data.install
@@ -1,2 +1,3 @@
 ri-li.png usr/share/icons/hicolor/128x128/apps
+ri-li.xpm usr/share/pixmaps
 usr/share/games
diff --git a/debian/ri-li.6 b/debian/ri-li.6
index dc52b9f..6133909 100644
--- a/debian/ri-li.6
+++ b/debian/ri-li.6
@@ -30,9 +30,5 @@ This manual page was written by Goneri Le Bouder 
[email protected] and
 H. S. Teoh [email protected] 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
-
diff --git a/debian/ri-li.install b/debian/ri-li.install
index f18cd9c..219746f 100644
--- a/debian/ri-li.install
+++ b/debian/ri-li.install
@@ -1,3 +1,2 @@
 debian/ri-li.desktop usr/share/applications
-ri-li.xpm usr/share/pixmaps
 usr/games/ri-li
diff --git a/debian/rules b/debian/rules
index 5ef2dc2..3456748 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,13 +26,10 @@ override_dh_auto_build-indep:
        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

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ri-li.git

_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to