Package: stfl
Severity: wishlist
Tags: patch

stfl needs some changes in order to build properly with Python 2.6.

Attaching Ubuntu debdiff.

-- System Information:
Debian Release: 5.0
  APT prefers jaunty-updates
  APT policy: (500, 'jaunty-updates'), (500, 'jaunty-security'), (500, 
'jaunty-backports'), (500, 'jaunty')
Architecture: i386 (i686)

Kernel: Linux 2.6.28-11-generic (SMP w/2 CPU cores)
Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u stfl-0.20/debian/rules stfl-0.20/debian/rules
--- stfl-0.20/debian/rules
+++ stfl-0.20/debian/rules
@@ -3,6 +3,8 @@
 
 export DH_PYCENTRAL=nomove
 
+include /usr/share/python/python.mk
+
 RUBY_VERSIONS = 1.8 1.9
 #PYTHON_VERSIONS = 2.4 2.5
 #PYVERS=$(shell pyversions -vr)
@@ -51,10 +53,10 @@
 	$(MAKE) -C ruby$* $(MAKE_INSTALL_TARGET) sitedir=$(MAKE_DESTDIR)/usr/lib/ruby install
 
 install-python-%:
-	mkdir -p $(MAKE_PYTHON_DESTDIR)$*/site-packages/
-	cp python$*/_stfl.so $(MAKE_PYTHON_DESTDIR)$*/site-packages/
+	mkdir -p $(MAKE_PYTHON_DESTDIR)$*/$(call py_sitename, $*)/
+	cp python$*/_stfl.so $(MAKE_PYTHON_DESTDIR)$*/$(call py_sitename, $*)/
 	#cp python$*/stfl.pyc $(MAKE_PYTHON_DESTDIR)$*/site-packages/
-	cp python$*/stfl.py $(MAKE_PYTHON_DESTDIR)$*/site-packages/
+	cp python$*/stfl.py $(MAKE_PYTHON_DESTDIR)$*/$(call py_sitename, $*)/
 
 clean: $(addprefix clean-ruby-, $(RUBY_VERSIONS)) $(addprefix clean-python-, $(PYTHON_VERSIONS))
 	dh_testdir
diff -u stfl-0.20/debian/control stfl-0.20/debian/control
--- stfl-0.20/debian/control
+++ stfl-0.20/debian/control
@@ -1,6 +1,7 @@
 Source: stfl
 Priority: optional
-Maintainer: Nico Golde <[email protected]>
+Maintainer: Ubuntu MOTU Developers <[email protected]>
+XSBC-Original-Maintainer: Nico Golde <[email protected]>
 Uploaders: Michael Mende <[email protected]>
 Build-Depends: debhelper (>= 7), libncursesw5-dev, swig, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), ruby1.8, ruby1.8-dev, ruby1.9, ruby1.9-dev, spl-dev, 
 Standards-Version: 3.8.1
diff -u stfl-0.20/debian/python-stfl.install stfl-0.20/debian/python-stfl.install
--- stfl-0.20/debian/python-stfl.install
+++ stfl-0.20/debian/python-stfl.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/python*/site-packages/_stfl.so
-debian/tmp/usr/lib/python*/site-packages/stfl.py
+debian/tmp/usr/lib/python*/*-packages/_stfl.so
+debian/tmp/usr/lib/python*/*-packages/stfl.py
diff -u stfl-0.20/debian/changelog stfl-0.20/debian/changelog
--- stfl-0.20/debian/changelog
+++ stfl-0.20/debian/changelog
@@ -1,3 +1,15 @@
+stfl (0.20-2ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #376640), Ubuntu remaining changes:
+    - Adjust debian/python-stfl.install to install all python modules into
+      /usr/lib/pythonX.Y/*-packages.
+    - debian/rules:
+      + Include /usr/share/python/python.mk (needed to build with Python 2.6).
+  * debian/rules:
+    - Use py_sitename macro to copy all python modules in to the right path.
+
+ -- Alessio Treglia <[email protected]>  Thu, 14 May 2009 23:43:56 +0200
+
 stfl (0.20-2) unstable; urgency=low
 
   * Add pkg config file to -dev package (Closes: #528394)
@@ -16,6 +28,23 @@
 
  -- Nico Golde <[email protected]>  Mon, 27 Apr 2009 16:24:58 +0200
 
+stfl (0.19-1ubuntu2) jaunty; urgency=low
+
+  * No-change rebuild to fix lpia shared library dependencies.
+
+ -- Matthias Klose <[email protected]>  Sun, 22 Mar 2009 16:51:57 +0100
+
+stfl (0.19-1ubuntu1) jaunty; urgency=low
+
+  * Python 2.6 transition:
+    - debian/rules:
+      + Include /usr/share/python/python.mk.
+      + Use py_sitename macro to copy all pythons stuffs into the right path.
+    - debian/python-stfl.install:
+      + Install all python modules into /usr/lib/pythonX.Y/*-packages.
+
+ -- Alessio Treglia <[email protected]>  Sat, 14 Mar 2009 09:28:43 +0100
+
 stfl (0.19-1) unstable; urgency=low
 
   * New upstream release.

Reply via email to