[ri-li] 21/93: * new upstream release * music license clarified -remove 20_turn_of_music_in_dfsg_tarball.patch -add Maf464 in copyright file * update description * minor changes in rules file

Markus Koschany apo-guest at moszumanska.debian.org
Wed Dec 2 17:55:40 UTC 2015


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 e591d74261e3cf077eb94bd6fe58eee30011ce24
Author: Gonéri Le Bouder <goneri at rulezlan.org>
Date:   Sat Jul 22 01:31:24 2006 +0000

      * new upstream release
      * music license clarified
       -remove 20_turn_of_music_in_dfsg_tarball.patch
       -add Maf464 in copyright file
      * update description
      * minor changes in rules file
---
 debian/changelog                                   | 13 ++++++---
 debian/control                                     |  8 ++++++
 debian/copyright                                   |  1 +
 debian/patches/10_data_in_usr_games_ri-li.patch    | 32 ++++++++++++++++------
 .../patches/20_turn_of_music_in_dfsg_tarball.patch | 15 ----------
 debian/ri-li.desktop                               |  2 +-
 debian/rules                                       |  3 +-
 7 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e50f644..7d8292b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-ri-li (1.0.2.dfsg.1-2) UNRELEASED; urgency=low
+ri-li (1.2.0-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
-
- -- Alexander Schmehl <alex at schmehl.info>  Wed, 19 Jul 2006 10:28:16 +0200
+  * new upstream release
+  * music license clarified
+   -remove 20_turn_of_music_in_dfsg_tarball.patch
+   -add Maf464 in copyright file
+  * update description
+  * minor changes in rules file
+   
+ -- Gonéri Le Bouder <goneri at rulezlan.org>  Sat, 22 Jul 2006 02:09:59 +0200
 
 ri-li (1.0.2.dfsg.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1cd7c1d..563a642 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,14 @@ Description: a toy simulator game
  Ri-Li is a game. You drive a toy wood engine in many levels and you
  must collect all the  coaches to win.
  .
+ Full-featured,
+  - 14 languages: Arabic, Breton, Chinese, English, Esperanto, French,
+  German, Italian, Japanese, Portuguese, Russian, Slovak, 
+  Spanish, Swedish.
+  - Colorful animated wood engine.
+  - 40 levels in this first version
+  - 3 beautiful musics and many sound effects.
+ .
   Homepage: http://www.ri-li.org/
 
 Package: ri-li-data
diff --git a/debian/copyright b/debian/copyright
index c0004da..95dfcfa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,6 +4,7 @@ Mon,  3 Jul 2006 18:36:12 +0200
 It was downloaded from http://www.ri-li.org/
 
 Copyright 2006 Dominique Roux-Serret <roux-serret at ifrance.com>
+Copyright 2006 - Maf464 - Charcosset B. - charcosset.b at free.fr
 
 Ri-li is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/debian/patches/10_data_in_usr_games_ri-li.patch b/debian/patches/10_data_in_usr_games_ri-li.patch
index 1f51f0f..192cf8d 100644
--- a/debian/patches/10_data_in_usr_games_ri-li.patch
+++ b/debian/patches/10_data_in_usr_games_ri-li.patch
@@ -1,27 +1,43 @@
-diff -ru Ri-li-1.0.2.orig/configure Ri-li-1.0.2/configure
---- Ri-li-1.0.2.orig/configure	2006-07-16 20:01:27.000000000 +0200
-+++ Ri-li-1.0.2/configure	2006-07-16 20:02:08.000000000 +0200
+diff -ru Ri-li-1.2.0.orig/configure Ri-li-1.2.0/configure
+--- Ri-li-1.2.0.orig/configure	2006-07-22 02:29:43.000000000 +0200
++++ Ri-li-1.2.0/configure	2006-07-22 02:30:06.000000000 +0200
 @@ -1612,7 +1612,7 @@
  
  
  # Define the identity of the package.
 - PACKAGE=Ri-li
 + PACKAGE=ri-li
-  VERSION=1.0.2
+  VERSION=1.2.0
  
  
-diff -ru Ri-li-1.0.2.orig/src/utils.cc Ri-li-1.0.2/src/utils.cc
---- Ri-li-1.0.2.orig/src/utils.cc	2006-07-16 20:01:27.000000000 +0200
-+++ Ri-li-1.0.2/src/utils.cc	2006-07-16 20:03:24.000000000 +0200
-@@ -236,11 +236,7 @@
+diff -ru Ri-li-1.2.0.orig/configure.in Ri-li-1.2.0/configure.in
+--- Ri-li-1.2.0.orig/configure.in	2006-07-22 02:29:43.000000000 +0200
++++ Ri-li-1.2.0/configure.in	2006-07-22 02:30:22.000000000 +0200
+@@ -2,7 +2,7 @@
+ # Process this file with autoconf to produce a configure script.
+ 
+ AC_INIT(src/main.cc)
+-AM_INIT_AUTOMAKE(Ri-li, 1.2.0)
++AM_INIT_AUTOMAKE(ri-li, 1.2.0)
+ 
+ AC_CONFIG_SRCDIR([src/main.cc])
+ AC_CONFIG_HEADER([config.h])
+diff -ru Ri-li-1.2.0.orig/src/utils.cc Ri-li-1.2.0/src/utils.cc
+--- Ri-li-1.2.0.orig/src/utils.cc	2006-07-22 02:29:43.000000000 +0200
++++ Ri-li-1.2.0/src/utils.cc	2006-07-22 02:31:30.000000000 +0200
+@@ -236,15 +236,7 @@
      if(FileExiste(Path)) return;
    }
  
+-  sprintf(Path,"%s/%s",DATA_DIR,Provi);
+-  if(FileExiste(Path)) return;
 -  sprintf(Path,"./%s",Provi);
 -  if(FileExiste(Path)) return;
 -  sprintf(Path,"/usr/local/share/Ri-li/%s",Provi);
 -  if(FileExiste(Path)) return;
 -  sprintf(Path,"/usr/share/Ri-li/%s",Provi);
+-  if(FileExiste(Path)) return;
+-  sprintf(Path,"/usr/share/games/Ri-li/%s",Provi);
 +  sprintf(Path,"/usr/share/games/ri-li/%s",Provi);
    if(FileExiste(Path)) return;
    
diff --git a/debian/patches/20_turn_of_music_in_dfsg_tarball.patch b/debian/patches/20_turn_of_music_in_dfsg_tarball.patch
deleted file mode 100644
index b477f8c..0000000
--- a/debian/patches/20_turn_of_music_in_dfsg_tarball.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru ri-li-1.0.2.dfsg.1.orig/src/main.cc ri-li-1.0.2.dfsg.1/src/main.cc
---- ri-li-1.0.2.dfsg.1.orig/src/main.cc	2006-07-18 00:58:20.000000000 +0200
-+++ ri-li-1.0.2.dfsg.1/src/main.cc	2006-07-18 00:58:44.000000000 +0200
-@@ -193,9 +193,9 @@
-       RetM=MenuPrincipale.SDLMain_Niveau();
-       break;
-     case mJeux:
--      Sons.LoadMusic(1);
-+//      Sons.LoadMusic(1);
-       RetM=Jeu.SDLMain();
--      Sons.LoadMusic(0);
-+//      Sons.LoadMusic(0);
-       break;
-     case mEdit:
-       RetM=Edit.SDLMain(0);
diff --git a/debian/ri-li.desktop b/debian/ri-li.desktop
index 88ee43d..634af20 100644
--- a/debian/ri-li.desktop
+++ b/debian/ri-li.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Ri-li
 Comment=a toy simulator game
-Comment[fr]=un simulateur de petit train
+Comment[fr]=un jeu de petit train
 Exec=/usr/games/ri-li
 Icon=ri-li
 Terminal=false
diff --git a/debian/rules b/debian/rules
index 74077ea..7e61734 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,8 +25,7 @@ install/ri-li::
 		debian/tmp/usr/share/pixmaps/
 
 install/ri-li-data::
-	# remove some useless files
-	rm debian/tmp/usr/share/ri-li/ri-li.ico
 	# mv data in /usr/share/games/ri-li
 	mkdir -p debian/tmp/usr/share/games
 	mv debian/tmp/usr/share/ri-li debian/tmp/usr/share/games
+	rm debian/tmp/usr/share/games/ri-li/COPYING.Music

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



More information about the Pkg-games-commits mailing list