[med-svn] r19268 - trunk/packages/epigrass/trunk/debian

[Andreas Tille]

Author: tille
Date: 2015-05-20 20:54:22 +0000 (Wed, 20 May 2015)
New Revision: 19268

Removed:
   trunk/packages/epigrass/trunk/debian/epigrass.links
Modified:
   trunk/packages/epigrass/trunk/debian/changelog
   trunk/packages/epigrass/trunk/debian/control
   trunk/packages/epigrass/trunk/debian/epigrass.install
   trunk/packages/epigrass/trunk/debian/rules
Log:
switch from python-support to pybuild, fix link to icon location



Modified: trunk/packages/epigrass/trunk/debian/changelog
===================================================================
--- trunk/packages/epigrass/trunk/debian/changelog	2015-05-20 20:20:06 UTC (rev 19267)
+++ trunk/packages/epigrass/trunk/debian/changelog	2015-05-20 20:54:22 UTC (rev 19268)
@@ -2,6 +2,9 @@
 
   * Fix watch file
   * cme fix dpkg-control
+  * switch from python-support to pybuild
+    Closes: #786153
+  * Fix link to icon location
 
  -- Andreas Tille <tille at debian.org>  Wed, 20 May 2015 19:54:17 +0200
 

Modified: trunk/packages/epigrass/trunk/debian/control
===================================================================
--- trunk/packages/epigrass/trunk/debian/control	2015-05-20 20:20:06 UTC (rev 19267)
+++ trunk/packages/epigrass/trunk/debian/control	2015-05-20 20:54:22 UTC (rev 19268)
@@ -5,9 +5,9 @@
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
+               dh-python,
                python,
                python-setuptools,
-               python-support,
                python-virtualenv,
                python-sqlsoup,
                python-redis

Modified: trunk/packages/epigrass/trunk/debian/epigrass.install
===================================================================
--- trunk/packages/epigrass/trunk/debian/epigrass.install	2015-05-20 20:20:06 UTC (rev 19267)
+++ trunk/packages/epigrass/trunk/debian/epigrass.install	2015-05-20 20:54:22 UTC (rev 19268)
@@ -1,3 +1,2 @@
-usr
 debian/epigrass.desktop	usr/share/applications
 demos usr/share/doc/epigrass

Deleted: trunk/packages/epigrass/trunk/debian/epigrass.links
===================================================================
--- trunk/packages/epigrass/trunk/debian/epigrass.links	2015-05-20 20:20:06 UTC (rev 19267)
+++ trunk/packages/epigrass/trunk/debian/epigrass.links	2015-05-20 20:54:22 UTC (rev 19268)
@@ -1 +0,0 @@
-usr/share/pyshared/Epigrass/egicon.png	usr/share/pixmaps/egigrass.png

Modified: trunk/packages/epigrass/trunk/debian/rules
===================================================================
--- trunk/packages/epigrass/trunk/debian/rules	2015-05-20 20:20:06 UTC (rev 19267)
+++ trunk/packages/epigrass/trunk/debian/rules	2015-05-20 20:54:22 UTC (rev 19268)
@@ -1,11 +1,14 @@
 #!/usr/bin/make -f
 
+export PYBUILD_DESTDIR=debian/epigrass
+
 %:
-	dh $@ --with python2
+	dh $@ --with python2 --buildsystem=pybuild
 
-# override_dh_clean:
-	# *.pyc files should be cleaned in principle, but are part of upstream tarball
-	# rm -f Epigrass/*.pyc
+override_dh_auto_install:
+	dh_auto_install -- --after-install='set -x; \
+					    mv {destdir}/{install_dir}/Epigrass/egicon.png {destdir}/usr/share/pixmaps/epigrass.png; \
+					    ln -s /usr/share/pixmaps/epigrass.png {destdir}/{install_dir}/Epigrass/egicon.png'
 
 get-orig-source:
 	mkdir -p ../tarballs