[Python-modules-commits] r7930 - in packages/soya/trunk/debian (4 files)

[bernat at users.alioth.debian.org]

    Date: Friday, March 20, 2009 @ 19:35:46
  Author: bernat
Revision: 7930

  * Upload to unstable.
  * Fix FTBFS with python-support from experimental. Closes: #517310.
  * Bump Standards-Version to 3.8.1.      

Modified:
  packages/soya/trunk/debian/changelog
  packages/soya/trunk/debian/control
  packages/soya/trunk/debian/control.in
  packages/soya/trunk/debian/rules

Modified: packages/soya/trunk/debian/changelog
===================================================================
--- packages/soya/trunk/debian/changelog	2009-03-18 21:34:11 UTC (rev 7929)
+++ packages/soya/trunk/debian/changelog	2009-03-20 19:35:46 UTC (rev 7930)
@@ -1,3 +1,11 @@
+soya (0.14-3) unstable; urgency=low
+
+  * Upload to unstable.
+  * Fix FTBFS with python-support from experimental. Closes: #517310.
+  * Bump Standards-Version to 3.8.1.
+
+ -- Vincent Bernat <bernat at debian.org>  Fri, 20 Mar 2009 20:16:29 +0100
+
 soya (0.14-2) experimental; urgency=low
 
   [ Vincent Bernat ]

Modified: packages/soya/trunk/debian/control
===================================================================
--- packages/soya/trunk/debian/control	2009-03-18 21:34:11 UTC (rev 7929)
+++ packages/soya/trunk/debian/control	2009-03-20 19:35:46 UTC (rev 7930)
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Vincent Bernat <bernat at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-all-dev (>= 2.3.5-11), python-support (>= 0.3.2), quilt, patchutils (>= 0.2.25), libsdl1.2-dev, libcal3d12-dev, libglu1-mesa-dev | libglu-dev, libfreetype6-dev, libpng12-dev, libglew1.5-dev, libode0-dev (>= 0.7), libopenal-dev (>= 0.2005080600-2), libalut-dev, python-pyrex (>= 0.9.7.2)
-Standards-Version: 3.8.0
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), cdbs (>= 0.4.43), python-all-dev, python-support, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), libsdl1.2-dev, libcal3d12-dev, libglu1-mesa-dev | libglu-dev, libfreetype6-dev, libpng12-dev, libglew1.5-dev, libode-dev | libode0-dev (>= 0.7), libopenal-dev (>= 0.2005080600-2), libalut-dev, python-pyrex (>= 0.9.7.2)
+Standards-Version: 3.8.1
 Homepage: http://home.gna.org/oomadness/en/soya/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/soya/trunk
-Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/soya/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/soya/trunk/?op=log
 
 Package: python-soya
 Architecture: any

Modified: packages/soya/trunk/debian/control.in
===================================================================
--- packages/soya/trunk/debian/control.in	2009-03-18 21:34:11 UTC (rev 7929)
+++ packages/soya/trunk/debian/control.in	2009-03-20 19:35:46 UTC (rev 7930)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Vincent Bernat <bernat at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: @cdbs@, libsdl1.2-dev, libcal3d12-dev, libglu1-mesa-dev | libglu-dev, libfreetype6-dev, libpng12-dev, libglew1.5-dev, libode0-dev (>= 0.7), libopenal-dev (>= 0.2005080600-2), libalut-dev, python-pyrex (>= 0.9.7.2)
-Standards-Version: 3.8.0
+Build-Depends: @cdbs@, libsdl1.2-dev, libcal3d12-dev, libglu1-mesa-dev | libglu-dev, libfreetype6-dev, libpng12-dev, libglew1.5-dev, libode-dev | libode0-dev (>= 0.7), libopenal-dev (>= 0.2005080600-2), libalut-dev, python-pyrex (>= 0.9.7.2)
+Standards-Version: 3.8.1
 Homepage: http://home.gna.org/oomadness/en/soya/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/soya/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/soya/trunk/?op=log

Modified: packages/soya/trunk/debian/rules
===================================================================
--- packages/soya/trunk/debian/rules	2009-03-18 21:34:11 UTC (rev 7929)
+++ packages/soya/trunk/debian/rules	2009-03-20 19:35:46 UTC (rev 7930)
@@ -6,23 +6,24 @@
 include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-
 DEB_COMPRESS_EXCLUDE := .py
 
+# In order to regenerate 'debian/control' :
+#    DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
+# Then check manually if everything's ok
 
-install/$(DEB_PYTHON_MODULE_PACKAGE)::
+install/python-soya::
 	# fix unnecessary versionned shebang
 	sed -i 's/^#! *\/usr\/bin\/python[0-9.]\+/#! \/usr\/bin\/python/' debian/$(cdbs_curpkg)/usr/bin/*
-
-binary-install/$(DEB_PYTHON_MODULE_PACKAGE)::
-	mv debian/$(cdbs_curpkg)/$(cdbs_python_support_path)/soya/data/* \
+	# move data to usr/share
+	mv debian/$(cdbs_curpkg)/usr/lib/python$(cdbs_python_current_version)/site-packages/soya/data/* \
 		debian/$(cdbs_curpkg)/usr/share/$(cdbs_curpkg)
-	rmdir debian/$(cdbs_curpkg)/$(cdbs_python_support_path)/soya/data
+	rm -rf debian/$(cdbs_curpkg)/usr/lib/python*/site-packages/soya/data
 	# avoid font duplication
-	rm -f debian/$(cdbs_curpkg)/usr/share/python-soya/FreeSans.ttf
+	rm debian/$(cdbs_curpkg)/usr/share/python-soya/FreeSans.ttf
 	dh_link -p$(cdbs_curpkg) usr/share/fonts/truetype/freefont/FreeSans.ttf \
 		usr/share/python-soya/FreeSans.ttf
-	#
+	# remove unneeded execute bit
 	find debian/$(cdbs_curpkg)/usr/share/ -type f -exec chmod -R a-x {} \;
 
 clean::