[med-svn] r20690 - trunk/packages/altree/trunk/debian

[Andreas Tille]

Author: tille
Date: 2015-12-08 21:49:22 +0000 (Tue, 08 Dec 2015)
New Revision: 20690

Modified:
   trunk/packages/altree/trunk/debian/changelog
   trunk/packages/altree/trunk/debian/control
   trunk/packages/altree/trunk/debian/rules
Log:
Revert overriding VIncent's change


Modified: trunk/packages/altree/trunk/debian/changelog
===================================================================
--- trunk/packages/altree/trunk/debian/changelog	2015-12-08 21:40:22 UTC (rev 20689)
+++ trunk/packages/altree/trunk/debian/changelog	2015-12-08 21:49:22 UTC (rev 20690)
@@ -1,18 +1,13 @@
 altree (1.3.1-3) unstable; urgency=medium
 
-  [ Andreas Tille ]
-  * cme fix dpkg-control (dropped Replace/Provides/Conflicts of non-existing
-    packages alphy, libcutils-perl)
-  * d/rules: s/PREFIX/DESTDIR/
-    Closes: #807423
-  * xz compression is default and does not need to be enforced
+  * [debian/control] Update build dependencies for GSL 2, change libgsl0-dev to
+    libgsl-dev. Thanks Bas Couwenberg <sebastic at debian.org> (Closes: #807173)
+  * Fix "FTBFS with perl 5.22 in experimental (MakeMaker changes)" by removing
+    manual (wrong) call to "make install PREFIX=..." (Closes: #807423)
+  * [debian/control] Bump Standards-Version (no changes needed)
 
-  [ Bas Couwenberg ]
-  * Update build dependencies for GSL 2, change libgsl0-dev to libgsl-dev
-    Closes: #807173
+ -- Vincent Danjean <vdanjean at debian.org>  Tue, 08 Dec 2015 20:47:26 +0100
 
- -- Andreas Tille <tille at debian.org>  Tue, 08 Dec 2015 19:12:54 +0100
-
 altree (1.3.1-2) unstable; urgency=medium
 
   * Fix "FTBFS with clang instead of gcc" 

Modified: trunk/packages/altree/trunk/debian/control
===================================================================
--- trunk/packages/altree/trunk/debian/control	2015-12-08 21:40:22 UTC (rev 20689)
+++ trunk/packages/altree/trunk/debian/control	2015-12-08 21:49:22 UTC (rev 20690)
@@ -1,22 +1,15 @@
 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
-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
+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
 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/
@@ -24,10 +17,11 @@
 
 Package: altree
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${perl:Depends},
-         libmath-tamuanova-perl
+Conflicts: libcutils-perl, alphy
+Replaces: libcutils-perl, alphy
+Provides: libcutils-perl, alphy
+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
@@ -37,8 +31,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/rules
===================================================================
--- trunk/packages/altree/trunk/debian/rules	2015-12-08 21:40:22 UTC (rev 20689)
+++ trunk/packages/altree/trunk/debian/rules	2015-12-08 21:49:22 UTC (rev 20690)
@@ -11,9 +11,6 @@
 	$(MAKE) -C Documentation distclean
 	dh_auto_clean
 
-override_dh_auto_install:
-	$(MAKE) DESTDIR=debian/altree install
-
 override_dh_auto_build:
 	$(MAKE) -C Documentation pdf
 	dh_auto_build
@@ -21,6 +18,9 @@
 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