r14535 - in packages/trunk/renpy/debian: . patches

Miriam Ruiz miriam at alioth.debian.org
Fri Aug 30 22:51:00 UTC 2013


Author: miriam
Date: 2013-08-30 22:51:00 +0000 (Fri, 30 Aug 2013)
New Revision: 14535

Removed:
   packages/trunk/renpy/debian/patches/04_editor.patch
Modified:
   packages/trunk/renpy/debian/changelog
   packages/trunk/renpy/debian/control
   packages/trunk/renpy/debian/patches/01_abspaths.patch
   packages/trunk/renpy/debian/patches/02_traceback.patch
   packages/trunk/renpy/debian/patches/03_checkdir.patch
   packages/trunk/renpy/debian/patches/series
   packages/trunk/renpy/debian/rules
Log:
New Upstream Release



Modified: packages/trunk/renpy/debian/changelog
===================================================================
--- packages/trunk/renpy/debian/changelog	2013-08-30 19:43:18 UTC (rev 14534)
+++ packages/trunk/renpy/debian/changelog	2013-08-30 22:51:00 UTC (rev 14535)
@@ -1,9 +1,14 @@
-renpy (6.13.12-2) UNRELEASED; urgency=low
+renpy (6.15.7-1) UNRELEASED; urgency=low
 
+  [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
- -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 22:22:02 +0200
+  [ Miriam Ruiz ]
+  * New Upstream Release
+  * Upgraded Standards-Version from 3.9.3 to 3.9.4
 
+ -- Miriam Ruiz <miriam at debian.org>  Fri, 30 Aug 2013 22:10:15 +0200
+
 renpy (6.13.12-1) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/trunk/renpy/debian/control
===================================================================
--- packages/trunk/renpy/debian/control	2013-08-30 19:43:18 UTC (rev 14534)
+++ packages/trunk/renpy/debian/control	2013-08-30 22:51:00 UTC (rev 14535)
@@ -10,7 +10,7 @@
  libavutil-dev, libavformat-dev, libavcodec-dev, libswscale-dev,
  libfribidi-dev, libglew1.5-dev, zlib1g-dev, libfreetype6-dev,
  libpng12-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://www.renpy.org/
 XS-Python-Version: >= 2.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/renpy/

Modified: packages/trunk/renpy/debian/patches/01_abspaths.patch
===================================================================
--- packages/trunk/renpy/debian/patches/01_abspaths.patch	2013-08-30 19:43:18 UTC (rev 14534)
+++ packages/trunk/renpy/debian/patches/01_abspaths.patch	2013-08-30 22:51:00 UTC (rev 14535)
@@ -1,26 +1,25 @@
---- renpy-6.13.12.orig/renpy.py
-+++ renpy-6.13.12/renpy.py
-@@ -36,7 +36,14 @@
- # the path to a directory that will hold save files.
- def path_to_saves(gamedir):
-     import renpy #@UnresolvedImport
--    
-+
+Index: renpy-6.15.7-source/renpy.py
+===================================================================
+--- renpy-6.15.7-source.orig/renpy.py	2013-08-30 22:12:41.277200859 +0200
++++ renpy-6.15.7-source/renpy.py	2013-08-30 22:14:56.765200683 +0200
+@@ -59,6 +59,12 @@
+                     
+         return rv
+     
 +    if gamedir.startswith("/usr/share/games/renpy"):
 +        # The gamename is the final component of the path to the gamedir
 +        gamename = gamedir[len("/usr/share/games/renpy"):]
 +        if gamename.endswith("/game") or gamename.endswith("/data"):
 +            gamename = gamename[:-5]
 +        return os.path.expanduser("~/.renpy/") + gamename + "/saves"
-+
+     
+     # No save directory given.
      if not renpy.config.save_directory:
-         return gamedir + "/saves"
- 
-@@ -76,7 +83,7 @@
+@@ -97,7 +103,7 @@
  # Returns the path to the Ren'Py base directory (containing common and
  # the launcher, usually.)
  def path_to_renpy_base():
--    renpy_base = os.path.dirname(sys.argv[0])
+-    renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
 +    renpy_base = "/usr/share/games/renpy"
      renpy_base = os.environ.get('RENPY_BASE', renpy_base)
      renpy_base = os.path.abspath(renpy_base)

Modified: packages/trunk/renpy/debian/patches/02_traceback.patch
===================================================================
--- packages/trunk/renpy/debian/patches/02_traceback.patch	2013-08-30 19:43:18 UTC (rev 14534)
+++ packages/trunk/renpy/debian/patches/02_traceback.patch	2013-08-30 22:51:00 UTC (rev 14535)
@@ -1,6 +1,8 @@
---- renpy-6.13.12.orig/renpy/bootstrap.py
-+++ renpy-6.13.12/renpy/bootstrap.py
-@@ -481,11 +481,25 @@
+Index: renpy-6.15.7-source/renpy/bootstrap.py
+===================================================================
+--- renpy-6.15.7-source.orig/renpy/bootstrap.py	2013-08-30 22:15:17.141200657 +0200
++++ renpy-6.15.7-source/renpy/bootstrap.py	2013-08-30 22:15:17.133200657 +0200
+@@ -455,11 +455,25 @@
      
      simple = simple.getvalue()
      full = full.getvalue()

Modified: packages/trunk/renpy/debian/patches/03_checkdir.patch
===================================================================
--- packages/trunk/renpy/debian/patches/03_checkdir.patch	2013-08-30 19:43:18 UTC (rev 14534)
+++ packages/trunk/renpy/debian/patches/03_checkdir.patch	2013-08-30 22:51:00 UTC (rev 14535)
@@ -1,6 +1,8 @@
---- renpy-6.13.12.orig/renpy/main.py
-+++ renpy-6.13.12/renpy/main.py
-@@ -164,6 +164,10 @@
+Index: renpy-6.15.7-source/renpy/main.py
+===================================================================
+--- renpy-6.15.7-source.orig/renpy/main.py	2013-08-30 22:15:23.549200649 +0200
++++ renpy-6.15.7-source/renpy/main.py	2013-08-30 22:15:23.541200649 +0200
+@@ -142,6 +142,10 @@
      # Set up variants.
      choose_variants()
      

Deleted: packages/trunk/renpy/debian/patches/04_editor.patch
===================================================================
--- packages/trunk/renpy/debian/patches/04_editor.patch	2013-08-30 19:43:18 UTC (rev 14534)
+++ packages/trunk/renpy/debian/patches/04_editor.patch	2013-08-30 22:51:00 UTC (rev 14535)
@@ -1,20 +0,0 @@
---- /dev/null
-+++ renpy-6.13.12/launcher/Debian.editor.py
-@@ -0,0 +1,6 @@
-+# Name: Debian
-+# Version: 1
-+# Description: Debian default editor
-+
-+config.editor = '/usr/bin/editor'
-+config.editor_transient = '/usr/bin/editor'
---- renpy-6.13.12.orig/launcher/editor.rpy
-+++ renpy-6.13.12/launcher/editor.rpy
-@@ -11,7 +11,7 @@
-     
-     # The default name for the editor.
-     if persistent.editor is None:
--        persistent.editor = "jEdit"
-+        persistent.editor = "Debian"
-     
-     # Should we set up the editor?
-     set_editor = "RENPY_EDIT_PY" not in os.environ

Modified: packages/trunk/renpy/debian/patches/series
===================================================================
--- packages/trunk/renpy/debian/patches/series	2013-08-30 19:43:18 UTC (rev 14534)
+++ packages/trunk/renpy/debian/patches/series	2013-08-30 22:51:00 UTC (rev 14535)
@@ -1,5 +1,3 @@
-#00_module_setup.patch
 01_abspaths.patch
 02_traceback.patch
 03_checkdir.patch
-04_editor.patch

Modified: packages/trunk/renpy/debian/rules
===================================================================
--- packages/trunk/renpy/debian/rules	2013-08-30 19:43:18 UTC (rev 14534)
+++ packages/trunk/renpy/debian/rules	2013-08-30 22:51:00 UTC (rev 14535)
@@ -14,7 +14,7 @@
 configure-stamp:
 	dh_testdir
 	$(MAKE) -f /usr/share/quilt/quilt.make patch
-	chmod 644 `find */ -name "*.py"`
+	find */ -name "*.py" | while read F; do chmod --verbose 644 "$$F"; done
 	chmod +x renpy.py
 	touch configure-stamp
 
@@ -63,15 +63,12 @@
 	dh_clean -k 
 	dh_installdirs
 
-	# common/ - A directory containing common script files that help Ren'Py work.
-	dh_install -prenpy common/* usr/share/games/renpy/common/
-
 	# renpy/ - Contains the python source code for Ren'Py.
-	dh_install -prenpy  renpy/* usr/share/games/renpy/renpy/
+	dh_install -prenpy  renpy usr/share/games/renpy/
 	# data/ - Contains the data for the launcher.
-	dh_install -prenpy  launcher/* usr/share/games/renpy/launcher/
+	dh_install -prenpy  launcher usr/share/games/renpy/
 	# Scripts that give additional features.
-	dh_install -prenpy  template/* usr/share/games/renpy/template/
+	dh_install -prenpy  template usr/share/games/renpy/
 
 	dh_install -prenpy-demo tutorial/* usr/share/games/renpy/demo/
 	chmod +x debian/renpy-demo.sh
@@ -162,4 +159,4 @@
 
 binary: binary-indep binary-arch
 .PHONY: build-indep build-arch build binary-indep binary-arch binary install-indep install-arch install
-.PHONY: clean configure get-doc get-orig-source
+.PHONY: clean configure get-doc




More information about the Pkg-games-commits mailing list