[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#700829: RFS: python-gnuplot/1.8-3 [ITA] -- Python interface to the gnuplot plotting program



Hi Josué,

I wanted just to review your package and give some comments, but I fixed
it a little bit :)

Please, see an 2 attached debdiffs:
a) gladk.debdiff is a diff between your version an my changes.
b) python-gnuplot.debdiff is a diff between version in unstable (1.8-2)
and our common changes (for easier appliance).

Major changes are the using of debhelper 9 and complete clean of old
files and debian/rules (the last one is just 3 lines long). No need in
those "hacks" in debian/rules, if one can use more elegant solutions.

If you are agree with those changes, I will sponsor your package.

I would recommend you to consider to maintain this package under
Debian-Science team, where gnuplot itself is maintained. It will NOT
restrict your right to maintain the package, but will give some positive
sides of team-maintainance. Please, check policy on that [1]

Actually, I do not know why Matthias uploaded the package into unstable
in a freeze-period. I think, it should be experimental-targeted for the
moment.

[1] http://debian-science.alioth.debian.org/debian-science-policy.html

Best regards,

Anton


On 02/18/2013 04:44 AM, Josué Ortega wrote:
> Package: sponsorship-requests
> Severity: normal
> 
>   Dear mentors,
> 
>   I am looking for a sponsor for my package "python-gnuplot",
> 
>  * Package name    : python-gnuplot
>    Version         : 1.8-3
>    Upstream Author : Michael Haggerty <mhagger@alum.mit.edu>
>  * URL             : http://gnuplot-py.sourceforge.net/
>  * License         : LGPL
>    Section         : python
> 
>   It builds those binary packages:
> 
>     python-gnuplot - Python interface to the gnuplot plotting program
> 
>   To access further information about this package, please visit the
> following URL:
> 
>   http://mentors.debian.net/package/python-gnuplot
> 
> 
>   Alternatively, one can download the package with dget using this command:
> 
>     dget -x http://mentors.debian.net/debian/pool/main/p/python-gnuplot/python-gnuplot_1.8-3.dsc
> 
>   More information about hello can be obtained from http://www.example.com.
> 
>   Changes since the last upload:
> 
> 
>   * New Maintainer. (Closes: #699039)
>   * Added debian/source/format file
>   * Changed to dpkg-source 3.0 (quilt) format.
>   * debian/copyright updated to format version 1.0
>   * debian/control: added homepage
> 
> 
> 
>   Regards,
> 

diff -Nru python-gnuplot-1.8/debian/changelog python-gnuplot-1.8/debian/changelog
--- python-gnuplot-1.8/debian/changelog	2013-02-18 04:24:57.000000000 +0100
+++ python-gnuplot-1.8/debian/changelog	2013-02-18 21:03:26.000000000 +0100
@@ -1,10 +1,18 @@
 python-gnuplot (1.8-3) unstable; urgency=low
 
+  [ Josue Ortega ]
   * New Maintainer. (Closes: #699039)
   * Added debian/source/format file
   * Changed to dpkg-source 3.0 (quilt) format.
   * debian/copyright updated to format version 1.0
-  * debian/control: added homepage
+  * debian/control: added homepage.
+
+  [ Anton Gladky ]
+  * Use debhelper 9.
+  * Remove XB-Python-Version.
+  * Remove old postinst and prerm scripts.
+  * Clean completely debian/rules.
+  * Depend on gnuplot. python-gnuplot does not work without it.
 
  -- Josue Ortega <josueortega@debian.org.gt>  Sat, 16 Feb 2013 15:22:25 -0600
 
diff -Nru python-gnuplot-1.8/debian/compat python-gnuplot-1.8/debian/compat
--- python-gnuplot-1.8/debian/compat	2013-02-16 22:21:28.000000000 +0100
+++ python-gnuplot-1.8/debian/compat	2013-02-18 20:30:28.000000000 +0100
@@ -1 +1 @@
-5
+9
diff -Nru python-gnuplot-1.8/debian/control python-gnuplot-1.8/debian/control
--- python-gnuplot-1.8/debian/control	2013-02-17 15:52:51.000000000 +0100
+++ python-gnuplot-1.8/debian/control	2013-02-18 21:02:37.000000000 +0100
@@ -2,7 +2,7 @@
 Section: python
 Priority: optional
 Maintainer: Josue Ortega <josueortega@debian.org.gt>
-Build-Depends: debhelper (>= 5.0.37.1), python-all (>= 2.6.6)
+Build-Depends: debhelper (>= 9), python-all (>= 2.6.6)
 Build-Depends-Indep: python-numpy
 Standards-Version: 3.9.4
 XS-Python-Version: all
@@ -10,9 +10,7 @@
 
 Package: python-gnuplot
 Architecture: all
-Depends: ${python:Depends}, python-numpy, ${misc:Depends}
-Recommends: gnuplot
-XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, python-numpy, ${misc:Depends}, gnuplot
 Description: Python interface to the gnuplot plotting program
  Gnuplot.py is a Python module that interfaces to gnuplot, the popular
  plotting program. It allows you to use gnuplot from within Python to
diff -Nru python-gnuplot-1.8/debian/copyright python-gnuplot-1.8/debian/copyright
--- python-gnuplot-1.8/debian/copyright	2013-02-16 23:23:31.000000000 +0100
+++ python-gnuplot-1.8/debian/copyright	2013-02-18 20:30:39.000000000 +0100
@@ -6,7 +6,7 @@
  on Sun, 22 Aug 1999 13:37:35 +0200.
 Files: *
 Copyright: 1998-1999 Michael Haggerty <mhagger@blizzard.harvard.edu>
-License: LGPL 
+License: LGPL-2.1
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published by
  the Free Software Foundation; either version 2.1 of the License, or (at
@@ -16,4 +16,4 @@
  PURPOSE.  See the GNU General Public License for more details.
  .
  On Debian GNU/Linux systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL'.
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
diff -Nru python-gnuplot-1.8/debian/postinst.old python-gnuplot-1.8/debian/postinst.old
--- python-gnuplot-1.8/debian/postinst.old	2013-02-16 22:21:28.000000000 +0100
+++ python-gnuplot-1.8/debian/postinst.old	1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-#! /bin/bash -e
-#
-# Debian prerm script for Python x.y hierarchical modules
-# Written by Gregor Hoffleit <flight@debian.org>
-# Extended by Matthias Klose <doko@debian.org>
-#
-
-PACKAGE=`basename $0 | sed -e 's/\.[^.]*$//'`
-PV=`dpkg --listfiles $PACKAGE | sed -n -e '/^\/usr\/lib\/python.*\//{
-  s,/usr/lib/python\([0-9][0-9.]*\)/.*,\1,p
-  q
-}'`
-DIRLIST="/usr/lib/python$PV/site-packages"
-
-case "$1" in
-    configure|abort-upgrade|abort-remove|abort-deconfigure)
-	for i in $DIRLIST ; do
-	    /usr/bin/python -W ignore::SyntaxWarning:: -O \
-		/usr/lib/python$PV/compileall.py -q $i
-	    /usr/bin/python -W ignore::SyntaxWarning:: \
-		/usr/lib/python$PV/compileall.py -q $i
-	done
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
diff -Nru python-gnuplot-1.8/debian/prerm.old python-gnuplot-1.8/debian/prerm.old
--- python-gnuplot-1.8/debian/prerm.old	2013-02-16 22:21:28.000000000 +0100
+++ python-gnuplot-1.8/debian/prerm.old	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-#! /bin/bash -e
-#
-# Debian prerm script for Python x.y hierarchical modules
-# Written by Gregor Hoffleit <flight@debian.org>
-# Extended by Matthias Klose <doko@debian.org>
-#
-
-PACKAGE=`basename $0 | sed -e 's/\.[^.]*$//'`
-
-dpkg --listfiles $PACKAGE |
-	awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
-	xargs rm -f >&2
-
-#DEBHELPER#
diff -Nru python-gnuplot-1.8/debian/python-gnuplot.docs python-gnuplot-1.8/debian/python-gnuplot.docs
--- python-gnuplot-1.8/debian/python-gnuplot.docs	1970-01-01 01:00:00.000000000 +0100
+++ python-gnuplot-1.8/debian/python-gnuplot.docs	2013-02-18 20:30:46.000000000 +0100
@@ -0,0 +1,7 @@
+ANNOUNCE.txt
+CREDITS.txt 
+FAQ.txt 
+NEWS.txt 
+README.txt 
+TODO.txt
+debian/README.datafile
diff -Nru python-gnuplot-1.8/debian/python-gnuplot.examples python-gnuplot-1.8/debian/python-gnuplot.examples
--- python-gnuplot-1.8/debian/python-gnuplot.examples	1970-01-01 01:00:00.000000000 +0100
+++ python-gnuplot-1.8/debian/python-gnuplot.examples	2013-02-18 20:30:53.000000000 +0100
@@ -0,0 +1,3 @@
+demo.py 
+test.py 
+debian/datafile.py
diff -Nru python-gnuplot-1.8/debian/python-gnuplot.install python-gnuplot-1.8/debian/python-gnuplot.install
--- python-gnuplot-1.8/debian/python-gnuplot.install	1970-01-01 01:00:00.000000000 +0100
+++ python-gnuplot-1.8/debian/python-gnuplot.install	2013-02-18 20:30:57.000000000 +0100
@@ -0,0 +1 @@
+doc/Gnuplot/* usr/share/doc/python-gnuplot/html
diff -Nru python-gnuplot-1.8/debian/rules python-gnuplot-1.8/debian/rules
--- python-gnuplot-1.8/debian/rules	2013-02-16 22:21:28.000000000 +0100
+++ python-gnuplot-1.8/debian/rules	2013-02-18 20:31:03.000000000 +0100
@@ -1,66 +1,5 @@
 #! /usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/python/python.mk
-
-p	:= python-gnuplot
-d	:= debian/$(p)
-PV	:= $(shell pyversions -vd)
-pylib	:= usr/lib/python$(PV)/$(call py_sitename, $(PV))
-
-build-arch: build
-build-indep: build
-build:
-	python setup.py build
-
-clean:
-	dh_clean
-	rm -rf build
-	-find -name '*.py[co]' | xargs rm -f
-
-# Build architecture-independent files here.
-binary-indep: build
-	dh_testdir
-	dh_testroot
-
-	: # install it
-	dh_installdirs -i $(pylib)/Gnuplot usr/share/doc/$(p)
-	python setup.py install --prefix=$(d)/usr $(py_setup_install_args)
-	-find $(d) -name '*.py[co]' find $(d) -name '*.py[co]' | xargs rm -f
-
-	install -m 644 debian/datafile.py $(d)/$(pylib)/.
-	dh_installdocs -i \
-		ANNOUNCE.txt CREDITS.txt FAQ.txt NEWS.txt README.txt TODO.txt \
-		debian/README.datafile
-	cp -a doc/Gnuplot $(d)/usr/share/doc/$(p)/html
-	dh_installexamples -i demo.py test.py debian/datafile.py
-
-	: # make python scripts starting with '#!' executable
-	for i in `find debian -mindepth 2 -type f ! -perm 755`; do \
-	  if head -1 $$i | grep -q '^#!'; then \
-	    chmod 755 $$i; \
-	    echo "made executable: $$i"; \
-	  fi; \
-	done
-
-	dh_installchangelogs -i
-	dh_compress -i -X.py
-	dh_fixperms -i
-	dh_python2 -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build
-# We have nothing to do by default.
-
-source diff:
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+%:
+	dh $@ --with python2
diff -Nru python-gnuplot-1.8/debian/changelog python-gnuplot-1.8/debian/changelog
--- python-gnuplot-1.8/debian/changelog	2013-02-18 21:07:03.000000000 +0100
+++ python-gnuplot-1.8/debian/changelog	2013-02-18 21:03:26.000000000 +0100
@@ -1,3 +1,21 @@
+python-gnuplot (1.8-3) unstable; urgency=low
+
+  [ Josue Ortega ]
+  * New Maintainer. (Closes: #699039)
+  * Added debian/source/format file
+  * Changed to dpkg-source 3.0 (quilt) format.
+  * debian/copyright updated to format version 1.0
+  * debian/control: added homepage.
+
+  [ Anton Gladky ]
+  * Use debhelper 9.
+  * Remove XB-Python-Version.
+  * Remove old postinst and prerm scripts.
+  * Clean completely debian/rules.
+  * Depend on gnuplot. python-gnuplot does not work without it.
+
+ -- Josue Ortega <josueortega@debian.org.gt>  Sat, 16 Feb 2013 15:22:25 -0600
+
 python-gnuplot (1.8-2) unstable; urgency=low
 
   * QA upload.
diff -Nru python-gnuplot-1.8/debian/compat python-gnuplot-1.8/debian/compat
--- python-gnuplot-1.8/debian/compat	2013-02-18 21:07:03.000000000 +0100
+++ python-gnuplot-1.8/debian/compat	2013-02-18 20:30:28.000000000 +0100
@@ -1 +1 @@
-5
+9
diff -Nru python-gnuplot-1.8/debian/control python-gnuplot-1.8/debian/control
--- python-gnuplot-1.8/debian/control	2013-02-18 21:07:03.000000000 +0100
+++ python-gnuplot-1.8/debian/control	2013-02-18 21:02:37.000000000 +0100
@@ -1,17 +1,16 @@
 Source: python-gnuplot
 Section: python
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 5.0.37.1), python-all (>= 2.6.6)
+Maintainer: Josue Ortega <josueortega@debian.org.gt>
+Build-Depends: debhelper (>= 9), python-all (>= 2.6.6)
 Build-Depends-Indep: python-numpy
 Standards-Version: 3.9.4
 XS-Python-Version: all
+Homepage: http://gnuplot-py.sourceforge.net/
 
 Package: python-gnuplot
 Architecture: all
-Depends: ${python:Depends}, python-numpy, ${misc:Depends}
-Recommends: gnuplot
-XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, python-numpy, ${misc:Depends}, gnuplot
 Description: Python interface to the gnuplot plotting program
  Gnuplot.py is a Python module that interfaces to gnuplot, the popular
  plotting program. It allows you to use gnuplot from within Python to
diff -Nru python-gnuplot-1.8/debian/copyright python-gnuplot-1.8/debian/copyright
--- python-gnuplot-1.8/debian/copyright	2013-02-18 21:07:03.000000000 +0100
+++ python-gnuplot-1.8/debian/copyright	2013-02-18 20:30:39.000000000 +0100
@@ -1,22 +1,19 @@
-This package was debianized by Matthias Klose <doko@cs.tu-berlin.de> on
-Sun, 22 Aug 1999 13:37:35 +0200.
-
-It was downloaded from http://monsoon.harvard.edu/~mhagger/download/
-New upstream site: http://gnuplot-py.sourceforge.net/
-
-Upstream Author: Gnuplot.py was written by Michael Haggerty
-  <mhagger@blizzard.harvard.edu>, inspired by and partly derived
-  from an earlier version by Konrad Hinsen.
-
-Copyright (C) 1998,1999 Michael Haggerty <mhagger@blizzard.harvard.edu>.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or (at
-your option) any later version.  This program is distributed in the
-hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU General Public License for more details.
-
-On Debian GNU/Linux systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Gnuplot.py
+Upstream-Contact: Michael Haggerty <mhagger@blizzard.harvard.edu>
+Source: http://gnuplot-py.sourceforge.net/
+Comment: This package was debianized by Matthias Klose <doko@cs.tu-berlin.de> 
+ on Sun, 22 Aug 1999 13:37:35 +0200.
+Files: *
+Copyright: 1998-1999 Michael Haggerty <mhagger@blizzard.harvard.edu>
+License: LGPL-2.1
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or (at
+ your option) any later version.  This program is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
diff -Nru python-gnuplot-1.8/debian/patches/fix-malfuction-mouse-keys.patch python-gnuplot-1.8/debian/patches/fix-malfuction-mouse-keys.patch
--- python-gnuplot-1.8/debian/patches/fix-malfuction-mouse-keys.patch	1970-01-01 01:00:00.000000000 +0100
+++ python-gnuplot-1.8/debian/patches/fix-malfuction-mouse-keys.patch	2013-02-16 22:28:23.000000000 +0100
@@ -0,0 +1,16 @@
+Description: Fix  malfunction of mouse control and hotkeys 
+Author: Matthias Klose <doko@debian.org>
+Last-Update: 2013-02-03
+
+--- a/_Gnuplot.py
++++ b/_Gnuplot.py
+@@ -184,7 +184,8 @@
+         self._clear_queue()
+         self.debug = debug
+         self.plotcmd = 'plot'
+-        self('set terminal %s' % (gp.GnuplotOpts.default_term,))
++        #self('set terminal %s' % (gp.GnuplotOpts.default_term,))
++        # disabled: causes malfunction of mouse control and hotkeys  
+ 
+     def close(self):
+         # This may cause a wait for the gnuplot process to finish
diff -Nru python-gnuplot-1.8/debian/patches/fix-python-name.patch python-gnuplot-1.8/debian/patches/fix-python-name.patch
--- python-gnuplot-1.8/debian/patches/fix-python-name.patch	1970-01-01 01:00:00.000000000 +0100
+++ python-gnuplot-1.8/debian/patches/fix-python-name.patch	2013-02-16 22:28:23.000000000 +0100
@@ -0,0 +1,15 @@
+Description: Fix the right name for python instead python2
+Author: Matthias Klose <doko@debian.org> 
+Last-Update: 2013-02-02
+
+--- a/FAQ.txt
++++ b/FAQ.txt
+@@ -14,7 +14,7 @@
+ When running the following script
+ 
+ ------------------------------------------------
+-#! /usr/bin/python2
++#! /usr/bin/python
+ 
+ import Gnuplot, Gnuplot.funcutils
+ from numpy import *
diff -Nru python-gnuplot-1.8/debian/patches/fix-string-exceptions.patch python-gnuplot-1.8/debian/patches/fix-string-exceptions.patch
--- python-gnuplot-1.8/debian/patches/fix-string-exceptions.patch	1970-01-01 01:00:00.000000000 +0100
+++ python-gnuplot-1.8/debian/patches/fix-string-exceptions.patch	2013-02-16 23:00:37.000000000 +0100
@@ -0,0 +1,51 @@
+Description: Fix string exceptions 
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585295
+Forwarded: not-needed
+Author: Matthias Klose <doko@debian.org>
+
+
+Patch that avoid string exceptions, Closes: #585295
+--- a/gp_java.py
++++ b/gp_java.py
+@@ -120,7 +120,7 @@
+         command = [GnuplotOpts.gnuplot_command]
+         if persist:
+             if not test_persist():
+-                raise ('-persist does not seem to be supported '
++                raise RuntimeError, ('-persist does not seem to be supported '
+                        'by your version of gnuplot!')
+             command.append('-persist')
+ 
+--- a/gp_unix.py
++++ b/gp_unix.py
+@@ -184,7 +184,7 @@
+             persist = GnuplotOpts.prefer_persist
+         if persist:
+             if not test_persist():
+-                raise ('-persist does not seem to be supported '
++                raise RuntimeError, ('-persist does not seem to be supported '
+                        'by your version of gnuplot!')
+             self.gnuplot = popen('%s -persist' % GnuplotOpts.gnuplot_command,
+                                  'w')
+--- a/_Gnuplot.py
++++ b/_Gnuplot.py
+@@ -449,7 +449,7 @@
+             try:
+                 type = self.optiontypes[k]
+             except KeyError:
+-                raise 'option %s is not supported' % (k,)
++                raise KeyError, 'option %s is not supported' % (k,)
+             getattr(self, 'set_%s' % type)(k, v)
+ 
+     def xlabel(self, s=None, offset=None, font=None):
+--- a/gp_macosx.py
++++ b/gp_macosx.py
+@@ -118,7 +118,7 @@
+             persist = GnuplotOpts.prefer_persist
+         if persist:
+             if not test_persist():
+-                raise ('-persist does not seem to be supported '
++                raise RuntimeError, ('-persist does not seem to be supported '
+                        'by your version of gnuplot!')
+             self.gnuplot = popen('%s -persist' % GnuplotOpts.gnuplot_command,
+                                  'w')
diff -Nru python-gnuplot-1.8/debian/patches/series python-gnuplot-1.8/debian/patches/series
--- python-gnuplot-1.8/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ python-gnuplot-1.8/debian/patches/series	2013-02-16 23:01:05.000000000 +0100
@@ -0,0 +1,3 @@
+fix-string-exceptions.patch
+fix-python-name.patch
+fix-malfuction-mouse-keys.patch
diff -Nru python-gnuplot-1.8/debian/postinst.old python-gnuplot-1.8/debian/postinst.old
--- python-gnuplot-1.8/debian/postinst.old	2013-02-18 21:07:03.000000000 +0100
+++ python-gnuplot-1.8/debian/postinst.old	1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-#! /bin/bash -e
-#
-# Debian prerm script for Python x.y hierarchical modules
-# Written by Gregor Hoffleit <flight@debian.org>
-# Extended by Matthias Klose <doko@debian.org>
-#
-
-PACKAGE=`basename $0 | sed -e 's/\.[^.]*$//'`
-PV=`dpkg --listfiles $PACKAGE | sed -n -e '/^\/usr\/lib\/python.*\//{
-  s,/usr/lib/python\([0-9][0-9.]*\)/.*,\1,p
-  q
-}'`
-DIRLIST="/usr/lib/python$PV/site-packages"
-
-case "$1" in
-    configure|abort-upgrade|abort-remove|abort-deconfigure)
-	for i in $DIRLIST ; do
-	    /usr/bin/python -W ignore::SyntaxWarning:: -O \
-		/usr/lib/python$PV/compileall.py -q $i
-	    /usr/bin/python -W ignore::SyntaxWarning:: \
-		/usr/lib/python$PV/compileall.py -q $i
-	done
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
diff -Nru python-gnuplot-1.8/debian/prerm.old python-gnuplot-1.8/debian/prerm.old
--- python-gnuplot-1.8/debian/prerm.old	2013-02-18 21:07:03.000000000 +0100
+++ python-gnuplot-1.8/debian/prerm.old	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-#! /bin/bash -e
-#
-# Debian prerm script for Python x.y hierarchical modules
-# Written by Gregor Hoffleit <flight@debian.org>
-# Extended by Matthias Klose <doko@debian.org>
-#
-
-PACKAGE=`basename $0 | sed -e 's/\.[^.]*$//'`
-
-dpkg --listfiles $PACKAGE |
-	awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
-	xargs rm -f >&2
-
-#DEBHELPER#
diff -Nru python-gnuplot-1.8/debian/python-gnuplot.docs python-gnuplot-1.8/debian/python-gnuplot.docs
--- python-gnuplot-1.8/debian/python-gnuplot.docs	1970-01-01 01:00:00.000000000 +0100
+++ python-gnuplot-1.8/debian/python-gnuplot.docs	2013-02-18 20:30:46.000000000 +0100
@@ -0,0 +1,7 @@
+ANNOUNCE.txt
+CREDITS.txt 
+FAQ.txt 
+NEWS.txt 
+README.txt 
+TODO.txt
+debian/README.datafile
diff -Nru python-gnuplot-1.8/debian/python-gnuplot.examples python-gnuplot-1.8/debian/python-gnuplot.examples
--- python-gnuplot-1.8/debian/python-gnuplot.examples	1970-01-01 01:00:00.000000000 +0100
+++ python-gnuplot-1.8/debian/python-gnuplot.examples	2013-02-18 20:30:53.000000000 +0100
@@ -0,0 +1,3 @@
+demo.py 
+test.py 
+debian/datafile.py
diff -Nru python-gnuplot-1.8/debian/python-gnuplot.install python-gnuplot-1.8/debian/python-gnuplot.install
--- python-gnuplot-1.8/debian/python-gnuplot.install	1970-01-01 01:00:00.000000000 +0100
+++ python-gnuplot-1.8/debian/python-gnuplot.install	2013-02-18 20:30:57.000000000 +0100
@@ -0,0 +1 @@
+doc/Gnuplot/* usr/share/doc/python-gnuplot/html
diff -Nru python-gnuplot-1.8/debian/rules python-gnuplot-1.8/debian/rules
--- python-gnuplot-1.8/debian/rules	2013-02-18 21:07:03.000000000 +0100
+++ python-gnuplot-1.8/debian/rules	2013-02-18 20:31:03.000000000 +0100
@@ -1,66 +1,5 @@
 #! /usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/python/python.mk
-
-p	:= python-gnuplot
-d	:= debian/$(p)
-PV	:= $(shell pyversions -vd)
-pylib	:= usr/lib/python$(PV)/$(call py_sitename, $(PV))
-
-build-arch: build
-build-indep: build
-build:
-	python setup.py build
-
-clean:
-	dh_clean
-	rm -rf build
-	-find -name '*.py[co]' | xargs rm -f
-
-# Build architecture-independent files here.
-binary-indep: build
-	dh_testdir
-	dh_testroot
-
-	: # install it
-	dh_installdirs -i $(pylib)/Gnuplot usr/share/doc/$(p)
-	python setup.py install --prefix=$(d)/usr $(py_setup_install_args)
-	-find $(d) -name '*.py[co]' find $(d) -name '*.py[co]' | xargs rm -f
-
-	install -m 644 debian/datafile.py $(d)/$(pylib)/.
-	dh_installdocs -i \
-		ANNOUNCE.txt CREDITS.txt FAQ.txt NEWS.txt README.txt TODO.txt \
-		debian/README.datafile
-	cp -a doc/Gnuplot $(d)/usr/share/doc/$(p)/html
-	dh_installexamples -i demo.py test.py debian/datafile.py
-
-	: # make python scripts starting with '#!' executable
-	for i in `find debian -mindepth 2 -type f ! -perm 755`; do \
-	  if head -1 $$i | grep -q '^#!'; then \
-	    chmod 755 $$i; \
-	    echo "made executable: $$i"; \
-	  fi; \
-	done
-
-	dh_installchangelogs -i
-	dh_compress -i -X.py
-	dh_fixperms -i
-	dh_python2 -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build
-# We have nothing to do by default.
-
-source diff:
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+%:
+	dh $@ --with python2
diff -Nru python-gnuplot-1.8/debian/source/format python-gnuplot-1.8/debian/source/format
--- python-gnuplot-1.8/debian/source/format	1970-01-01 01:00:00.000000000 +0100
+++ python-gnuplot-1.8/debian/source/format	2013-02-16 22:26:07.000000000 +0100
@@ -0,0 +1 @@
+3.0 (quilt)
\ No newline at end of file
diff -Nru python-gnuplot-1.8/FAQ.txt python-gnuplot-1.8/FAQ.txt
--- python-gnuplot-1.8/FAQ.txt	2013-02-18 21:07:03.000000000 +0100
+++ python-gnuplot-1.8/FAQ.txt	2008-05-02 02:53:07.000000000 +0200
@@ -14,7 +14,7 @@
 When running the following script
 
 ------------------------------------------------
-#! /usr/bin/python
+#! /usr/bin/python2
 
 import Gnuplot, Gnuplot.funcutils
 from numpy import *
diff -Nru python-gnuplot-1.8/_Gnuplot.py python-gnuplot-1.8/_Gnuplot.py
--- python-gnuplot-1.8/_Gnuplot.py	2013-02-18 21:07:03.000000000 +0100
+++ python-gnuplot-1.8/_Gnuplot.py	2008-05-02 02:53:07.000000000 +0200
@@ -184,8 +184,7 @@
         self._clear_queue()
         self.debug = debug
         self.plotcmd = 'plot'
-	# disabled: causes malfunction of mouse control and hotkeys
-        #self('set terminal %s' % (gp.GnuplotOpts.default_term,))
+        self('set terminal %s' % (gp.GnuplotOpts.default_term,))
 
     def close(self):
         # This may cause a wait for the gnuplot process to finish
@@ -450,7 +449,7 @@
             try:
                 type = self.optiontypes[k]
             except KeyError:
-                raise KeyError, 'option %s is not supported' % (k,)
+                raise 'option %s is not supported' % (k,)
             getattr(self, 'set_%s' % type)(k, v)
 
     def xlabel(self, s=None, offset=None, font=None):
diff -Nru python-gnuplot-1.8/gp_java.py python-gnuplot-1.8/gp_java.py
--- python-gnuplot-1.8/gp_java.py	2013-02-18 21:07:03.000000000 +0100
+++ python-gnuplot-1.8/gp_java.py	2008-05-02 02:53:07.000000000 +0200
@@ -120,7 +120,7 @@
         command = [GnuplotOpts.gnuplot_command]
         if persist:
             if not test_persist():
-                raise RuntimeError, ('-persist does not seem to be supported '
+                raise ('-persist does not seem to be supported '
                        'by your version of gnuplot!')
             command.append('-persist')
 
diff -Nru python-gnuplot-1.8/gp_macosx.py python-gnuplot-1.8/gp_macosx.py
--- python-gnuplot-1.8/gp_macosx.py	2013-02-18 21:07:03.000000000 +0100
+++ python-gnuplot-1.8/gp_macosx.py	2008-05-02 02:53:07.000000000 +0200
@@ -118,7 +118,7 @@
             persist = GnuplotOpts.prefer_persist
         if persist:
             if not test_persist():
-                raise RuntimeError, ('-persist does not seem to be supported '
+                raise ('-persist does not seem to be supported '
                        'by your version of gnuplot!')
             self.gnuplot = popen('%s -persist' % GnuplotOpts.gnuplot_command,
                                  'w')
diff -Nru python-gnuplot-1.8/gp_unix.py python-gnuplot-1.8/gp_unix.py
--- python-gnuplot-1.8/gp_unix.py	2013-02-18 21:07:03.000000000 +0100
+++ python-gnuplot-1.8/gp_unix.py	2008-05-02 02:53:07.000000000 +0200
@@ -184,7 +184,7 @@
             persist = GnuplotOpts.prefer_persist
         if persist:
             if not test_persist():
-                raise RuntimeError, ('-persist does not seem to be supported '
+                raise ('-persist does not seem to be supported '
                        'by your version of gnuplot!')
             self.gnuplot = popen('%s -persist' % GnuplotOpts.gnuplot_command,
                                  'w')

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: