[med-svn] r5721 - trunk/packages/dcmtk/trunk/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-01-28 09:42:50 +0000 (Fri, 28 Jan 2011)
New Revision: 5721

Modified:
   trunk/packages/dcmtk/trunk/debian/changelog
   trunk/packages/dcmtk/trunk/debian/control
   trunk/packages/dcmtk/trunk/debian/rules
Log:
Bump SONAME to version 2

Modified: trunk/packages/dcmtk/trunk/debian/changelog
===================================================================
--- trunk/packages/dcmtk/trunk/debian/changelog	2011-01-28 09:18:11 UTC (rev 5720)
+++ trunk/packages/dcmtk/trunk/debian/changelog	2011-01-28 09:42:50 UTC (rev 5721)
@@ -1,6 +1,7 @@
 dcmtk (3.6.0-1) experimental; urgency=low
 
   * New upstream: 3.6.0
+  * Update SONAME to 2.0.0 because of change in log4cplus::Logger::addAppender
   * Fix lintian errors on misc:Depends
   * Fix lintian errors on init.d script
   * Add a patch to link wth png/tiff libraries

Modified: trunk/packages/dcmtk/trunk/debian/control
===================================================================
--- trunk/packages/dcmtk/trunk/debian/control	2011-01-28 09:18:11 UTC (rev 5720)
+++ trunk/packages/dcmtk/trunk/debian/control	2011-01-28 09:42:50 UTC (rev 5721)
@@ -26,7 +26,7 @@
  .
  Note: This version was compiled with libssl support.
 
-Package: libdcmtk1
+Package: libdcmtk2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -43,10 +43,10 @@
  .
  Note: This version was compiled with libssl support.
 
-Package: libdcmtk1-dev
+Package: libdcmtk2-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libdcmtk1 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libdcmtk2 (= ${binary:Version})
 Conflicts: libdcmtk0-dev
 Replaces: libdcmtk0-dev
 Suggests: dcmtk-doc
@@ -80,7 +80,7 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: dcmtk, libdcmtk1-dev
+Suggests: dcmtk, libdcmtk2-dev
 Description: The OFFIS DICOM toolkit documentation
  DCMTK includes a collection of libraries and applications for examining, 
  constructing and converting DICOM image files, handling offline media, 

Modified: trunk/packages/dcmtk/trunk/debian/rules
===================================================================
--- trunk/packages/dcmtk/trunk/debian/rules	2011-01-28 09:18:11 UTC (rev 5720)
+++ trunk/packages/dcmtk/trunk/debian/rules	2011-01-28 09:42:50 UTC (rev 5721)
@@ -20,13 +20,13 @@
 # Package installation directories
 pkg=dcmtk
 PKGDIR_DCMTK=$(CURDIR)/debian/$(pkg)
-PKGDIR_DCMTK_LIB=$(CURDIR)/debian/libdcmtk1
-PKGDIR_DCMTK_DEV=$(CURDIR)/debian/libdcmtk1-dev
+PKGDIR_DCMTK_LIB=$(CURDIR)/debian/libdcmtk2
+PKGDIR_DCMTK_DEV=$(CURDIR)/debian/libdcmtk2-dev
 PKGDIR_DCMTK_DOC=$(CURDIR)/debian/$(pkg)-doc
 PKGDIR_DCMTK_WWW=$(CURDIR)/debian/$(pkg)-www
 
 # Library version
-LIB_VERSION=1.0.0
+LIB_VERSION=2.0.0
 
 CFLAGS = -Wall -g
 
@@ -86,7 +86,7 @@
 
 	mv config/Makefile.def config/Makefile.def.static && \
 	sed -e '/^CFLAGS =/s/-O/-fPIC -O2/' -e '/^CXXFLAGS =/s/-O/-fPIC -O2/' \
-	-e '/^AR =/s/ar/gcc/' -e '/^ARFLAGS =/s/cruv/-shared -Wl,-soname,\$$\@.1 -o/' \
+	-e '/^AR =/s/ar/gcc/' -e '/^ARFLAGS =/s/cruv/-shared -Wl,-soname,\$$\@.2 -o/' \
 	-e '/^LIBEXT =/s/a/so/' -e '/^RANLIB =/s/ranlib/:/' \
 	<config/Makefile.def.static >config/Makefile.def && \
 	$(MAKE) libsrc-all && \
@@ -155,10 +155,10 @@
 
 	# Fix filenames / add symlinks for shared libs
 	for i in $(PKGDIR_DCMTK_LIB)/usr/lib/*.so; do \
-		mv $$i $$i.1.0.0 && \
-		ln -sf `basename \$$i.1.0.0` \
+		mv $$i $$i.2.0.0 && \
+		ln -sf `basename \$$i.2.0.0` \
 			$(PKGDIR_DCMTK_DEV)/usr/lib/`basename $$i` && \
-		ln -sf `basename \$$i.1.0.0` $$i.1; \
+		ln -sf `basename \$$i.2.0.0` $$i.2; \
 	done
 	# cp -a debian/apache.conf $(PKGDIR_DCMTK_WWW)/etc/apache2/conf.d/$(pkg)
 
@@ -200,7 +200,7 @@
 	dh_perl -a
 	dh_makeshlibs -a -V
 	dh_installdeb -a
-	dh_shlibdeps -a -l debian/libdcmtk1/usr/lib
+	dh_shlibdeps -a -l debian/libdcmtk2/usr/lib
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a