[med-svn] r2549 - trunk/packages/gdcm/trunk/debian

[smr at alioth.debian.org]

Author: smr
Date: 2008-09-29 04:25:07 +0000 (Mon, 29 Sep 2008)
New Revision: 2549

Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/libgdcm-tools.install
   trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install
   trunk/packages/gdcm/trunk/debian/python-gdcm.install
   trunk/packages/gdcm/trunk/debian/rules
Log:
Update to new GDCM 2.0.9

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2008-09-28 22:21:06 UTC (rev 2548)
+++ trunk/packages/gdcm/trunk/debian/changelog	2008-09-29 04:25:07 UTC (rev 2549)
@@ -1,3 +1,15 @@
+gdcm (2.0.9-1) unstable; urgency=low
+
+  * New upstream release.
+    - debian/python-gdcm.install: 
+    - debian/libgdcm2-dev.install:
+    - debian/libgdcm-tools.install: Adapt to new upstream.
+  
+  * debian/rules: Set number of jobs based on "parallel=N" in
+    DEB_BUILD_OPTIONS, rather than hardcoding 4.
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 28 Sep 2008 23:23:46 -0500
+
 gdcm (2.0.6) experimental; urgency=low
 
   [ Mathieu Malaterre ]

Modified: trunk/packages/gdcm/trunk/debian/libgdcm-tools.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm-tools.install	2008-09-28 22:21:06 UTC (rev 2548)
+++ trunk/packages/gdcm/trunk/debian/libgdcm-tools.install	2008-09-29 04:25:07 UTC (rev 2549)
@@ -4,3 +4,4 @@
 usr/bin/gdcminfo*
 usr/bin/gdcmraw*
 usr/bin/gdcmscanner*
+usr/bin/gdcmtar*

Modified: trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install	2008-09-28 22:21:06 UTC (rev 2548)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install	2008-09-29 04:25:07 UTC (rev 2549)
@@ -2,4 +2,4 @@
 usr/lib/gdcm-2.*/*
 usr/include/gdcm-2.*/gdcm*
 usr/include/gdcm-2.*/zip*
-usr/include/gdcm-2.*/XML/*
+usr/share/gdcm-2.*/XML

Modified: trunk/packages/gdcm/trunk/debian/python-gdcm.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/python-gdcm.install	2008-09-28 22:21:06 UTC (rev 2548)
+++ trunk/packages/gdcm/trunk/debian/python-gdcm.install	2008-09-29 04:25:07 UTC (rev 2549)
@@ -1,3 +1,3 @@
-usr/lib/python*/site-packages/gdcm-2.*/gdcm.py
-usr/lib/python*/site-packages/gdcm-2.*/_gdcm.so
-usr/lib/python*/site-packages/gdcm.pth
+usr/lib/python/site-packages/gdcm.py
+usr/lib/python/site-packages/_gdcmswig.so
+usr/lib/python/site-packages/gdcmswig.py

Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules	2008-09-28 22:21:06 UTC (rev 2548)
+++ trunk/packages/gdcm/trunk/debian/rules	2008-09-29 04:25:07 UTC (rev 2549)
@@ -25,9 +25,13 @@
 else
 	CFLAGS += -O2
 endif
-
 export CFLAGS
 
+# set the number of build jobs
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+        JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+endif
+
 SRC	:= $(CURDIR)
 BUILD	:= $(CURDIR)/debian/build
 TARGET	:= $(CURDIR)/debian/tmp
@@ -65,7 +69,7 @@
 
 debian/build-python%-stamp: 
 	dh_testdir
-	$(MAKE) -j4 -C $(BUILD)-python$*
+	$(MAKE) $(JOBS) -C $(BUILD)-python$*
 	-(cd $(BUILD)-python$* && LD_LIBRARY_PATH=$(BUILD)-python$*/gdcm ctest --force-new-ctest-process -V)
 	touch $@
 
@@ -85,7 +89,7 @@
 	dh_installdirs
 
 install-python%:
-	$(MAKE) -j4 -C $(BUILD)-python$* install DESTDIR=$(TARGET)
+	$(MAKE) $(JOBS) -C $(BUILD)-python$* install DESTDIR=$(TARGET)
 
 # This single target is used to build all the packages, all at once, or
 # one at a time. So keep in mind: any options passed to commands here will