diff -Nru aeskulap-0.2.2b1/debian/aeskulap.debhelper.log aeskulap-0.2.2b1/debian/aeskulap.debhelper.log --- aeskulap-0.2.2b1/debian/aeskulap.debhelper.log 2011-06-04 11:08:07.000000000 +0000 +++ aeskulap-0.2.2b1/debian/aeskulap.debhelper.log 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru aeskulap-0.2.2b1/debian/changelog aeskulap-0.2.2b1/debian/changelog --- aeskulap-0.2.2b1/debian/changelog 2011-06-04 11:07:19.000000000 +0000 +++ aeskulap-0.2.2b1/debian/changelog 2012-01-02 21:25:07.000000000 +0000 @@ -1,17 +1,31 @@ -aeskulap (0.2.2b1-7ubuntu1.1) natty-proposed; urgency=low +aeskulap (0.2.2b1-10) unstable; urgency=low - * Reduce dcmtk dependency to >= 3.6.0 to make the package installable. - (LP: #777940) + * Follow the advise to use dh-autoreconf (control+rules) of + Julian Taylor (thanks Julian) + Closes: #607535 - -- Felix Geyer Sat, 04 Jun 2011 13:06:22 +0200 + -- Andreas Tille Mon, 02 Jan 2012 22:24:12 +0100 -aeskulap (0.2.2b1-7ubuntu1) natty; urgency=low +aeskulap (0.2.2b1-9) unstable; urgency=low - * Merge from Debian experimental, remaining changes: - - debian/patches/30_as_needed.patch: Fix link order for --as-needed. - - Build-depend on dh-autoreconf and include it in debian/rules. + * debian/patches/30_as_needed.patch: Apply Fix from Ubunto to build with + --as-needed (Thanks to Stefan Potyra ) + Closes: #607535 + * debian/sources/format: 3.0 (quilt) + * debian/control: + - Standards-Version: 3.9.2 (no changes needed) + - Fixed Vcs Fields + - Removed Build-Depends cdbs (replaced by short dh) and quilt + which became unneeded because of 3.0 (quilt) + * debhelper 8 (control+compat) + + -- Andreas Tille Thu, 15 Dec 2011 20:06:58 +0100 + +aeskulap (0.2.2b1-8) unstable; urgency=low + + * Uploading to unstable. Closes: #623142 - -- Felix Geyer Mon, 14 Mar 2011 23:33:48 +0100 + -- Mathieu Malaterre Wed, 20 Apr 2011 18:28:34 +0200 aeskulap (0.2.2b1-7) experimental; urgency=low @@ -25,13 +39,6 @@ -- Andreas Tille Fri, 18 Feb 2011 08:21:14 +0000 -aeskulap (0.2.2b1-6ubuntu1) natty; urgency=low - - * debian/patches/30_as_needed.patch: Fix link order for --as-needed. - * debian/patches/99_autoreconf: Run autoreconf. - - -- Stefan Potyra Sun, 19 Dec 2010 16:32:45 +0100 - aeskulap (0.2.2b1-6) unstable; urgency=low * Team upload. diff -Nru aeskulap-0.2.2b1/debian/compat aeskulap-0.2.2b1/debian/compat --- aeskulap-0.2.2b1/debian/compat 2009-09-29 19:32:40.000000000 +0000 +++ aeskulap-0.2.2b1/debian/compat 2011-12-15 19:12:21.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru aeskulap-0.2.2b1/debian/control aeskulap-0.2.2b1/debian/control --- aeskulap-0.2.2b1/debian/control 2011-06-04 11:08:00.000000000 +0000 +++ aeskulap-0.2.2b1/debian/control 2012-01-02 21:24:06.000000000 +0000 @@ -1,22 +1,21 @@ Source: aeskulap Section: science Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Med Packaging Team +Maintainer: Debian Med Packaging Team DM-Upload-Allowed: yes Uploaders: Andreas Tille , Mathieu Malaterre -Build-Depends: cdbs, debhelper (>= 7.1), autotools-dev, libssl-dev, libgtkmm-2.4-dev, +Build-Depends: debhelper (>= 8), dh-autoreconf, libssl-dev, libgtkmm-2.4-dev, libglademm-2.4-dev, libgconfmm-2.6-dev, libwrap0-dev, intltool, libdcmtk2-dev, - libtiff4-dev, quilt, dh-autoreconf -Standards-Version: 3.9.1 + libtiff4-dev +Standards-Version: 3.9.2 Homepage: http://aeskulap.nongnu.org -Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/aeskulap/trunk/?rev=0&sc=0 -Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/aeskulap/trunk/ +Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/aeskulap/trunk/ +Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/aeskulap/trunk/ Package: aeskulap Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, dcmtk (>= 3.6.0) +Depends: ${shlibs:Depends}, ${misc:Depends}, dcmtk (>= 3.6.0-2) Description: medical image viewer and DICOM network client Aeskulap is able to load a series of special images stored in the DICOM format for review. Additionally it is able to query and fetch DICOM diff -Nru aeskulap-0.2.2b1/debian/patches/30_as_needed.patch aeskulap-0.2.2b1/debian/patches/30_as_needed.patch --- aeskulap-0.2.2b1/debian/patches/30_as_needed.patch 2011-03-14 22:31:49.000000000 +0000 +++ aeskulap-0.2.2b1/debian/patches/30_as_needed.patch 2011-12-15 19:36:46.000000000 +0000 @@ -1,7 +1,10 @@ -Index: aeskulap-0.2.2b1/src/Makefile.am -=================================================================== ---- aeskulap-0.2.2b1.orig/src/Makefile.am 2010-12-19 16:08:25.332866917 +0100 -+++ aeskulap-0.2.2b1/src/Makefile.am 2010-12-19 16:08:45.862866917 +0100 +Author: Stefan Potyra +Last-Changed: Sun, 19 Dec 2010 15:45:01 UTC +Bug-Closed: http://bugs.debian.org/607535 +Description: Enable build with linker flag --as-needed + +--- aeskulap-0.2.2b1.orig/src/Makefile.am ++++ aeskulap-0.2.2b1/src/Makefile.am @@ -37,12 +37,12 @@ aeskulap_LDADD = \ diff -Nru aeskulap-0.2.2b1/debian/rules aeskulap-0.2.2b1/debian/rules --- aeskulap-0.2.2b1/debian/rules 2011-03-14 22:33:23.000000000 +0000 +++ aeskulap-0.2.2b1/debian/rules 2012-01-02 21:23:44.000000000 +0000 @@ -1,14 +1,16 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk -# include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/rules/autoreconf.mk +%: + dh $@ --with autoreconf + +override_dh_install: + dh_install + # Remove libtool archives (.la files). + find $(CURDIR)/debian -name 'lib*.la' -exec rm '{}' \; + +override_dh_auto_test: + echo "Do not run tests" get-orig-source: . debian/get-orig-source -install/aeskulap:: - # Remove libtool archives (.la files). - find $(CURDIR)/debian -name 'lib*.la' -exec rm '{}' \;