[Python-apps-commits] r8477 - in packages/veusz/trunk/debian (9 files)

jeremysanders-guest at users.alioth.debian.org jeremysanders-guest at users.alioth.debian.org
Sat Apr 14 10:59:21 UTC 2012


    Date: Saturday, April 14, 2012 @ 10:59:19
  Author: jeremysanders-guest
Revision: 8477

Update to upstream Veusz 1.15
Run dh_numpy to get numpy API dependeny
Run dh_sip and add sip:Depends dependency to get sip API
Replace patches with use of upstream setup.py options and symlinks
Bumped Standards-Version to 3.9.3

Modified:
  packages/veusz/trunk/debian/changelog
  packages/veusz/trunk/debian/control
  packages/veusz/trunk/debian/patches/series
  packages/veusz/trunk/debian/rules
  packages/veusz/trunk/debian/veusz.links
Deleted:
  packages/veusz/trunk/debian/patches/datafiles-usr-share.patch
  packages/veusz/trunk/debian/patches/examples-location.patch
  packages/veusz/trunk/debian/patches/license-file-location.patch
  packages/veusz/trunk/debian/patches/self-test-data-location.patch

Modified: packages/veusz/trunk/debian/changelog
===================================================================
--- packages/veusz/trunk/debian/changelog	2012-04-13 22:54:23 UTC (rev 8476)
+++ packages/veusz/trunk/debian/changelog	2012-04-14 10:59:19 UTC (rev 8477)
@@ -1,3 +1,13 @@
+veusz (1.15-1) UNRELEASED; urgency=low
+
+  * Update to upstream Veusz 1.15
+  * Run dh_numpy to get numpy API dependeny
+  * Run dh_sip and add sip:Depends dependency to get sip API
+  * Replace patches with use of upstream setup.py options and symlinks
+  * Bumped Standards-Version to 3.9.3
+
+ -- Jeremy Sanders <jeremy at jeremysanders.net>  Sat, 14 Apr 2012 10:50:00 +0100
+
 veusz (1.14-1) unstable; urgency=low
 
   * Update to upstream Veusz 1.14 (Closes: #648957)

Modified: packages/veusz/trunk/debian/control
===================================================================
--- packages/veusz/trunk/debian/control	2012-04-13 22:54:23 UTC (rev 8476)
+++ packages/veusz/trunk/debian/control	2012-04-14 10:59:19 UTC (rev 8477)
@@ -11,7 +11,7 @@
                perl,
                python-all-dbg,
                python-all-dev (>= 2.6.5-13~),
-               python-numpy,
+               python-numpy (>= 1:1.4.1-4~),
                python-numpy-dbg,
                python-qt4-dbg,
                python-qt4-dev,
@@ -20,7 +20,7 @@
                xauth,
                xfonts-base,
                xvfb
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 X-Python-Version: >= 2.4
 Homepage: http://home.gna.org/veusz/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/veusz/trunk/
@@ -47,7 +47,8 @@
          python-qt4,
          ${misc:Depends},
          ${python:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         ${sip:Depends}
 Breaks: veusz (<< ${source:Version})
 Suggests: veusz (= ${source:Version})
 Description: Architecture-specific helper module for Veusz
@@ -60,9 +61,12 @@
 Priority: extra
 Architecture: any
 Depends: veusz-helpers (= ${binary:Version}),
+         python-numpy,
+         python-qt4,
          ${misc:Depends},
          ${python:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         ${sip:Depends}
 Recommends: python-dbg, python-numpy-dbg, python-qt4-dbg
 Description: Architecture-specific helper module for Veusz (debug extension)
  This package contains the architecture specific files for Veusz compiled to

Deleted: packages/veusz/trunk/debian/patches/datafiles-usr-share.patch
===================================================================
--- packages/veusz/trunk/debian/patches/datafiles-usr-share.patch	2012-04-13 22:54:23 UTC (rev 8476)
+++ packages/veusz/trunk/debian/patches/datafiles-usr-share.patch	2012-04-14 10:59:19 UTC (rev 8477)
@@ -1,31 +0,0 @@
-Description: Make Veusz install and read data files from /usr/share/veusz.
- Without this patch Veusz installs its data files within the Python directory.
- This patch makes Veusz compliant with FHS.
- .
- This is difficult to put upstream because of the inflexibility of Python 2.x
- distutils and compatibility with other operating systems.
-Author: Jeremy Sanders <jeremy at jeremysanders.net>
-Forwarded: not-needed
-Last-Update: 2011-11-25
---- veusz-1.14.orig/setup.py
-+++ veusz-1.14/setup.py
-@@ -50,7 +50,7 @@
-     def run(self):
-         # need to change self.install_dir to the library dir
-         install_cmd = self.get_finalized_command('install')
--        self.install_dir = getattr(install_cmd, 'install_lib')
-+        self.install_dir = 'debian/veusz/usr/share'
-         return install_data.run(self)
- 
- descr = '''Veusz is a scientific plotting package, designed to create
---- veusz-1.14.orig/utils/utilfuncs.py
-+++ veusz-1.14/utils/utilfuncs.py
-@@ -50,7 +50,7 @@
-         # standard installation
-         return os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
- 
--veuszDirectory = _getVeuszDirectory()
-+veuszDirectory = '/usr/share/veusz'
- exampleDirectory = os.path.join(veuszDirectory, 'examples')
- 
- id_re = re.compile('^[A-Za-z_][A-Za-z0-9_]*$')

Deleted: packages/veusz/trunk/debian/patches/examples-location.patch
===================================================================
--- packages/veusz/trunk/debian/patches/examples-location.patch	2012-04-13 22:54:23 UTC (rev 8476)
+++ packages/veusz/trunk/debian/patches/examples-location.patch	2012-04-14 10:59:19 UTC (rev 8477)
@@ -1,28 +0,0 @@
-Description: Do not install examples in /usr/share/veusz/examples
- We install the examples to /usr/share/doc/veusz/examples, so do not install
- into /usr/share/veusz. Update the location of the examples in the Veusz
- code so that Veusz could find it to show in the menus.
-Author: Jeremy Sanders <jeremy at jeremysanders.net>
-Forwarded: not-needed
-Last-Update: 2011-11-25
---- veusz-1.14.orig/setup.py
-+++ veusz-1.14/setup.py
-@@ -128,7 +128,6 @@
-       data_files = [ ('veusz', ['VERSION']),
-                      findData('dialogs', ('ui',)),
-                      findData('windows/icons', ('png', 'svg')),
--                     findData('examples', ('vsz', 'py', 'csv', 'dat')),
-                      ],
-       packages = [ 'veusz',
-                    'veusz.dialogs',
---- veusz-1.14.orig/utils/utilfuncs.py
-+++ veusz-1.14/utils/utilfuncs.py
-@@ -51,7 +51,7 @@
-         return os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
- 
- veuszDirectory = '/usr/share/veusz'
--exampleDirectory = os.path.join(veuszDirectory, 'examples')
-+exampleDirectory = '/usr/share/doc/veusz/examples'
- 
- id_re = re.compile('^[A-Za-z_][A-Za-z0-9_]*$')
- def validPythonIdentifier(name):

Deleted: packages/veusz/trunk/debian/patches/license-file-location.patch
===================================================================
--- packages/veusz/trunk/debian/patches/license-file-location.patch	2012-04-13 22:54:23 UTC (rev 8476)
+++ packages/veusz/trunk/debian/patches/license-file-location.patch	2012-04-14 10:59:19 UTC (rev 8477)
@@ -1,17 +0,0 @@
-Description: Use standard location of license file for about dialog.
- We modify the about dialog box to point to the standard COPYING file as
- Debian does not want extra license files installed.
-Author: Jeremy Sanders <jeremy at jeremysanders.net>
-Forwarded: not-needed
-Last-Update: 2011-11-25
---- veusz-1.14.orig/dialogs/aboutdialog.py
-+++ veusz-1.14/dialogs/aboutdialog.py
-@@ -57,7 +57,7 @@
-         VeuszDialog.__init__(self, parent, 'license.ui')
- 
-         try:
--            f = open(os.path.join(utils.veuszDirectory, 'COPYING'), 'rU')
-+            f = open('/usr/share/common-licenses/GPL-2', 'rU')
-             text = f.read()
-         except IOError:
-             text = 'Could not open the license file.'

Deleted: packages/veusz/trunk/debian/patches/self-test-data-location.patch
===================================================================
--- packages/veusz/trunk/debian/patches/self-test-data-location.patch	2012-04-13 22:54:23 UTC (rev 8476)
+++ packages/veusz/trunk/debian/patches/self-test-data-location.patch	2012-04-14 10:59:19 UTC (rev 8477)
@@ -1,21 +0,0 @@
-Description: Monkey patch location of Veusz data files while running self-test.
- We monkey patch Veusz to make it look for its data file locations in the
- build directory. This is required because we change the data file locations in
- datafiles-usr-share.patch to be in /usr/share.
-Author: Jeremy Sanders <jeremy at jeremysanders.net>
-Forwarded: not-needed
-Last-Update: 2011-11-25
---- veusz-1.14.orig/tests/runselftest.py
-+++ veusz-1.14/tests/runselftest.py
-@@ -41,6 +41,11 @@
- import os.path
- import sys
- 
-+import veusz.utils
-+datadir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..')
-+veusz.utils.veuszDirectory = veusz.utils.utilfuncs.veuszDirectory = datadir
-+veusz.utils.action.imagedir = os.path.join(datadir, 'windows', 'icons')
-+
- import veusz.qtall as qt4
- import veusz.utils.textrender
- import veusz.document as document

Modified: packages/veusz/trunk/debian/patches/series
===================================================================
--- packages/veusz/trunk/debian/patches/series	2012-04-13 22:54:23 UTC (rev 8476)
+++ packages/veusz/trunk/debian/patches/series	2012-04-14 10:59:19 UTC (rev 8477)
@@ -1,4 +0,0 @@
-license-file-location.patch
-datafiles-usr-share.patch
-self-test-data-location.patch
-examples-location.patch

Modified: packages/veusz/trunk/debian/rules
===================================================================
--- packages/veusz/trunk/debian/rules	2012-04-13 22:54:23 UTC (rev 8476)
+++ packages/veusz/trunk/debian/rules	2012-04-14 10:59:19 UTC (rev 8477)
@@ -22,14 +22,32 @@
 # -- --force works around bug #589759
 	dh_auto_build -- --force
 
+override_dh_auto_install:
+# do not install examples and put data files in /usr/share/veusz
+	dh_auto_install -- --veusz-resource-dir=debian/veusz/usr/share/veusz --disable-install-examples
+
+# veusz follows symlink to find its resource directory
+	for py in $(PYVERS); do \
+		dh_link usr/share/veusz usr/lib/python$${py}/dist-packages/veusz/resources; \
+	done
+
+	dh_numpy
+	dh_sip
+
 override_dh_auto_test:
+# Run self tests. The current directory is used as the resource
+# directory as veusz hasn't been installed when this is run.
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	set -e -x;\
 	for py in $(PYVERS); do \
-		PYTHONPATH=$(call pythonpath,$$py) xvfb-run -a \
+		PYTHONPATH=$(call pythonpath,$$py) \
+		VEUSZ_RESOURCE_DIR=. \
+			xvfb-run -a \
 			--server-args "-screen 0 640x480x24" \
 			python$$py tests/runselftest.py ;\
-		PYTHONPATH=$(call pythonpath_dbg,$$py) xvfb-run -a \
+		PYTHONPATH=$(call pythonpath_dbg,$$py) \
+		VEUSZ_RESOURCE_DIR=. \
+			xvfb-run -a \
 			--server-args "-screen 0 640x480x24" \
 			python$$py-dbg tests/runselftest.py ;\
 	done

Modified: packages/veusz/trunk/debian/veusz.links
===================================================================
--- packages/veusz/trunk/debian/veusz.links	2012-04-13 22:54:23 UTC (rev 8476)
+++ packages/veusz/trunk/debian/veusz.links	2012-04-14 10:59:19 UTC (rev 8477)
@@ -4,3 +4,5 @@
 usr/share/veusz/windows/icons/veusz_64.png usr/share/icons/hicolor/64x64/apps/veusz.png
 usr/share/veusz/windows/icons/veusz_128.png usr/share/icons/hicolor/128x128/apps/veusz.png
 usr/share/veusz/windows/icons/veusz.svg usr/share/icons/hicolor/scalable/apps/veusz.svg
+usr/share/doc/veusz/examples usr/share/veusz/examples
+usr/share/common-licenses/GPL-2 usr/share/veusz/COPYING




More information about the Python-apps-commits mailing list