[Pkg-tcltk-commits] r1632 - in itk3/trunk/debian: . patches source

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Sat Jul 5 14:37:22 UTC 2014 

Author: sgolovan
Date: 2014-07-05 14:37:22 +0000 (Sat, 05 Jul 2014)
New Revision: 1632

Added:
   itk3/trunk/debian/itk3-dev.install
   itk3/trunk/debian/itk3-dev.links
   itk3/trunk/debian/itk3-doc.install
   itk3/trunk/debian/itk3.install
   itk3/trunk/debian/itk3.lintian-overrides
   itk3/trunk/debian/source/
   itk3/trunk/debian/source/format
Removed:
   itk3/trunk/debian/README.source
   itk3/trunk/debian/itk3-dev.files
   itk3/trunk/debian/itk3-doc.files
   itk3/trunk/debian/itk3.files
   itk3/trunk/debian/itk3.lintian-override
   itk3/trunk/debian/patches/pkgindex.patch
Modified:
   itk3/trunk/debian/changelog
   itk3/trunk/debian/compat
   itk3/trunk/debian/control
   itk3/trunk/debian/patches/series
   itk3/trunk/debian/rules
Log:
[itk3]
  * Switched to the 3.0 (quilt) source package format.
  * Bumped the debhelper compatibility version to 9.
  * Added multi-arch support.
  * Bumped standards-version to 3.9.5.
  * Replaced tcl8.5 by libtcl in dependencies list. This means that both
    libtcl8.5 and libtcl8.6 can be used to link itk3 to.


Deleted: itk3/trunk/debian/README.source
===================================================================
--- itk3/trunk/debian/README.source	2014-07-05 13:35:03 UTC (rev 1631)
+++ itk3/trunk/debian/README.source	2014-07-05 14:37:22 UTC (rev 1632)
@@ -1,8 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get detailed instructions on how to apply the series of patches
-and modify them, please read /usr/share/doc/quilt/README.source
-
- -- Sergei Golovan <sgolovan at debian.org>  Wed, 02 Sep 2009 17:32:39 +0400

Modified: itk3/trunk/debian/changelog
===================================================================
--- itk3/trunk/debian/changelog	2014-07-05 13:35:03 UTC (rev 1631)
+++ itk3/trunk/debian/changelog	2014-07-05 14:37:22 UTC (rev 1632)
@@ -1,8 +1,13 @@
-itk3 (3.3-5) UNRELEASED; urgency=low
+itk3 (3.3-5) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Switched to the 3.0 (quilt) source package format.
+  * Bumped the debhelper compatibility version to 9.
+  * Added multi-arch support.
+  * Bumped standards-version to 3.9.5.
+  * Replaced tcl8.5 by libtcl in dependencies list. This means that both
+    libtcl8.5 and libtcl8.6 can be used to link itk3 to.
 
- -- Sergei Golovan <sgolovan at debian.org>  Wed, 30 May 2012 07:45:18 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 05 Jul 2014 18:37:03 +0400
 
 itk3 (3.3-4) unstable; urgency=low
 

Modified: itk3/trunk/debian/compat
===================================================================
--- itk3/trunk/debian/compat	2014-07-05 13:35:03 UTC (rev 1631)
+++ itk3/trunk/debian/compat	2014-07-05 14:37:22 UTC (rev 1632)
@@ -1 +1 @@
-5
+9

Modified: itk3/trunk/debian/control
===================================================================
--- itk3/trunk/debian/control	2014-07-05 13:35:03 UTC (rev 1631)
+++ itk3/trunk/debian/control	2014-07-05 14:37:22 UTC (rev 1632)
@@ -3,17 +3,18 @@
 Priority: optional
 Maintainer: Debian Tcl/Tk Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 5.0.0), libxt-dev, itcl3-dev (>> 3.3), tk8.5-dev, quilt
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9.0.0), libxt-dev, itcl3-dev (>> 3.4.1-1), tk8.5-dev
+Standards-Version: 3.9.5
 Homepage: http://incrtcl.sourceforge.net/
 
 Package: itk3
 Section: libs
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, tk8.5, itcl3, ${misc:Depends}
+Depends: ${shlibs:Depends}, libtk, itcl3, ${misc:Depends}
 Suggests: itk3-doc
 Conflicts: insight (<= 5.3+cvs.2003.08.30-1)
+Multi-Arch: same
 Description: [incr Tk] OOP extension for Tk - run-time files
  [incr Tk] (or itk) combines the object-oriented power of [incr Tcl]
  with the popular Tk graphical toolkit to create a framework for
@@ -27,9 +28,10 @@
 Section: devel
 Priority: optional
 Architecture: any
-Depends: itcl3-dev, tk8.5-dev, itk3 (= ${binary:Version}), ${misc:Depends}
+Depends: itcl3-dev, tk-dev | tk8.5-dev, itk3 (= ${binary:Version}), ${misc:Depends}
 Conflicts: itk-dev, itcl3.0-dev (<< 3.0.1)
 Suggests: itk3-doc
+Multi-Arch: same
 Description: [incr Tk] OOP extension for Tk - development files
  [incr Tk] (or itk) combines the object-oriented power of [incr Tcl]
  with the popular Tk graphical toolkit to create a framework for

Deleted: itk3/trunk/debian/itk3-dev.files
===================================================================
--- itk3/trunk/debian/itk3-dev.files	2014-07-05 13:35:03 UTC (rev 1631)
+++ itk3/trunk/debian/itk3-dev.files	2014-07-05 14:37:22 UTC (rev 1632)
@@ -1,4 +0,0 @@
-usr/include/tcl*/itk*
-usr/lib/libitk*.a
-usr/lib/libitk*.so
-usr/share/tcltk/itk*/*.sh

Copied: itk3/trunk/debian/itk3-dev.install (from rev 1261, itk3/trunk/debian/itk3-dev.files)
===================================================================
--- itk3/trunk/debian/itk3-dev.install	                        (rev 0)
+++ itk3/trunk/debian/itk3-dev.install	2014-07-05 14:37:22 UTC (rev 1632)
@@ -0,0 +1,4 @@
+usr/include/itcl*/*
+usr/lib/*/libitk*.a
+usr/lib/*/libitk*.so
+usr/lib/*/*.sh

Added: itk3/trunk/debian/itk3-dev.links
===================================================================
--- itk3/trunk/debian/itk3-dev.links	                        (rev 0)
+++ itk3/trunk/debian/itk3-dev.links	2014-07-05 14:37:22 UTC (rev 1632)
@@ -0,0 +1 @@
+usr/share/doc/itk3 usr/share/doc/itk3-dev

Deleted: itk3/trunk/debian/itk3-doc.files
===================================================================
--- itk3/trunk/debian/itk3-doc.files	2014-07-05 13:35:03 UTC (rev 1631)
+++ itk3/trunk/debian/itk3-doc.files	2014-07-05 14:37:22 UTC (rev 1632)
@@ -1 +0,0 @@
-usr/share/man/man3/*.3itk

Copied: itk3/trunk/debian/itk3-doc.install (from rev 1261, itk3/trunk/debian/itk3-doc.files)
===================================================================
--- itk3/trunk/debian/itk3-doc.install	                        (rev 0)
+++ itk3/trunk/debian/itk3-doc.install	2014-07-05 14:37:22 UTC (rev 1632)
@@ -0,0 +1 @@
+usr/share/man/man3/*.3itk

Deleted: itk3/trunk/debian/itk3.files
===================================================================
--- itk3/trunk/debian/itk3.files	2014-07-05 13:35:03 UTC (rev 1631)
+++ itk3/trunk/debian/itk3.files	2014-07-05 14:37:22 UTC (rev 1632)
@@ -1,2 +0,0 @@
-usr/share/tcltk/itk*/*
-usr/lib/libitk*.so.*

Copied: itk3/trunk/debian/itk3.install (from rev 1261, itk3/trunk/debian/itk3.files)
===================================================================
--- itk3/trunk/debian/itk3.install	                        (rev 0)
+++ itk3/trunk/debian/itk3.install	2014-07-05 14:37:22 UTC (rev 1632)
@@ -0,0 +1,3 @@
+usr/lib/tcltk/*/*
+usr/lib/*/libitk*.so.*
+usr/share/tcltk/*/*

Deleted: itk3/trunk/debian/itk3.lintian-override
===================================================================
--- itk3/trunk/debian/itk3.lintian-override	2014-07-05 13:35:03 UTC (rev 1631)
+++ itk3/trunk/debian/itk3.lintian-override	2014-07-05 14:37:22 UTC (rev 1632)
@@ -1 +0,0 @@
-itk3: package-name-doesnt-match-sonames

Copied: itk3/trunk/debian/itk3.lintian-overrides (from rev 1261, itk3/trunk/debian/itk3.lintian-override)
===================================================================
--- itk3/trunk/debian/itk3.lintian-overrides	                        (rev 0)
+++ itk3/trunk/debian/itk3.lintian-overrides	2014-07-05 14:37:22 UTC (rev 1632)
@@ -0,0 +1 @@
+itk3: package-name-doesnt-match-sonames

Deleted: itk3/trunk/debian/patches/pkgindex.patch
===================================================================
--- itk3/trunk/debian/patches/pkgindex.patch	2014-07-05 13:35:03 UTC (rev 1631)
+++ itk3/trunk/debian/patches/pkgindex.patch	2014-07-05 14:37:22 UTC (rev 1632)
@@ -1,7 +0,0 @@
---- itk3-3.3.orig/pkgIndex.tcl.in
-+++ itk3-3.3/pkgIndex.tcl.in
-@@ -1,3 +1,3 @@
- # Tcl package index file, version 1.0
- 
--package ifneeded Itk @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] Itk]
-+package ifneeded Itk @PACKAGE_VERSION@ [list load [file join /usr lib "@PKG_LIB_FILE at .1"] Itk]

Modified: itk3/trunk/debian/patches/series
===================================================================
--- itk3/trunk/debian/patches/series	2014-07-05 13:35:03 UTC (rev 1631)
+++ itk3/trunk/debian/patches/series	2014-07-05 14:37:22 UTC (rev 1632)
@@ -1,3 +1,2 @@
-pkgindex.patch
 stubs.patch
 non-linux.patch

Modified: itk3/trunk/debian/rules
===================================================================
--- itk3/trunk/debian/rules	2014-07-05 13:35:03 UTC (rev 1631)
+++ itk3/trunk/debian/rules	2014-07-05 14:37:22 UTC (rev 1632)
@@ -1,156 +1,93 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export QUILT_PATCHES := debian/patches
-
 vmajor=$(shell dpkg-parsechangelog | grep ^Version: | sed 's/[^0-9]*\([0-9]*\).*/\1/')
 vminor=$(shell dpkg-parsechangelog | grep ^Version: | sed 's/[^0-9]*[0-9]*\.\([0-9]*\).*/\1/')
-vrelease=$(shell dpkg-parsechangelog | grep ^Version: | sed 's/[^0-9]*[0-9]*\.[0-9]*\.\([0-9]*\).*/\1/')
 v=$(vmajor).$(vminor)
 v1=$(vmajor).$(shell expr $(vminor) + 1)
 dtmp=$(shell pwd)/debian/tmp
 
 tclv=8.5
 
-unpatch:
-	dh_testdir
-	quilt pop -a || test $$? = 2
-	rm -rf patch-stamp .pc
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/architecture.mk
 
-patch: patch-stamp
-patch-stamp:
-	dh_testdir
-	quilt push -a || test $$? = 2
-	touch patch-stamp
+%:
+	dh $@
 
-build: build-stamp
-build-stamp: patch-stamp
-	dh_testdir
-	#
-	sh ./configure --prefix=/usr \
-		       --includedir=/usr/include/tcl$(tclv) \
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		       --includedir=/usr/include/itcl$(vmajor) \
 		       --enable-shared \
 		       --enable-threads \
-		       --with-itcl=$$(ls -d /usr/share/tcltk/itcl*) \
-		       --with-tcl=/usr/lib/tcl$(tclv) \
-		       --with-tk=/usr/lib/tk$(tclv)
+		       --with-itcl=/usr/lib/$(DEB_HOST_MULTIARCH) \
+		       --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(tclv) \
+		       --with-tk=/usr/lib/$(DEB_HOST_MULTIARCH)/tk$(tclv)
+
+override_dh_auto_build:
 	$(MAKE) LIBS="-Wl,-soname,\$$@.1"
-	#
-	touch build-stamp
 
-clean: clean-patched unpatch
-	dh_testdir
-	dh_testroot
-	dh_clean
-
-clean-patched: patch-stamp
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp install-stamp
-	#
+ovarride_dh_clean:
 	[ ! -f Makefile ] || $(MAKE) clean
 	[ ! -f Makefile ] || $(MAKE) distclean
 	#
 	rm -f itkConfig.sh pkgIndex.tcl
 
-install: install-stamp
-install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	#
-	mkdir -p debian/tmp
+override_dh_auto_install:
 	$(MAKE) prefix=$(dtmp)/usr \
 		exec_prefix=$(dtmp)/usr \
-		includedir=$(dtmp)/usr/include/tcl$(tclv) \
+		includedir=$(dtmp)/usr/include/itcl$(vmajor) \
 		install
 	#
 	# Fix up the itk libraries.
-	mv $(dtmp)/usr/lib/itk*/libitk$(v).so $(dtmp)/usr/lib/libitk$(v).so.1
-	mv $(dtmp)/usr/lib/itk*/*.a $(dtmp)/usr/lib
-	ln -sf libitk$(v).so.1 $(dtmp)/usr/lib/libitk$(v).so
+	mv $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/itk*/libitk$(v).so $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/libitk$(v).so.1
+	mv $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/itk*/*.a $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)
+	ln -sf libitk$(v).so.1 $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/libitk$(v).so
 	#  (itkConfig.sh doesn't get installed at all, so we install it here)
-	sed -e "s:^\(ITK_\(BUILD_\)\?LIB_SPEC\)=.*$$:\1='-L/usr/lib -litk$(v)':" \
-	    -e "s:^\(ITK_\(BUILD_\)\?STUB_LIB_SPEC\)=.*$$:\1='-L/usr/lib -litkstub$(v)':" \
-	    -e "s:^\(ITK_SRC_DIR\)=.*$$:\1='/usr/include/tcl$(tclv)/itk-private':" \
+	sed -e "s:^\(ITK_\(BUILD_\)\?LIB_SPEC\)=.*$$:\1='-L/usr/lib/$(DEB_HOST_MULTIARCH) -litk$(v)':" \
+	    -e "s:^\(ITK_\(BUILD_\)\?STUB_LIB_SPEC\)=.*$$:\1='-L/usr/lib/$(DEB_HOST_MULTIARCH) -litkstub$(v)':" \
+	    -e "s:^\(ITK_SRC_DIR\)=.*$$:\1='/usr/include/itcl$(vmajor)/itk-private':" \
 	    -e "s:^\(ITK_LIB_FILE\)=.*$$:\1=libitk$(v).so.1:" \
 	    -e "s:^\(ITK_STUB_LIB_FILE\)=.*$$:\1=libitkstub$(v).a:" \
 	    -e "s:^\(ITCL_VERSION\)=.*$$:\1='$(v)':" \
 	    -e "s:^\(ITCL_MAJOR_VERSION\)=.*$$:\1='$(vmajor)':" \
 	    -e "s:^\(ITCL_MINOR_VERSION\)=.*$$:\1='$(vminor)':" \
-	    itkConfig.sh > $(dtmp)/usr/lib/itk$(v)/itkConfig.sh
+	    itkConfig.sh > $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/itkConfig.sh
 	#
-	# Move the Tcl library to /usr/share/tcltk
-	install -d -m 755 $(dtmp)/usr/share/tcltk
-	mv $(dtmp)/usr/lib/itk$(v) $(dtmp)/usr/share/tcltk/
+	# Move the Tcl library to /usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
+	install -d -m 755 $(dtmp)/usr/share/tcltk/itk$(v)
+	mv $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/itk$(v)/tclIndex $(dtmp)/usr/share/tcltk/itk$(v)
+	mv $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/itk$(v)/*.itk $(dtmp)/usr/share/tcltk/itk$(v)
+	mv $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/itk$(v)/itk.tcl $(dtmp)/usr/share/tcltk/itk$(v)
+	install -d -m 755 $(dtmp)/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
+	mv $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/itk$(v) $(dtmp)/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
 	#
+	# Fix up the pkgIndex.tcl
+	sed -i -e's/\.so/.so.1/' -e's/\$$dir/\/usr lib $(DEB_HOST_MULTIARCH)/' \
+	    $(dtmp)/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/itk$(v)/pkgIndex.tcl
+	#
 	# Fix up the include files.
-	install -d $(dtmp)/usr/include/tcl$(tclv)/itk-private/generic
-	cp generic/*.h $(dtmp)/usr/include/tcl$(tclv)/itk-private/generic
+	install -d $(dtmp)/usr/include/itcl$(vmajor)/itk-private/generic
+	cp generic/*.h $(dtmp)/usr/include/itcl$(vmajor)/itk-private/generic
 	#
 	# Fix up the manpages.
-	# - just remove the installed ones, they're all mixed together
-	rm -r $(dtmp)/usr/man
-	mkdir -p $(dtmp)/usr/share/man/man3
+	mv $(dtmp)/usr/share/man/mann $(dtmp)/usr/share/man/man3
 	#
-	cp doc/*.n $(dtmp)/usr/share/man/man3
 	cd $(dtmp)/usr/share/man/man3 && \
 	  for i in *.n ; do \
-	    sed -i -e'/^\.so man\.macros/d' \
-		   -e'/^\.BS/d' \
-		   -e'/^\.BE/d' \
-		   -e'/^\.CS/d' \
-		   -e'/^\.CE/d' \
-	    	   -e's/^\.TH \([^ ]\+\) n /.TH \1 3itk /' $$i ; \
+	    sed -i -e's/^\.TH \([^ ]\+\) n /.TH \1 3itk /' $$i ; \
 	    mv $$i `echo $$i | sed -e 's/\.n/\.3itk/'` ; \
           done
-	#
-	dh_movefiles -pitk3-dev
-	dh_movefiles -Nitk3-dev
-	#
-	touch install-stamp
 
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i
-	dh_installchangelogs -i ChangeLog
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+override_dh_link:
+	rm -r debian/itk3-dev/usr/share/doc/itk3-dev
+	dh_link
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdocs -a
-	install -D -m 644 debian/itk3.lintian-override \
-		  debian/itk3/usr/share/lintian/overrides/itk3
-	dh_installchangelogs -a ChangeLog
-	#
-	# hack up the /usr/doc links for dependent packages
-	rm -rf debian/itk3-dev/usr/share/doc/itk3-dev
-	ln -sf itk3 debian/itk3-dev/usr/share/doc/itk3-dev
-	#
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
+override_dh_makeshlibs:
 	dh_makeshlibs -a -V 'itk3 (>= $(v)~), itk3 (<< $(v1)~)'
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
 
 source diff:
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
-binary: binary-indep binary-arch
-.PHONY: patch unpatch build clean clean-patched binary-indep binary-arch binary install
+.PHONY: override_dh_auto_configure override_dh_auto_build override_dh_clean \
+	override_dh_auto_install override_dh_makeshlibs override_dh_link get-orig-source

Added: itk3/trunk/debian/source/format
===================================================================
--- itk3/trunk/debian/source/format	                        (rev 0)
+++ itk3/trunk/debian/source/format	2014-07-05 14:37:22 UTC (rev 1632)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the Pkg-tcltk-commits mailing list