[med-svn] r8982 - in trunk/packages/aeskulap/trunk/debian: . patches source

[Andreas Tille]

Author: tille
Date: 2011-12-15 19:52:32 +0000 (Thu, 15 Dec 2011)
New Revision: 8982

Added:
   trunk/packages/aeskulap/trunk/debian/patches/30_as_needed.patch
   trunk/packages/aeskulap/trunk/debian/source/
   trunk/packages/aeskulap/trunk/debian/source/format
Modified:
   trunk/packages/aeskulap/trunk/debian/changelog
   trunk/packages/aeskulap/trunk/debian/compat
   trunk/packages/aeskulap/trunk/debian/control
   trunk/packages/aeskulap/trunk/debian/patches/series
   trunk/packages/aeskulap/trunk/debian/rules
Log:
Apply Fix from Ubunto to build with --as-needed; general packaging updates


Modified: trunk/packages/aeskulap/trunk/debian/changelog
===================================================================
--- trunk/packages/aeskulap/trunk/debian/changelog	2011-12-15 18:35:20 UTC (rev 8981)
+++ trunk/packages/aeskulap/trunk/debian/changelog	2011-12-15 19:52:32 UTC (rev 8982)
@@ -1,3 +1,18 @@
+aeskulap (0.2.2b1-9) unstable; urgency=low
+
+  * debian/patches/30_as_needed.patch: Apply Fix from Ubunto to build with
+     --as-needed (Thanks to Stefan Potyra <sistpoty at ubuntu.com>)
+    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 <tille at debian.org>  Thu, 15 Dec 2011 20:06:58 +0100
+
 aeskulap (0.2.2b1-8) unstable; urgency=low
 
   * Uploading to unstable. Closes: #623142

Modified: trunk/packages/aeskulap/trunk/debian/compat
===================================================================
--- trunk/packages/aeskulap/trunk/debian/compat	2011-12-15 18:35:20 UTC (rev 8981)
+++ trunk/packages/aeskulap/trunk/debian/compat	2011-12-15 19:52:32 UTC (rev 8982)
@@ -1 +1 @@
-7
+8

Modified: trunk/packages/aeskulap/trunk/debian/control
===================================================================
--- trunk/packages/aeskulap/trunk/debian/control	2011-12-15 18:35:20 UTC (rev 8981)
+++ trunk/packages/aeskulap/trunk/debian/control	2011-12-15 19:52:32 UTC (rev 8982)
@@ -5,13 +5,13 @@
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>,
  Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: cdbs, debhelper (>= 7.1), autotools-dev, libssl-dev, libgtkmm-2.4-dev,
+Build-Depends: debhelper (>= 8), autotools-dev, libssl-dev, libgtkmm-2.4-dev,
  libglademm-2.4-dev, libgconfmm-2.6-dev, libwrap0-dev, intltool, libdcmtk2-dev,
- libtiff4-dev, quilt
-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

Added: trunk/packages/aeskulap/trunk/debian/patches/30_as_needed.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/30_as_needed.patch	                        (rev 0)
+++ trunk/packages/aeskulap/trunk/debian/patches/30_as_needed.patch	2011-12-15 19:52:32 UTC (rev 8982)
@@ -0,0 +1,23 @@
+Author: Stefan Potyra <sistpoty at ubuntu.com>
+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 = \
+ 	$(ICONOBJ) \
+-	$(GTKMM_LIBS) \
+-	$(GLADEMM_LIBS) \
+-	$(GTHREAD_LIBS) \
+ 	../widgets/libgtkdicom.la \
+ 	../imagepool/libimagepool.la \
+ 	../configuration/libconfiguration.la \
++	$(GTKMM_LIBS) \
++	$(GLADEMM_LIBS) \
++	$(GTHREAD_LIBS) \
+ 	$(GCONFMM_LIBS) \
+ 	$(DCMTK_LIBS)
+ 

Modified: trunk/packages/aeskulap/trunk/debian/patches/series
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/series	2011-12-15 18:35:20 UTC (rev 8981)
+++ trunk/packages/aeskulap/trunk/debian/patches/series	2011-12-15 19:52:32 UTC (rev 8982)
@@ -7,3 +7,4 @@
 patientsname.patch
 dcmdata_debug.patch
 oflog.patch
+30_as_needed.patch

Modified: trunk/packages/aeskulap/trunk/debian/rules
===================================================================
--- trunk/packages/aeskulap/trunk/debian/rules	2011-12-15 18:35:20 UTC (rev 8981)
+++ trunk/packages/aeskulap/trunk/debian/rules	2011-12-15 19:52:32 UTC (rev 8982)
@@ -1,13 +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
+%:
+	dh $@
 
+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 '{}' \;	

Added: trunk/packages/aeskulap/trunk/debian/source/format
===================================================================
--- trunk/packages/aeskulap/trunk/debian/source/format	                        (rev 0)
+++ trunk/packages/aeskulap/trunk/debian/source/format	2011-12-15 19:52:32 UTC (rev 8982)
@@ -0,0 +1 @@
+3.0 (quilt)