[med-svn] r8779 - in trunk/packages/tree-puzzle/trunk/debian: . source

Andreas Tille tille at alioth.debian.org
Tue Dec 6 09:02:50 UTC 2011


Author: tille
Date: 2011-12-06 09:02:50 +0000 (Tue, 06 Dec 2011)
New Revision: 8779

Added:
   trunk/packages/tree-puzzle/trunk/debian/source/
   trunk/packages/tree-puzzle/trunk/debian/source/format
   trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.menu
   trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.menu
Removed:
   trunk/packages/tree-puzzle/trunk/debian/README.source
   trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.desktop
   trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.desktop
Modified:
   trunk/packages/tree-puzzle/trunk/debian/changelog
   trunk/packages/tree-puzzle/trunk/debian/compat
   trunk/packages/tree-puzzle/trunk/debian/control
   trunk/packages/tree-puzzle/trunk/debian/rules
   trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.docs
   trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.install
   trunk/packages/tree-puzzle/trunk/debian/tree-puzzle-doc.docs
   trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.docs
   trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.install
Log:
Update to current packaging standards; do not provide Debian Menu file instead of freedesktop.org file to not confuse users of moedern desktops expecting shiny GUIs instead of command line application


Deleted: trunk/packages/tree-puzzle/trunk/debian/README.source
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/README.source	2011-12-06 09:01:17 UTC (rev 8778)
+++ trunk/packages/tree-puzzle/trunk/debian/README.source	2011-12-06 09:02:50 UTC (rev 8779)
@@ -1,4 +0,0 @@
-This packages uses the quilt patch system. Please read
-/usr/share/doc/quilt/README.source for more information.
-
- -- Andreas Tille <tille at debian.org>  Mon, 31 Aug 2009 14:50:19 +0200

Modified: trunk/packages/tree-puzzle/trunk/debian/changelog
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/changelog	2011-12-06 09:01:17 UTC (rev 8778)
+++ trunk/packages/tree-puzzle/trunk/debian/changelog	2011-12-06 09:02:50 UTC (rev 8779)
@@ -1,3 +1,20 @@
+tree-puzzle (5.2-7) unstable; urgency=low
+
+  * debian/control:
+    - Standards-Version: 3.9.2 (no changes needed)
+    - Fixed Vcs fields
+    - Do not Build-Depend cdbs, quilt any more
+  * Debhelper 8 (control + compat)
+  * debian/source/format: 3.0 (quilt)
+  * debian/rules: short dh
+  * removed debian/README.source which becomes superfluous by using
+    source format 3.0 (quilt)
+  * debian/*.docs: Leave AUTHOR+README in the binary packages
+  * Use Debian menu instead of desktop files to not confuse Gnome users
+    Closes: #640003
+
+ -- Andreas Tille <tille at debian.org>  Tue, 06 Dec 2011 08:40:41 +0100
+
 tree-puzzle (5.2-6) unstable; urgency=low
 
   * Try to build against libopenmpi-dev instead of lam4-dev

Modified: trunk/packages/tree-puzzle/trunk/debian/compat
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/compat	2011-12-06 09:01:17 UTC (rev 8778)
+++ trunk/packages/tree-puzzle/trunk/debian/compat	2011-12-06 09:02:50 UTC (rev 8779)
@@ -1 +1 @@
-7
+8

Modified: trunk/packages/tree-puzzle/trunk/debian/control
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/control	2011-12-06 09:01:17 UTC (rev 8778)
+++ trunk/packages/tree-puzzle/trunk/debian/control	2011-12-06 09:02:50 UTC (rev 8779)
@@ -4,11 +4,11 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>, Charles Plessy <plessy at debian.org>
-Build-Depends: cdbs, autotools-dev, quilt, debhelper (>=7), libopenmpi-dev, libsprng2-dev
-Standards-Version: 3.8.3
+Build-Depends: autotools-dev, debhelper (>=8), libopenmpi-dev, libsprng2-dev
+Standards-Version: 3.9.2
 Homepage: http://www.tree-puzzle.de
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/tree-puzzle/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/tree-puzzle/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/tree-puzzle/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/tree-puzzle/trunk/
 
 Package: tree-puzzle
 Architecture: any

Modified: trunk/packages/tree-puzzle/trunk/debian/rules
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/rules	2011-12-06 09:01:17 UTC (rev 8778)
+++ trunk/packages/tree-puzzle/trunk/debian/rules	2011-12-06 09:02:50 UTC (rev 8779)
@@ -1,21 +1,21 @@
 #!/usr/bin/make -f
-# debian/rules for tree-puzzle using cdbs
+# debian/rules for tree-puzzle using dh
 # Andreas Tille <tille at debian.org>, GPL
 
 pkg:=tree-puzzle
 ppkg:=tree-ppuzzle
 
-DEB_COMPRESS_EXCLUDE := .pdf .phy trees .b
+%:
+	dh $@
 
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
+override_dh_compress:
+	dh_compress --exclude=.pdf --exclude .phy --exclude trees --exclude .b
 
-install/tree-puzzle::
+override_dh_install:
+	dh_install
 	# The binary has to be renamed because of the generic name
 	mv `pwd`/debian/tmp/usr/bin/puzzle `pwd`/debian/$(pkg)/usr/bin/$(pkg)
+	mv `pwd`/debian/tmp/usr/bin/ppuzzle `pwd`/debian/$(ppkg)/usr/bin/$(ppkg)
 
-install/tree-ppuzzle::
-	# The binary has to be renamed because of the generic name
-	mv `pwd`/debian/tmp/usr/bin/ppuzzle `pwd`/debian/$(ppkg)/usr/bin/$(ppkg)
+override_dh_auto_test:
+	# do not run check

Added: trunk/packages/tree-puzzle/trunk/debian/source/format
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/source/format	                        (rev 0)
+++ trunk/packages/tree-puzzle/trunk/debian/source/format	2011-12-06 09:02:50 UTC (rev 8779)
@@ -0,0 +1 @@
+3.0 (quilt)

Deleted: trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.desktop
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.desktop	2011-12-06 09:01:17 UTC (rev 8778)
+++ trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.desktop	2011-12-06 09:02:50 UTC (rev 8779)
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Terminal=true
-Icon=tree-ppuzzle
-Exec=tree-ppuzzle
-Name=tree-ppuzzle
-GenericName=Reconstruction of phylogenetic trees (parallelized)
-GenericName[en]=Reconstruction of phylogenetic trees (parallelized)
-Comment=Reconstruction of phylogenetic trees by maximum likelihood (parallelized version)
-Comment[en]=Reconstruction of phylogenetic trees by maximum likelihood (parallelized version)
-Type=Application
-Categories=Biology;Science;Education;

Modified: trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.docs
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.docs	2011-12-06 09:01:17 UTC (rev 8778)
+++ trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.docs	2011-12-06 09:02:50 UTC (rev 8779)
@@ -1 +1,3 @@
-debian/README.Debian
+AUTHORS
+README
+debian/README.Debian
\ No newline at end of file

Modified: trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.install
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.install	2011-12-06 09:01:17 UTC (rev 8778)
+++ trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.install	2011-12-06 09:02:50 UTC (rev 8779)
@@ -1,2 +1 @@
-debian/tree-ppuzzle.desktop  usr/share/applications
 debian/tree-ppuzzle.xpm      usr/share/pixmaps

Added: trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.menu
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.menu	                        (rev 0)
+++ trunk/packages/tree-puzzle/trunk/debian/tree-ppuzzle.menu	2011-12-06 09:02:50 UTC (rev 8779)
@@ -0,0 +1,4 @@
+?package(tree-ppuzzle):needs="text" section="Applications/Science/Biology"\
+  title="Tree Puzzle (parallelized)" command="/usr/bin/tree-ppuzzle" \
+  hints="Parallelized reconstruction of phylogenetic trees by maximum likelihood" \
+  icon="/usr/share/pixmaps/tree-ppuzzle.xpm"

Modified: trunk/packages/tree-puzzle/trunk/debian/tree-puzzle-doc.docs
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/tree-puzzle-doc.docs	2011-12-06 09:01:17 UTC (rev 8778)
+++ trunk/packages/tree-puzzle/trunk/debian/tree-puzzle-doc.docs	2011-12-06 09:02:50 UTC (rev 8779)
@@ -1,4 +1 @@
-AUTHORS
-README
-doc/*.html
 doc/*.pdf

Deleted: trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.desktop
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.desktop	2011-12-06 09:01:17 UTC (rev 8778)
+++ trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.desktop	2011-12-06 09:02:50 UTC (rev 8779)
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Terminal=true
-Icon=tree-puzzle
-Exec=tree-puzzle
-Name=tree-puzzle
-GenericName=Reconstruction of phylogenetic trees
-GenericName[en]=Reconstruction of phylogenetic trees
-Comment=Reconstruction of phylogenetic trees by maximum likelihood
-Comment[en]=Reconstruction of phylogenetic trees by maximum likelihood
-Type=Application
-Categories=Biology;Science;Education;

Modified: trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.docs
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.docs	2011-12-06 09:01:17 UTC (rev 8778)
+++ trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.docs	2011-12-06 09:02:50 UTC (rev 8779)
@@ -1 +1,3 @@
+AUTHORS
+README
 debian/README.Debian

Modified: trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.install
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.install	2011-12-06 09:01:17 UTC (rev 8778)
+++ trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.install	2011-12-06 09:02:50 UTC (rev 8779)
@@ -1,2 +1 @@
-debian/tree-puzzle.desktop usr/share/applications
 debian/tree-puzzle.xpm     usr/share/pixmaps

Added: trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.menu
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.menu	                        (rev 0)
+++ trunk/packages/tree-puzzle/trunk/debian/tree-puzzle.menu	2011-12-06 09:02:50 UTC (rev 8779)
@@ -0,0 +1,4 @@
+?package(tree-puzzle):needs="text" section="Applications/Science/Biology"\
+  title="Tree Puzzle" command="/usr/bin/tree-puzzle" \
+  hints="Reconstruction of phylogenetic trees by maximum likelihood" \
+  icon="/usr/share/pixmaps/tree-puzzle.xpm"




More information about the debian-med-commit mailing list