[med-svn] r20699 - in trunk/packages/altree/trunk/debian: . patches

[Vincent Danjean]

Author: vdanjean
Date: 2015-12-09 21:37:32 +0000 (Wed, 09 Dec 2015)
New Revision: 20699

Modified:
   trunk/packages/altree/trunk/debian/changelog
   trunk/packages/altree/trunk/debian/control
   trunk/packages/altree/trunk/debian/patches/from-upstream-no-nested-functions.patch
   trunk/packages/altree/trunk/debian/rules
Log:
reapply Andreas's modification and fix empty package

Modified: trunk/packages/altree/trunk/debian/changelog
===================================================================
--- trunk/packages/altree/trunk/debian/changelog	2015-12-09 15:09:20 UTC (rev 20698)
+++ trunk/packages/altree/trunk/debian/changelog	2015-12-09 21:37:32 UTC (rev 20699)
@@ -1,3 +1,16 @@
+altree (1.3.1-4) UNRELEASED; urgency=medium
+
+  [ Andreas Tille ]
+  * cme fix dpkg-control (dropped Replace/Provides/Conflicts of non-existing
+    packages alphy, libcutils-perl)
+  * xz compression is default and does not need to be enforced
+
+  [ Vincent Danjean ]
+  * Fix "Produces empty binary package" by adding debian/altree.install
+    (Closes: #807493)
+
+ -- Vincent Danjean <vdanjean at debian.org>  Wed, 09 Dec 2015 22:31:41 +0100
+
 altree (1.3.1-3) unstable; urgency=medium
 
   * [debian/control] Update build dependencies for GSL 2, change libgsl0-dev to

Modified: trunk/packages/altree/trunk/debian/control
===================================================================
--- trunk/packages/altree/trunk/debian/control	2015-12-09 15:09:20 UTC (rev 20698)
+++ trunk/packages/altree/trunk/debian/control	2015-12-09 21:37:32 UTC (rev 20699)
@@ -1,15 +1,22 @@
 Source: altree
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Uploaders: Charles Plessy <plessy at debian.org>,
+           Vincent Danjean <vdanjean at debian.org>,
+           Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Charles Plessy <plessy at debian.org>,
- Vincent Danjean <vdanjean at debian.org>,
- Andreas Tille <tille at debian.org>
-Build-Depends: bash-completion, debhelper (>= 9), latex-make, ghostscript,
- texlive-lang-french, texlive-latex-extra, texlive-latex-recommended,
- texlive-fonts-recommended,
- libmath-tamuanova-perl, libgsl-dev, libatlas-base-dev,
- libtest-deep-perl
+Build-Depends: bash-completion,
+               debhelper (>= 9),
+               latex-make,
+               ghostscript,
+               texlive-lang-french,
+               texlive-latex-extra,
+               texlive-latex-recommended,
+               texlive-fonts-recommended,
+               libmath-tamuanova-perl,
+               libgsl-dev,
+               libatlas-base-dev,
+               libtest-deep-perl
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/altree/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/altree/trunk/
@@ -17,11 +24,10 @@
 
 Package: altree
 Architecture: any
-Conflicts: libcutils-perl, alphy
-Replaces: libcutils-perl, alphy
-Provides: libcutils-perl, alphy
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
- libmath-tamuanova-perl
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         ${perl:Depends},
+         libmath-tamuanova-perl
 Suggests: altree-examples
 Description: program to perform phylogeny-based association and localization analysis
  ALTree was designed to perform association detection and localization of
@@ -31,8 +37,8 @@
 
 Package: altree-examples
 Architecture: all
+Depends: ${misc:Depends}
 Recommends: altree (= ${binary:Version})
-Depends: ${misc:Depends}
 Description: example files for ALTree
  ALTree was designed to perform association detection and localization of
  susceptibility sites using haplotype phylogenetic trees: first, it allows the

Modified: trunk/packages/altree/trunk/debian/patches/from-upstream-no-nested-functions.patch
===================================================================
--- trunk/packages/altree/trunk/debian/patches/from-upstream-no-nested-functions.patch	2015-12-09 15:09:20 UTC (rev 20698)
+++ trunk/packages/altree/trunk/debian/patches/from-upstream-no-nested-functions.patch	2015-12-09 21:37:32 UTC (rev 20699)
@@ -1,4 +1,4 @@
-Avoid nested C functions
+Description: From upstream, avoid nested C functions
 --- a/CUtils/c_sources/rhyper.c
 +++ b/CUtils/c_sources/rhyper.c
 @@ -52,55 +52,61 @@

Modified: trunk/packages/altree/trunk/debian/rules
===================================================================
--- trunk/packages/altree/trunk/debian/rules	2015-12-09 15:09:20 UTC (rev 20698)
+++ trunk/packages/altree/trunk/debian/rules	2015-12-09 21:37:32 UTC (rev 20699)
@@ -18,9 +18,6 @@
 override_dh_compress:
 	dh_compress --exclude=.pdf
 
-override_dh_builddeb:
-	dh_builddeb -- -Z xz
-
 get-orig-source:
 	mkdir -p ../tarballs
 	uscan --verbose --force-download --destdir=../tarballs