tags 566046 + patch
tags 568781 + patch
thanks

Dear maintainer,

I've prepared an NMU for pytrainer (versioned as 1.7.1-1.1) and
uploaded it to DELAYED/4.

Regards.
diff -u pytrainer-1.7.1/debian/control pytrainer-1.7.1/debian/control
--- pytrainer-1.7.1/debian/control
+++ pytrainer-1.7.1/debian/control
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Noèl Köthe <n...@debian.org>
-Build-Depends-Indep: python-dev
+Build-Depends-Indep: python (>= 2.5.3-1~), python-support (>= 1.0.0)
 Build-Depends: debhelper (>= 5.0.0)
 Standards-Version: 3.8.3
 Homepage: http://sourceforge.net/projects/pytrainer/
diff -u pytrainer-1.7.1/debian/changelog pytrainer-1.7.1/debian/changelog
--- pytrainer-1.7.1/debian/changelog
+++ pytrainer-1.7.1/debian/changelog
@@ -1,3 +1,22 @@
+pytrainer (1.7.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload, to prepare for Python 2.6 transition
+  * debian/rules
+    - added '--install-layout=deb' parameter to setup.py install call; thanks to
+      Jakub Wilk for the report; Closes: #530526
+  * debian/control
+    - set b-d on python (instead of p-dev) and bump version to '>= 2.5.3-1~', to
+      support install-layout
+  * debian/{control, rules}
+    - added python-support, to byte-compiling and properly handle Python
+      module; thanks to Luca Falavigna for the report; Closes: #566046
+  * plugins/{garmintools/garmintools.py, garmintools_full/garmintools_full.py},
+    import/file_garmintools.py
+    - patched to explicitly import the "with" statement; thanks to Jonathan
+      Wiltshire for the report; Closes: #568781
+
+ -- Sandro Tosi <mo...@debian.org>  Thu, 04 Mar 2010 15:00:30 +0100
+
 pytrainer (1.7.1-1) unstable; urgency=low
 
   * new upstream release from 2010-01-24
diff -u pytrainer-1.7.1/debian/rules pytrainer-1.7.1/debian/rules
--- pytrainer-1.7.1/debian/rules
+++ pytrainer-1.7.1/debian/rules
@@ -28,7 +28,7 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	python setup.py install --no-compile --prefix $(CURDIR)/debian/pytrainer/usr
+	python setup.py install --no-compile --prefix $(CURDIR)/debian/pytrainer/usr --install-layout=deb
 	mv $(CURDIR)/debian/pytrainer/usr/bin/pytrainer $(CURDIR)/debian/pytrainer/usr/bin/pytr
 	cp $(CURDIR)/debian/mozpytrainer.sh $(CURDIR)/debian/pytrainer/usr/bin/pytrainer 
 
@@ -48,7 +48,7 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_pysupport
+	dh_pysupport
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
only in patch2:
unchanged:
--- pytrainer-1.7.1.orig/plugins/garmintools/garmintools.py
+++ pytrainer-1.7.1/plugins/garmintools/garmintools.py
@@ -17,6 +17,8 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+from __future__ import with_statement
+
 import logging
 import os
 import StringIO
only in patch2:
unchanged:
--- pytrainer-1.7.1.orig/plugins/garmintools_full/garmintools_full.py
+++ pytrainer-1.7.1/plugins/garmintools_full/garmintools_full.py
@@ -17,6 +17,8 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+from __future__ import with_statement
+
 import os
 import sys
 import logging
only in patch2:
unchanged:
--- pytrainer-1.7.1.orig/import/file_garmintools.py
+++ pytrainer-1.7.1/import/file_garmintools.py
@@ -17,6 +17,8 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+from __future__ import with_statement
+
 import logging
 import os
 import StringIO

Reply via email to