[Python-apps-commits] r7778 - in packages/pybik/trunk/debian (5 files)

[barcc-guest at users.alioth.debian.org]

    Date: Thursday, November 10, 2011 @ 19:35:24
  Author: barcc-guest
Revision: 7778

* Added python-decorator to Suggests
* Moved pybiklib to /usr/lib/pybik/
* Link /usr/games/pybik to /usr/lib/pybik/
* Added patch to fix locale issue introduced by the link

Added:
  packages/pybik/trunk/debian/patches/
  packages/pybik/trunk/debian/patches/locale.patch
  packages/pybik/trunk/debian/patches/series
Modified:
  packages/pybik/trunk/debian/control
  packages/pybik/trunk/debian/rules

Modified: packages/pybik/trunk/debian/control
===================================================================
--- packages/pybik/trunk/debian/control	2011-11-09 22:45:11 UTC (rev 7777)
+++ packages/pybik/trunk/debian/control	2011-11-10 19:35:24 UTC (rev 7778)
@@ -23,6 +23,7 @@
  python-opengl,
  python-numpy,
  python-gconf
+Suggests: python-decorator
 Description: 3D Rubik's cube game
  Pybik is an interactive, graphical, single player puzzle.
  This program renders an image of a cube, like that invented

Added: packages/pybik/trunk/debian/patches/locale.patch
===================================================================
--- packages/pybik/trunk/debian/patches/locale.patch	                        (rev 0)
+++ packages/pybik/trunk/debian/patches/locale.patch	2011-11-10 19:35:24 UTC (rev 7778)
@@ -0,0 +1,19 @@
+Description: Wrong localedir if script is a link
+ This patch ensures that the program is fully translated.
+ The correct fix will be done upstream in a next release.
+Forwarded: not-needed
+Author: B. Clausius <barcc at gmx.de>
+--- a/pybiklib/pybik.py
++++ b/pybiklib/pybik.py
+@@ -32,10 +32,7 @@
+     LOCALEDIR = os.path.join(root_dir, 'build', 'mo')
+ else:
+     PREFIX = os.path.dirname(bin_dir)
+-    if PREFIX == sys.prefix:
+-        LOCALEDIR = None
+-    else:
+-        LOCALEDIR = os.path.join(PREFIX, 'share', 'locale')
++    LOCALEDIR = None
+ 
+ try:
+     from pybiklib import version

Added: packages/pybik/trunk/debian/patches/series
===================================================================
--- packages/pybik/trunk/debian/patches/series	                        (rev 0)
+++ packages/pybik/trunk/debian/patches/series	2011-11-10 19:35:24 UTC (rev 7778)
@@ -0,0 +1 @@
+locale.patch

Modified: packages/pybik/trunk/debian/rules
===================================================================
--- packages/pybik/trunk/debian/rules	2011-11-09 22:45:11 UTC (rev 7777)
+++ packages/pybik/trunk/debian/rules	2011-11-10 19:35:24 UTC (rev 7778)
@@ -4,8 +4,12 @@
 	dh $@ --with python2
 
 override_dh_auto_install:
-	dh_auto_install -- --install-scripts=/usr/games
+	dh_auto_install -- --install-scripts=/usr/lib/pybik --install-lib=/usr/lib/pybik
 
+override_dh_link:
+	dh_link usr/lib/pybik/pybik usr/games/pybik
+	dh_link
+
 clean::
 	rm -rf build/