[Python-modules-commits] r10328 - in packages/pyqwt5/trunk/debian (3 files)

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

    Date: Saturday, November 7, 2009 @ 20:12:19
  Author: gudjon-guest
Revision: 10328

Minor fixes, version 5.2.1~cvs20091107+dfsg-1 ready for upload

Modified:
  packages/pyqwt5/trunk/debian/changelog
  packages/pyqwt5/trunk/debian/patches/01_configure.dpatch
  packages/pyqwt5/trunk/debian/rules

Modified: packages/pyqwt5/trunk/debian/changelog
===================================================================
--- packages/pyqwt5/trunk/debian/changelog	2009-11-07 15:16:15 UTC (rev 10327)
+++ packages/pyqwt5/trunk/debian/changelog	2009-11-07 20:12:19 UTC (rev 10328)
@@ -1,10 +1,13 @@
-pyqwt5 (5.2.1~cvs20091106-1) unstable; urgency=low
+pyqwt5 (5.2.1~cvs20091107+dfsg-1) unstable; urgency=low
 
   * New CVS version
   * Fixes problems in qt3 port
   * Rename README.Source to README.source and upgrade content
+  * Add +dfsg to CVS get-orig-source target
+  * Commented out three extra lines from configure.py that the script
+    failed on.
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sat, 07 Nov 2009 13:34:59 +0100
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sat, 07 Nov 2009 19:53:13 +0100
 
 pyqwt5 (5.2.0+dfsg-2) unstable; urgency=low
 

Modified: packages/pyqwt5/trunk/debian/patches/01_configure.dpatch
===================================================================
--- packages/pyqwt5/trunk/debian/patches/01_configure.dpatch	2009-11-07 15:16:15 UTC (rev 10327)
+++ packages/pyqwt5/trunk/debian/patches/01_configure.dpatch	2009-11-07 20:12:19 UTC (rev 10328)
@@ -5,10 +5,10 @@
 ## DP: The Debian Qwt libraries are named libqwt-qt{3,4}, not libqwt
 
 @DPATCH@
-
---- pyqwt5-5.0.0.orig/configure/configure.py
-+++ pyqwt5-5.0.0/configure/configure.py
-@@ -655,6 +655,9 @@
+diff -urNad pyqwt5-5.2.1~cvs20091107+dfsg~/configure/configure.py pyqwt5-5.2.1~cvs20091107+dfsg/configure/configure.py
+--- pyqwt5-5.2.1~cvs20091107+dfsg~/configure/configure.py	2009-11-07 19:52:18.000000000 +0100
++++ pyqwt5-5.2.1~cvs20091107+dfsg/configure/configure.py	2009-11-07 19:53:02.000000000 +0100
+@@ -768,6 +768,9 @@
      elif qwt not in options.extra_libs:
          # no, add the qwt library if needed
          options.extra_libs.append(qwt)
@@ -18,3 +18,16 @@
  
      # zap the temporary directory
      try:
+@@ -1119,9 +1122,9 @@
+ if __name__ == '__main__':
+     try:
+         main()
+-    except Die as e:
+-        inform('%s\n' % e.args)
+-        sys.exit(1)
++    #except Die as e:
++    #    inform('%s\n' % e.args)
++    #    sys.exit(1)
+     except:
+         for entry in traceback.extract_tb(sys.exc_info()[-1]):
+             if 'optparse.py' in entry[0]:

Modified: packages/pyqwt5/trunk/debian/rules
===================================================================
--- packages/pyqwt5/trunk/debian/rules	2009-11-07 15:16:15 UTC (rev 10327)
+++ packages/pyqwt5/trunk/debian/rules	2009-11-07 20:12:19 UTC (rev 10328)
@@ -130,11 +130,11 @@
 	 rm -rf PyQwt-$$VER); \
 	else \
 	 cvs -rQz5 -d:pserver:anonymous at pyqwt.cvs.sourceforge.net:/cvsroot/pyqwt export \
-	 	-D $$REV_DATE -d pyqwt5-$$VER~cvs$$REV_DATE pyqwt5 && (\
-	 find pyqwt5-$$VER~cvs$$REV_DATE -name .cvsignore -type f -delete; \
-	 rm -rf pyqwt5-$$VER~cvs$$REV_DATE/Doc/html ;\
-         tar -zcf ./pyqwt5_$$VER~cvs$$REV_DATE+dfsg.orig.tar.gz pyqwt5-$$VER~cvs$$REV_DATE; \
-	 rm -rf pyqwt5-$$VER~cvs$$REV_DATE); \
+		-D $$REV_DATE -d pyqwt5-$$VER~cvs$$REV_DATE+dfsg pyqwt5 && (\
+	 find pyqwt5-$$VER~cvs$$REV_DATE+dfsg -name .cvsignore -type f -delete; \
+	 rm -rf pyqwt5-$$VER~cvs$$REV_DATE+dfsg/Doc/html ;\
+	 tar -zcf ./pyqwt5_$$VER~cvs$$REV_DATE+dfsg.orig.tar.gz pyqwt5-$$VER~cvs$$REV_DATE+dfsg; \
+	 rm -rf pyqwt5-$$VER~cvs$$REV_DATE+dfsg); \
 	fi
 
 binary: binary-indep binary-arch