[Pkg-tcltk-commits] r1628 - in itcl3/trunk/debian: . patches source
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sat Jul 5 13:21:27 UTC 2014
Author: sgolovan
Date: 2014-07-05 13:21:27 +0000 (Sat, 05 Jul 2014)
New Revision: 1628
Added:
itcl3/trunk/debian/itcl3-dev.install
itcl3/trunk/debian/itcl3-dev.links
itcl3/trunk/debian/itcl3-doc.install
itcl3/trunk/debian/itcl3.install
itcl3/trunk/debian/itcl3.lintian-overrides
itcl3/trunk/debian/source/
itcl3/trunk/debian/source/format
Removed:
itcl3/trunk/debian/README.source
itcl3/trunk/debian/itcl3-dev.files
itcl3/trunk/debian/itcl3-doc.files
itcl3/trunk/debian/itcl3.files
itcl3/trunk/debian/itcl3.lintian-override
itcl3/trunk/debian/patches/pkgindex.patch
Modified:
itcl3/trunk/debian/changelog
itcl3/trunk/debian/compat
itcl3/trunk/debian/control
itcl3/trunk/debian/patches/series
itcl3/trunk/debian/rules
Log:
[itcl3]
* 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 itcl3 to.
Deleted: itcl3/trunk/debian/README.source
===================================================================
--- itcl3/trunk/debian/README.source 2014-07-04 11:58:59 UTC (rev 1627)
+++ itcl3/trunk/debian/README.source 2014-07-05 13:21:27 UTC (rev 1628)
@@ -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: itcl3/trunk/debian/changelog
===================================================================
--- itcl3/trunk/debian/changelog 2014-07-04 11:58:59 UTC (rev 1627)
+++ itcl3/trunk/debian/changelog 2014-07-05 13:21:27 UTC (rev 1628)
@@ -1,8 +1,13 @@
-itcl3 (3.4.1-2) UNRELEASED; urgency=low
+itcl3 (3.4.1-2) 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 itcl3 to.
- -- Sergei Golovan <sgolovan at debian.org> Sat, 14 Apr 2012 10:56:21 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 05 Jul 2014 17:17:51 +0400
itcl3 (3.4.1-1) unstable; urgency=low
Modified: itcl3/trunk/debian/compat
===================================================================
--- itcl3/trunk/debian/compat 2014-07-04 11:58:59 UTC (rev 1627)
+++ itcl3/trunk/debian/compat 2014-07-05 13:21:27 UTC (rev 1628)
@@ -1 +1 @@
-5
+9
Modified: itcl3/trunk/debian/control
===================================================================
--- itcl3/trunk/debian/control 2014-07-04 11:58:59 UTC (rev 1627)
+++ itcl3/trunk/debian/control 2014-07-05 13:21:27 UTC (rev 1628)
@@ -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), tcl8.5-dev, quilt
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9.0.0), tcl8.5-dev
+Standards-Version: 3.9.5
Homepage: http://incrtcl.sourceforge.net/
Package: itcl3
Section: libs
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, tcl8.5, ${misc:Depends}
+Depends: libtcl, ${shlibs:Depends}, ${misc:Depends}
Suggests: itcl3-doc
Conflicts: insight (<= 5.3+cvs.2003.08.30-1)
+Multi-arch: same
Description: [incr Tcl] OOP extension for Tcl - run-time files
[incr Tcl] (or itcl) is a popular object-oriented extension for the
embeddable Tcl scripting language. The name is a play on C++, and
@@ -28,9 +29,10 @@
Section: devel
Priority: optional
Architecture: any
-Depends: tcl8.5-dev, itcl3 (= ${binary:Version}), ${misc:Depends}
+Depends: tcl-dev | tcl8.5-dev, itcl3 (= ${binary:Version}), ${misc:Depends}
Conflicts: itcl-dev
Suggests: itcl3-doc
+Multi-arch: same
Description: [incr Tcl] OOP extension for Tcl - development files
[incr Tcl] (or itcl) is a popular object-oriented extension for the
embeddable Tcl scripting language. The name is a play on C++, and
Deleted: itcl3/trunk/debian/itcl3-dev.files
===================================================================
--- itcl3/trunk/debian/itcl3-dev.files 2014-07-04 11:58:59 UTC (rev 1627)
+++ itcl3/trunk/debian/itcl3-dev.files 2014-07-05 13:21:27 UTC (rev 1628)
@@ -1,4 +0,0 @@
-usr/include/tcl*/itcl*
-usr/lib/libitcl*.a
-usr/lib/libitcl*.so
-usr/share/tcltk/itcl*/*.sh
Copied: itcl3/trunk/debian/itcl3-dev.install (from rev 1617, itcl3/trunk/debian/itcl3-dev.files)
===================================================================
--- itcl3/trunk/debian/itcl3-dev.install (rev 0)
+++ itcl3/trunk/debian/itcl3-dev.install 2014-07-05 13:21:27 UTC (rev 1628)
@@ -0,0 +1,4 @@
+usr/include/itcl*/*
+usr/lib/*/libitcl*.a
+usr/lib/*/libitcl*.so
+usr/lib/*/*.sh
Added: itcl3/trunk/debian/itcl3-dev.links
===================================================================
--- itcl3/trunk/debian/itcl3-dev.links (rev 0)
+++ itcl3/trunk/debian/itcl3-dev.links 2014-07-05 13:21:27 UTC (rev 1628)
@@ -0,0 +1 @@
+usr/share/doc/itcl3 usr/share/doc/itcl3-dev
Deleted: itcl3/trunk/debian/itcl3-doc.files
===================================================================
--- itcl3/trunk/debian/itcl3-doc.files 2014-07-04 11:58:59 UTC (rev 1627)
+++ itcl3/trunk/debian/itcl3-doc.files 2014-07-05 13:21:27 UTC (rev 1628)
@@ -1 +0,0 @@
-usr/share/man/man3/*.3itcl
Copied: itcl3/trunk/debian/itcl3-doc.install (from rev 1617, itcl3/trunk/debian/itcl3-doc.files)
===================================================================
--- itcl3/trunk/debian/itcl3-doc.install (rev 0)
+++ itcl3/trunk/debian/itcl3-doc.install 2014-07-05 13:21:27 UTC (rev 1628)
@@ -0,0 +1 @@
+usr/share/man/man3/*.3itcl
Deleted: itcl3/trunk/debian/itcl3.files
===================================================================
--- itcl3/trunk/debian/itcl3.files 2014-07-04 11:58:59 UTC (rev 1627)
+++ itcl3/trunk/debian/itcl3.files 2014-07-05 13:21:27 UTC (rev 1628)
@@ -1,2 +0,0 @@
-usr/share/tcltk/itcl*/*
-usr/lib/libitcl*.so.*
Copied: itcl3/trunk/debian/itcl3.install (from rev 1617, itcl3/trunk/debian/itcl3.files)
===================================================================
--- itcl3/trunk/debian/itcl3.install (rev 0)
+++ itcl3/trunk/debian/itcl3.install 2014-07-05 13:21:27 UTC (rev 1628)
@@ -0,0 +1,3 @@
+usr/lib/tcltk/*/*
+usr/lib/*/libitcl*.so.*
+usr/share/tcltk/*/*
Deleted: itcl3/trunk/debian/itcl3.lintian-override
===================================================================
--- itcl3/trunk/debian/itcl3.lintian-override 2014-07-04 11:58:59 UTC (rev 1627)
+++ itcl3/trunk/debian/itcl3.lintian-override 2014-07-05 13:21:27 UTC (rev 1628)
@@ -1 +0,0 @@
-itcl3: package-name-doesnt-match-sonames
Copied: itcl3/trunk/debian/itcl3.lintian-overrides (from rev 1617, itcl3/trunk/debian/itcl3.lintian-override)
===================================================================
--- itcl3/trunk/debian/itcl3.lintian-overrides (rev 0)
+++ itcl3/trunk/debian/itcl3.lintian-overrides 2014-07-05 13:21:27 UTC (rev 1628)
@@ -0,0 +1 @@
+itcl3: package-name-doesnt-match-sonames
Deleted: itcl3/trunk/debian/patches/pkgindex.patch
===================================================================
--- itcl3/trunk/debian/patches/pkgindex.patch 2014-07-04 11:58:59 UTC (rev 1627)
+++ itcl3/trunk/debian/patches/pkgindex.patch 2014-07-05 13:21:27 UTC (rev 1628)
@@ -1,8 +0,0 @@
---- itcl3-3.4.1.orig/pkgIndex.tcl.in
-+++ itcl3-3.4.1/pkgIndex.tcl.in
-@@ -1,4 +1,4 @@
- # Tcl package index file, version 1.0
-
- if {![package vsatisfies [package present Tcl] @TCL_VERSION@]} {return}
--package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] Itcl]
-+package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join /usr lib "@PKG_LIB_FILE at .1"] Itcl]
Modified: itcl3/trunk/debian/patches/series
===================================================================
--- itcl3/trunk/debian/patches/series 2014-07-04 11:58:59 UTC (rev 1627)
+++ itcl3/trunk/debian/patches/series 2014-07-05 13:21:27 UTC (rev 1628)
@@ -1,2 +1 @@
-pkgindex.patch
non-linux.patch
Modified: itcl3/trunk/debian/rules
===================================================================
--- itcl3/trunk/debian/rules 2014-07-04 11:58:59 UTC (rev 1627)
+++ itcl3/trunk/debian/rules 2014-07-05 13:21:27 UTC (rev 1628)
@@ -1,155 +1,87 @@
#!/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
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/architecture.mk
-unpatch:
- dh_testdir
- quilt pop -a || test $$? = 2
- rm -rf patch-stamp .pc
+%:
+ dh $@
-patch: patch-stamp
-patch-stamp:
- dh_testdir
- quilt push -a || test $$? = 2
- touch patch-stamp
-
-build-arch: build-stamp
-build-indep: build-stamp
-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-tcl=/usr/lib/tcl$(tclv)
+ --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl8.5
+
+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 itclConfig.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 itcl libraries.
- mv $(dtmp)/usr/lib/itcl*/libitcl$(v).so $(dtmp)/usr/lib/libitcl$(v).so.1
- mv $(dtmp)/usr/lib/itcl*/*.a $(dtmp)/usr/lib/
- ln -sf libitcl$(v).so.1 $(dtmp)/usr/lib/libitcl$(v).so
+ mv $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/itcl*/libitcl$(v).so $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/libitcl$(v).so.1
+ mv $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/itcl*/*.a $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)
+ ln -sf libitcl$(v).so.1 $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/libitcl$(v).so
# (itclConfig.sh doesn't get installed at all, so we install it here)
- sed -e "s:^\(\(ITCL\|itcl\)_\(BUILD_\)\?LIB_SPEC\)=.*$$:\1='-L/usr/lib -litcl$(v)':" \
- -e "s:^\(\(ITCL\|itcl\)_\(BUILD_\)\?STUB_LIB_SPEC\)=.*$$:\1='-L/usr/lib -litclstub$(v)':" \
- -e "s:^\(\(ITCL\|itcl\)_\(BUILD_\)\?STUB_LIB_PATH\)=.*$$:\1=/usr/lib/libitclstub$(v).a:" \
- -e "s:^\(\(ITCL\|itcl\)_SRC_DIR\)=.*$$:\1='/usr/include/tcl$(tclv)/itcl-private':" \
+ sed -e "s:^\(\(ITCL\|itcl\)_\(BUILD_\)\?LIB_SPEC\)=.*$$:\1='-L/usr/lib/$(DEB_HOST_MULTIARCH) -litcl$(v)':" \
+ -e "s:^\(\(ITCL\|itcl\)_\(BUILD_\)\?STUB_LIB_SPEC\)=.*$$:\1='-L/usr/lib/$(DEB_HOST_MULTIARCH) -litclstub$(v)':" \
+ -e "s:^\(\(ITCL\|itcl\)_\(BUILD_\)\?STUB_LIB_PATH\)=.*$$:\1=/usr/lib/$(DEB_HOST_MULTIARCH)/libitclstub$(v).a:" \
+ -e "s:^\(\(ITCL\|itcl\)_SRC_DIR\)=.*$$:\1='/usr/include/itcl$(vmajor)/itcl-private':" \
-e "s:^\(\(ITCL\|itcl\)_LIB_FILE\)=.*$$:\1=libitcl$(v).so.1:" \
-e "s:^\(\(ITCL\|itcl\)_STUB_LIB_FILE\)=.*$$:\1=libitclstub$(v).a:" \
-e "s:^\(\(ITCL\|itcl\)_VERSION\)=.*$$:\1='$(v)':" \
- itclConfig.sh > $(dtmp)/usr/lib/itcl$(v)/itclConfig.sh
+ itclConfig.sh > $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/itclConfig.sh
#
- # Move the Tcl library to /usr/share/tcltk
- install -d -m 755 $(dtmp)/usr/share/tcltk
- mv $(dtmp)/usr/lib/itcl$(v) $(dtmp)/usr/share/tcltk/
+ # Move the Tcl library to /usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
+ install -d -m 755 $(dtmp)/usr/share/tcltk/itcl$(v)
+ mv $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/itcl$(v)/itcl.tcl $(dtmp)/usr/share/tcltk/itcl$(v)
+ install -d -m 755 $(dtmp)/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
+ mv $(dtmp)/usr/lib/$(DEB_HOST_MULTIARCH)/itcl$(v) $(dtmp)/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
#
+ # Fix up the pkgIndex.tcl
+ sed -i -e's/\$$dir/\/usr lib $(DEB_HOST_MULTIARCH)/' \
+ $(dtmp)/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/itcl$(v)/pkgIndex.tcl
+ #
# Fix up the include files.
- install -d $(dtmp)/usr/include/tcl$(tclv)/itcl-private/generic
- cp generic/*.h $(dtmp)/usr/include/tcl$(tclv)/itcl-private/generic
+ install -d $(dtmp)/usr/include/itcl$(vmajor)/itcl-private/generic
+ cp generic/*.h $(dtmp)/usr/include/itcl$(vmajor)/itcl-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 3itcl /' $$i ; \
+ sed -i -e's/^\.TH \([^ ]\+\) n /.TH \1 3itcl /' $$i ; \
mv $$i `echo $$i | sed -e 's/\.n/\.3itcl/'` ; \
done
- #
- dh_movefiles -pitcl3-dev
- dh_movefiles -Nitcl3-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
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
+override_dh_link:
+ rm -r debian/itcl3-dev/usr/share/doc/itcl3-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/itcl3.lintian-override \
- debian/itcl3/usr/share/lintian/overrides/itcl3
- dh_installchangelogs -a
- #
- # hack up the /usr/doc links for dependent packages
- rm -rf debian/itcl3-dev/usr/share/doc/itcl3-dev
- ln -sf itcl3 debian/itcl3-dev/usr/share/doc/itcl3-dev
- #
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
+override_dh_makeshlibs:
dh_makeshlibs -a -V 'itcl3 (>= $(v)~), itcl3 (<< $(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
+get-orig-source:
+ wget -O itcl3_3.4.1.orig.tar.gz \
+ http://prdownloads.sourceforge.net/incrtcl/itcl3.4.1.tar.gz
-binary: binary-indep binary-arch
-.PHONY: patch unpatch build build-arch build-indep 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: itcl3/trunk/debian/source/format
===================================================================
--- itcl3/trunk/debian/source/format (rev 0)
+++ itcl3/trunk/debian/source/format 2014-07-05 13:21:27 UTC (rev 1628)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-tcltk-commits
mailing list