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

Miriam Ruiz miriam at alioth.debian.org
Thu Nov 13 10:16:23 UTC 2008 

Author: miriam
Date: 2008-11-13 10:16:23 +0000 (Thu, 13 Nov 2008)
New Revision: 8398

Modified:
   packages/trunk/renpy/debian/changelog
   packages/trunk/renpy/debian/patches/00_module_setup.patch
   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/rules
Log:
New Release
Fixed patches



Modified: packages/trunk/renpy/debian/changelog
===================================================================
--- packages/trunk/renpy/debian/changelog	2008-11-12 22:38:49 UTC (rev 8397)
+++ packages/trunk/renpy/debian/changelog	2008-11-13 10:16:23 UTC (rev 8398)
@@ -1,8 +1,10 @@
-renpy (6.6.3.dfsg1-2) UNRELEASED; urgency=low
+renpy (6.8.0.dfsg1-1) UNRELEASED; urgency=low
 
-  * 
+  [ Miriam Ruiz ]
+  * New Upstream Release
+  * Refreshed all patches
 
- -- Miriam Ruiz <little_miry at yahoo.es>  Sat, 16 Aug 2008 01:32:20 +0200
+ -- Miriam Ruiz <little_miry at yahoo.es>  Thu, 13 Nov 2008 10:55:09 +0100
 
 renpy (6.6.3.dfsg1-1) unstable; urgency=low
 

Modified: packages/trunk/renpy/debian/patches/00_module_setup.patch
===================================================================
--- packages/trunk/renpy/debian/patches/00_module_setup.patch	2008-11-12 22:38:49 UTC (rev 8397)
+++ packages/trunk/renpy/debian/patches/00_module_setup.patch	2008-11-13 10:16:23 UTC (rev 8398)
@@ -1,6 +1,7 @@
-diff -ruN renpy-6.3.0.orig/module/setup.py renpy-6.3.0/module/setup.py
---- renpy-6.3.0.orig/module/setup.py	2007-05-08 21:58:48.000000000 +0000
-+++ renpy-6.3.0/module/setup.py	2007-06-26 15:29:57.000000000 +0000
+Index: renpy-6.8.0/module/setup.py
+===================================================================
+--- renpy-6.8.0.orig/module/setup.py	2008-11-13 11:00:09.000000000 +0100
++++ renpy-6.8.0/module/setup.py	2008-11-13 11:00:13.000000000 +0100
 @@ -12,25 +12,10 @@
  except:
      pass
@@ -21,10 +22,10 @@
 -    sys.exit(-1)
 -
  # Default compile arguements for everybody.
--include_dirs = [ install + "/include", install + "/include/SDL" ]
+-include_dirs = [ install + "/include", install + "/include/SDL", install + "/include/freetype2", install + "/include/pygame"]
 -library_dirs = [ install + "/lib" ]
 -extra_compile_args = [ "-O3", "-funroll-loops", "-ffast-math" ]
-+include_dirs = [ "/usr/include", "/usr/include/SDL" ]
++include_dirs = [ "/usr/include", "/usr/include/SDL", "/usr/include/freetype2", "/usr/include/python"+platform.python_version_tuple()[0]+'.'+platform.python_version_tuple()[1]+"/pygame"]
 +library_dirs = [ "/usr/lib" ]
 +extra_compile_args = [ "-O2", "-funroll-loops", "-ffast-math" ]
  extra_link_args = [ ]

Modified: packages/trunk/renpy/debian/patches/01_abspaths.patch
===================================================================
--- packages/trunk/renpy/debian/patches/01_abspaths.patch	2008-11-12 22:38:49 UTC (rev 8397)
+++ packages/trunk/renpy/debian/patches/01_abspaths.patch	2008-11-13 10:16:23 UTC (rev 8398)
@@ -1,17 +1,22 @@
---- renpy-5.6.2.orig/renpy.py
-+++ renpy-5.6.2/renpy.py
-@@ -35,12 +35,18 @@
- # Given a directory holding a Ren'Py game, this is expected to return
- # the path to a directory that will hold save files.
+Index: renpy-6.8.0/renpy.py
+===================================================================
+--- renpy-6.8.0.orig/renpy.py	2008-10-13 04:45:55.000000000 +0200
++++ renpy-6.8.0/renpy.py	2008-11-13 11:03:29.000000000 +0100
+@@ -38,6 +38,13 @@
  def path_to_saves(gamedir):
+     import renpy
+ 
 +    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"
-     return gamedir + "/saves"
++
+     if not renpy.config.save_directory:
+         return gamedir + "/saves"
  
+@@ -58,7 +65,7 @@
  # Returns the path to the Ren'Py base directory (containing common and
  # the launcher, usually.)
  def path_to_renpy_base():

Modified: packages/trunk/renpy/debian/patches/02_traceback.patch
===================================================================
--- packages/trunk/renpy/debian/patches/02_traceback.patch	2008-11-12 22:38:49 UTC (rev 8397)
+++ packages/trunk/renpy/debian/patches/02_traceback.patch	2008-11-13 10:16:23 UTC (rev 8398)
@@ -1,8 +1,8 @@
-Index: renpy-6.6.2/renpy/bootstrap.py
+Index: renpy-6.8.0/renpy/bootstrap.py
 ===================================================================
---- renpy-6.6.2.orig/renpy/bootstrap.py	2008-05-15 14:36:33.000000000 +0000
-+++ renpy-6.6.2/renpy/bootstrap.py	2008-05-15 14:37:49.000000000 +0000
-@@ -288,10 +288,24 @@
+--- renpy-6.8.0.orig/renpy/bootstrap.py	2008-10-13 04:45:55.000000000 +0200
++++ renpy-6.8.0/renpy/bootstrap.py	2008-11-13 11:03:46.000000000 +0100
+@@ -323,10 +323,24 @@
      print renpy.game.exception_info
      report_tb(sys.stdout, tb)
      
@@ -28,7 +28,7 @@
  
          f.write(codecs.BOM_UTF8)
  
-@@ -323,10 +337,18 @@
+@@ -358,10 +372,18 @@
          f.close()
  
          try:

Modified: packages/trunk/renpy/debian/patches/03_checkdir.patch
===================================================================
--- packages/trunk/renpy/debian/patches/03_checkdir.patch	2008-11-12 22:38:49 UTC (rev 8397)
+++ packages/trunk/renpy/debian/patches/03_checkdir.patch	2008-11-13 10:16:23 UTC (rev 8398)
@@ -1,7 +1,7 @@
-Index: renpy-6.6.2/renpy/main.py
+Index: renpy-6.8.0/renpy/main.py
 ===================================================================
---- renpy-6.6.2.orig/renpy/main.py	2008-05-15 14:30:20.000000000 +0000
-+++ renpy-6.6.2/renpy/main.py	2008-05-15 14:30:22.000000000 +0000
+--- renpy-6.8.0.orig/renpy/main.py	2008-10-13 04:45:55.000000000 +0200
++++ renpy-6.8.0/renpy/main.py	2008-11-13 11:03:46.000000000 +0100
 @@ -124,6 +124,10 @@
      # Init the config after load.
      renpy.config.init()

Modified: packages/trunk/renpy/debian/rules
===================================================================
--- packages/trunk/renpy/debian/rules	2008-11-12 22:38:49 UTC (rev 8397)
+++ packages/trunk/renpy/debian/rules	2008-11-13 10:16:23 UTC (rev 8398)
@@ -9,15 +9,15 @@
 	$(MAKE) -f /usr/share/quilt/quilt.make patch
 
 configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
 	dh_testdir
+	$(MAKE) -f /usr/share/quilt/quilt.make patch
 	chmod 644 `find */ -name "*.py"`
 	touch configure-stamp
 
 build: build-stamp
-build-stamp: configure-stamp $(PYVERS:%=build-python%)
+build-stamp: configure $(PYVERS:%=build-python%)
 	dh_testdir
-	#docbook-to-man debian/renpy.sgml > renpy.1
 	touch build-stamp
 
 build-python%: configure-stamp
@@ -142,7 +142,7 @@
 
 # Static Ren'Py version assignment
 #
-RENPY_VERSION = 6.6.3
+RENPY_VERSION = 6.8.0
 DEBIAN_VERSION = $(RENPY_VERSION).dfsg1
 
 get-orig-source:
@@ -151,9 +151,9 @@
 	rm -rf "renpy-$(RENPY_VERSION)"
 	echo "Downloading Ren'Py..."
 	test -e "renpy-$(RENPY_VERSION)-full.tar.bz2" || \
-		wget "http://www.renpy.org/dl/$(RENPY_VERSION)/renpy-$(RENPY_VERSION)-full.tar.bz2"
-	tar xvfj "renpy-$(RENPY_VERSION)-full.tar.bz2"
-	rm -f "renpy-$(RENPY_VERSION)-full.tar.bz2"
+		wget "http://www.renpy.org/dl/$(RENPY_VERSION)/renpy-$(RENPY_VERSION)-sdk.tar.bz2"
+	tar xvfj "renpy-$(RENPY_VERSION)-sdk.tar.bz2"
+	rm -f "renpy-$(RENPY_VERSION)-sdk.tar.bz2"
 	rm -f "renpy_$(DEBIAN_VERSION).orig.tar.gz"
 	cd "renpy-$(RENPY_VERSION)"; \
 		rm -rf `find . -name "*.dll"` ; \
@@ -164,32 +164,5 @@
 	rm -rf "renpy-$(RENPY_VERSION)"
 	mv "renpy_$(DEBIAN_VERSION).orig.tar.gz" ..
 
-get-doc:
-	dh_testdir
-	dh_testroot
-	mkdir tmp-doc
-	cd tmp-doc && \
-		wget --page-requisites --recursive --no-parent --convert-links --html-extension \
-			--no-host-directories \
-			--cut-dirs=3 --execute robots=off \
-			--include-directories='/wiki/renpy/doc,/w' \
-			http://www.renpy.org/wiki/renpy/doc/reference \
-			http://www.renpy.org/wiki/renpy/doc/tutorials \
-			http://www.renpy.org/wiki/renpy/Features \
-			http://www.renpy.org/wiki/renpy/License
-	cd tmp-doc && \
-		find . -name "*.html" | while read f; do \
-			cp "$$f" tmp1.html ; \
-			awk '/<!-- start content -->/,/<!-- Saved in parser cache/' tmp1.html \
-				| grep -v '<!-- start content -->' \
-				| grep -v '<!-- Saved in parser cache' \
-				| grep -v 'http://www.renpy.org/wiki/renpy/Home_Page?action=AttachFile&amp;do=get&amp;target=launcher.png' \
-				> tmp2.html ; \
-			sed --regexp-extended 's,<span class="editsection">\[.*\] *</span>,,g' \
-				tmp2.html >tmp3.html ; \
-			tidy tmp3.html > "$$f" ; \
-			rm -f tmp* ; \
-		done
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install-indep install-arch install configure get-doc get-orig-source

More information about the Pkg-games-commits mailing list