r36002 - in /packages/qtiplot/trunk/debian: changelog control menu postinst postrm qtiplot-doc.doc-base qtiplot-doc.docs qtiplot-doc.install qtiplot.docs qtiplot.examples qtiplot.install qtiplot.manpages qtiplot.menu qtiplot.postinst qtiplot.postrm rules

tille at users.alioth.debian.org tille at users.alioth.debian.org
Thu Nov 19 15:12:41 UTC 2009


Author: tille
Date: Thu Nov 19 15:12:25 2009
New Revision: 36002

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36002
Log:
Several changes to make the installation more based on dh_* instead of using make install and clean up later.  One major effect is that the manual is not in both packages any more.

Added:
    packages/qtiplot/trunk/debian/qtiplot-doc.docs
    packages/qtiplot/trunk/debian/qtiplot-doc.install
    packages/qtiplot/trunk/debian/qtiplot.docs
    packages/qtiplot/trunk/debian/qtiplot.examples
    packages/qtiplot/trunk/debian/qtiplot.install
    packages/qtiplot/trunk/debian/qtiplot.manpages
    packages/qtiplot/trunk/debian/qtiplot.menu
    packages/qtiplot/trunk/debian/qtiplot.postinst
    packages/qtiplot/trunk/debian/qtiplot.postrm
Removed:
    packages/qtiplot/trunk/debian/menu
    packages/qtiplot/trunk/debian/postinst
    packages/qtiplot/trunk/debian/postrm
Modified:
    packages/qtiplot/trunk/debian/changelog
    packages/qtiplot/trunk/debian/control
    packages/qtiplot/trunk/debian/qtiplot-doc.doc-base
    packages/qtiplot/trunk/debian/rules

Modified: packages/qtiplot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/changelog?rev=36002&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/changelog (original)
+++ packages/qtiplot/trunk/debian/changelog Thu Nov 19 15:12:25 2009
@@ -1,5 +1,6 @@
 qtiplot (0.9.7.10+r1453-1) unstable; urgency=low
 
+  [ Gudjon I. Gudjonsson ]
   * New SVN version (Closes: #547273, #551008)
   * Add file build.conf
   * Remove dependency on libqwt-qt4-dev since it is static now
@@ -8,7 +9,17 @@
   * Add Qwt copyright to copyright file
   * Change Vcs fields from collab-maint to debian-science
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sat, 14 Nov 2009 19:07:31 +0100
+  [ Andreas Tille ]
+  * debian/control:
+    - Group maintenance in Debian Science team with permission of maintainer
+    - Added myself as Uploaders
+  * Debhelper 7
+  * debian/qtiplot-doc.doc-base: Document: qtiplot-doc
+  * make use of dh_install instead of make install and cleaning
+    up afterwards
+  * Provide examples
+
+ -- Andreas Tille <tille at debian.org>  Wed, 18 Nov 2009 10:33:29 +0100
 
 qtiplot (0.9.7.10-1) UNRELEASED; urgency=low
 

Modified: packages/qtiplot/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/control?rev=36002&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/control (original)
+++ packages/qtiplot/trunk/debian/control Thu Nov 19 15:12:25 2009
@@ -1,8 +1,10 @@
 Source: qtiplot
 Section: math
 Priority: optional
-Maintainer: Gudjon I. Gudjonsson <gudjon at gudjon.org>
-Build-Depends: debhelper (>= 5), quilt, dblatex, docbook-utils, doxygen,
+Maintainer:  Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Gudjon I. Gudjonsson <gudjon at gudjon.org>,
+ Andreas Tille <tille at debian.org>
+Build-Depends: debhelper (>= 7), quilt, dblatex, docbook-utils, doxygen,
  libgsl0-dev, zlib1g-dev, libpng12-dev,
  liborigin2-dev, libmuparser-dev (>=1.30), python-all-dev (>= 2.4.4),
  python-qt4, python-qt4-dev, python-sip4-dev, sip4, libqt4-opengl-dev

Modified: packages/qtiplot/trunk/debian/qtiplot-doc.doc-base
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/qtiplot-doc.doc-base?rev=36002&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/qtiplot-doc.doc-base (original)
+++ packages/qtiplot/trunk/debian/qtiplot-doc.doc-base Thu Nov 19 15:12:25 2009
@@ -1,4 +1,4 @@
-Document: qtiplot
+Document: qtiplot-doc
 Title: Debian qtiplot Manual
 Author: Ion Vasilief, Roger Gadiou, and Knut Franke
 Abstract: Qtiplot is a scientific plotting program with 

Added: packages/qtiplot/trunk/debian/qtiplot-doc.docs
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/qtiplot-doc.docs?rev=36002&op=file
==============================================================================
--- packages/qtiplot/trunk/debian/qtiplot-doc.docs (added)
+++ packages/qtiplot/trunk/debian/qtiplot-doc.docs Thu Nov 19 15:12:25 2009
@@ -1,0 +1,1 @@
+API

Added: packages/qtiplot/trunk/debian/qtiplot-doc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/qtiplot-doc.install?rev=36002&op=file
==============================================================================
--- packages/qtiplot/trunk/debian/qtiplot-doc.install (added)
+++ packages/qtiplot/trunk/debian/qtiplot-doc.install Thu Nov 19 15:12:25 2009
@@ -1,0 +1,2 @@
+manual/html                  usr/share/doc/qtiplot-doc/manual
+manual/qtiplot-manual-en.pdf usr/share/doc/qtiplot-doc/manual

Added: packages/qtiplot/trunk/debian/qtiplot.docs
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/qtiplot.docs?rev=36002&op=file
==============================================================================
--- packages/qtiplot/trunk/debian/qtiplot.docs (added)
+++ packages/qtiplot/trunk/debian/qtiplot.docs Thu Nov 19 15:12:25 2009
@@ -1,0 +1,1 @@
+README.html

Added: packages/qtiplot/trunk/debian/qtiplot.examples
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/qtiplot.examples?rev=36002&op=file
==============================================================================
--- packages/qtiplot/trunk/debian/qtiplot.examples (added)
+++ packages/qtiplot/trunk/debian/qtiplot.examples Thu Nov 19 15:12:25 2009
@@ -1,0 +1,1 @@
+qtiplot/examples/*

Added: packages/qtiplot/trunk/debian/qtiplot.install
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/qtiplot.install?rev=36002&op=file
==============================================================================
--- packages/qtiplot/trunk/debian/qtiplot.install (added)
+++ packages/qtiplot/trunk/debian/qtiplot.install Thu Nov 19 15:12:25 2009
@@ -1,0 +1,7 @@
+qtiplot/qtiplot              usr/bin
+debian/qtiplot.desktop       usr/share/applications
+qtiplot/translations/*.qm    usr/share/qtiplot/translations
+debian/qtiplot.xpm           usr/share/pixmaps
+qtiplot/qtiplotrc.py         usr/share/qtiplot
+qtiplot/qtiUtil.py           usr/share/qtiplot
+qtiplot/qti_wordlist.txt     usr/share/qtiplot

Added: packages/qtiplot/trunk/debian/qtiplot.manpages
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/qtiplot.manpages?rev=36002&op=file
==============================================================================
--- packages/qtiplot/trunk/debian/qtiplot.manpages (added)
+++ packages/qtiplot/trunk/debian/qtiplot.manpages Thu Nov 19 15:12:25 2009
@@ -1,0 +1,1 @@
+qtiplot.1

Added: packages/qtiplot/trunk/debian/qtiplot.menu
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/qtiplot.menu?rev=36002&op=file
==============================================================================
--- packages/qtiplot/trunk/debian/qtiplot.menu (added)
+++ packages/qtiplot/trunk/debian/qtiplot.menu Thu Nov 19 15:12:25 2009
@@ -1,0 +1,6 @@
+?package(qtiplot): \
+	needs="X11" \
+	section="Applications/Science/Data Analysis" \
+	title="QtiPlot" \
+	command="/usr/bin/qtiplot" \
+	icon="/usr/share/pixmaps/qtiplot.xpm"

Added: packages/qtiplot/trunk/debian/qtiplot.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/qtiplot.postinst?rev=36002&op=file
==============================================================================
--- packages/qtiplot/trunk/debian/qtiplot.postinst (added)
+++ packages/qtiplot/trunk/debian/qtiplot.postinst Thu Nov 19 15:12:25 2009
@@ -1,0 +1,43 @@
+#!/bin/sh
+# postinst script for Qtiplot
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+    py_compilefiles -f /usr/share/qtiplot/qtiplotrc.py
+    py_compilefiles -f /usr/share/qtiplot/qtiUtil.py
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: packages/qtiplot/trunk/debian/qtiplot.postrm
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/qtiplot.postrm?rev=36002&op=file
==============================================================================
--- packages/qtiplot/trunk/debian/qtiplot.postrm (added)
+++ packages/qtiplot/trunk/debian/qtiplot.postrm Thu Nov 19 15:12:25 2009
@@ -1,0 +1,41 @@
+#!/bin/sh
+# postrm script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    rm -f /usr/share/qtiplot/qtiplotrc.pyc
+    rm -f /usr/share/qtiplot/qtiUtil.pyc
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Modified: packages/qtiplot/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/rules?rev=36002&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/rules (original)
+++ packages/qtiplot/trunk/debian/rules Thu Nov 19 15:12:25 2009
@@ -75,44 +75,34 @@
 	rm -f 3rdparty/qwt/lib/libqwt.a
 	dh_clean
 
-install: install-indep install-arch
+install: install-arch install-indep
 install-indep:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i
-	dh_installdirs -i -pqtiplot-doc usr/share/doc/qtiplot-doc
-
-	cp -a API debian/qtiplot-doc/usr/share/doc/qtiplot-doc/
-	mkdir -p debian/qtiplot-doc/usr/share/doc/qtiplot-doc/manual
-	cp -a manual/html debian/qtiplot-doc/usr/share/doc/qtiplot-doc/manual/
-	cp -a manual/qtiplot-manual-en.pdf debian/qtiplot-doc/usr/share/doc/qtiplot-doc/manual/
+	dh_prep -i
 
 install-arch:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -s
-	dh_installdirs -s -pqtiplot usr/bin usr/share/pixmaps usr/share/qtiplot/translations
+	dh_prep -s
+	dh_installdirs -s
 
-	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/qtiplot install
-	#For some reason the binary isn't installed. Adding temporarily.
-	cp qtiplot/qtiplot debian/qtiplot/usr/bin/qtiplot
-
-	# For some reason all header files for QWT are installed, removing.
-	rm -rf debian/qtiplot/usr/local
-
-	cp debian/qtiplot.xpm debian/qtiplot/usr/share/pixmaps/
-	cp qtiplot/translations/*.qm debian/qtiplot/usr/share/qtiplot/translations/
-
-	install -D -p -m0644 debian/qtiplot.desktop \
-		debian/qtiplot/usr/share/applications/qtiplot.desktop
-
-	dh_installman -s -pqtiplot qtiplot.1
+	# use dh_install for all files to move instead of cleaning behind
+	# $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/qtiplot install
+	## move manual to doc package
+	# mkdir -p $(CURDIR)/debian/qtiplot//usr/share/doc/qtiplot-doc/
+	# mv $(CURDIR)/debian/qtiplot//usr/share/doc/qtiplot/manual $(CURDIR)/debian/qtiplot//usr/share/doc/qtiplot-doc/
+	## For some reason all header files for QWT are installed, removing.
+	# rm -rf debian/qtiplot/usr/local
 
 binary-common:
 	dh_testdir
 	dh_testroot
+	dh_install
+	dh_installman
 	dh_installchangelogs
 	dh_installdocs
+	dh_installexamples
 	dh_installmenu
 	dh_link
 	dh_strip




More information about the debian-science-commits mailing list