[med-svn] r5137 - in trunk/packages/gdcm/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2010-08-18 08:25:57 +0000 (Wed, 18 Aug 2010)
New Revision: 5137

Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/control
   trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install
   trunk/packages/gdcm/trunk/debian/patches/series
   trunk/packages/gdcm/trunk/debian/rules
Log:
update for 2.0.15

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2010-08-18 03:45:04 UTC (rev 5136)
+++ trunk/packages/gdcm/trunk/debian/changelog	2010-08-18 08:25:57 UTC (rev 5137)
@@ -1,3 +1,9 @@
+gdcm (2.0.15-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Fri, 09 Jul 2010 15:36:01 +0200
+
 gdcm (2.0.14-9) unstable; urgency=low
 
   * Completely remove findjni.cmake from GDCM. 

Modified: trunk/packages/gdcm/trunk/debian/control
===================================================================
--- trunk/packages/gdcm/trunk/debian/control	2010-08-18 03:45:04 UTC (rev 5136)
+++ trunk/packages/gdcm/trunk/debian/control	2010-08-18 08:25:57 UTC (rev 5137)
@@ -15,7 +15,7 @@
  libavcodec-dev, libavutil-dev, libavformat-dev, libswscale-dev, libgl2ps-dev,
  cli-common-dev (>= 0.5.7) [!alpha !mips !mipsel !m68k !hppa],
  mono-devel (>= 2.0) [!alpha !mips !mipsel !m68k !hppa]
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 XS-Python-Version: current
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gdcm/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/gdcm/trunk/
@@ -124,8 +124,7 @@
 Package: libvtkgdcm2-dev
 Section: libdevel
 Architecture: any
-Depends: libvtkgdcm2.0 (= ${binary:Version}), ${misc:Depends}
-Suggests: libgdcm2-dev
+Depends: libvtkgdcm2.0 (= ${binary:Version}), libgdcm2-dev, ${misc:Depends}
 Description: Grassroots DICOM VTK development libraries and headers
  Grassroots DiCoM is a C++ library for DICOM medical files. It is
  automatically wrapped to python/C#/Java (using swig). It supports

Modified: trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install	2010-08-18 03:45:04 UTC (rev 5136)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install	2010-08-18 08:25:57 UTC (rev 5137)
@@ -1,3 +1,2 @@
 usr/lib/vtkgdcm-sharp.dll        usr/lib/libvtkgdcm-cil
-usr/lib/vtkgdcm-sharp.dll.config usr/lib/libvtkgdcm-cil
 usr/lib/libvtkgdcmsharpglue.so   usr/lib/libvtkgdcm-cil

Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series	2010-08-18 03:45:04 UTC (rev 5136)
+++ trunk/packages/gdcm/trunk/debian/patches/series	2010-08-18 08:25:57 UTC (rev 5137)
@@ -1,4 +0,0 @@
-poppler_breaks_api.patch
-cmake28_namelink.patch
-libvtk-java_jni.patch
-embedded-libjpeg.patch

Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules	2010-08-18 03:45:04 UTC (rev 5136)
+++ trunk/packages/gdcm/trunk/debian/rules	2010-08-18 08:25:57 UTC (rev 5137)
@@ -12,7 +12,7 @@
 
 VER_MAJOR = 2
 VER_MINOR = 0
-VER_PATCH = 14
+VER_PATCH = 15
 
 VER_FULL = $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
 SOVERSION = $(VER_MAJOR).$(VER_MINOR)
@@ -21,7 +21,7 @@
 DEBIAN_SRC_DIR = gdcm-$(VER_FULL)
 DEBIAN_SRC_TAR = gdcm_$(VER_FULL).orig.tar.gz
 
-# Uncomment this to turn on verbose mode. 
+# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # This has to be exported to make some magic below work.
@@ -70,7 +70,7 @@
 PYVERS  := $(shell pyversions -vr)
 PYMODDIR := /usr/lib/$(shell pyversions -r)
 
-debian/configure-stamp: $(PYVERS:%=debian/configure-python%-stamp) 
+debian/configure-stamp: $(PYVERS:%=debian/configure-python%-stamp)
 	touch $@
 
 debian/configure-python%-stamp: $(QUILT_STAMPFN)
@@ -115,7 +115,7 @@
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f debian/configure*stamp debian/build*stamp 
+	rm -f debian/configure*stamp debian/build*stamp
 	rm -rf debian/build*
 	dh_clean
 
@@ -124,7 +124,6 @@
 install-common:
 	dh_testdir
 	dh_testroot
-	#dh_clean -k
 	dh_prep
 	dh_installdirs
 
@@ -134,9 +133,6 @@
 	# correct location of python-gdcm files
 	mv $(TARGET)/usr/lib/python $(TARGET)/$(PYMODDIR)
 
-	# bug #579642 CMake puts in too many depend libraries
-	sed -i -e 's at general;/usr/lib/libcrypto.so;@@' -e 's at general;/usr/lib/libssl.so;@@' $(TARGET)/usr/lib/gdcm-2.0/GDCMLibraryDepends.cmake
-
 # 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
 # affect _all_ packages. Anything you want to only affect one package
@@ -148,25 +144,15 @@
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu
-#	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installcatalogs
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
 	dh_installman
-#	dh_installcron
-#	dh_installinfo
 	dh_lintian
 	dh_install --sourcedir=$(TARGET) --fail-missing
 	dh_strip --dbg-package=libgdcm2.0-dbg
 	dh_link
 	dh_compress
 	dh_fixperms
-#	dh_perl
 	dh_pysupport
-#	dh_makeclilibs 
+#	dh_makeclilibs
 	dh_makeshlibs -Xformats -V
 	dh_installdeb
 	LD_LIBRARY_PATH="/usr/lib/jni$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH" dh_shlibdeps -v -a -l /usr/lib/jvm/default-java/lib
@@ -192,7 +178,7 @@
 
 get-orig-source: $(UPSTREAM_SRC).tar.gz
 	tar xzf $(UPSTREAM_SRC).tar.gz
-	GZIP=-9 tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
+	GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
 	rm -rf $(DEBIAN_SRC_DIR)
 
 binary: binary-indep binary-arch