[Pkg-tcltk-commits] r469 - in itcl3/trunk: debian itcl itk
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Fri Feb 1 16:25:24 UTC 2008
Author: sgolovan-guest
Date: 2008-02-01 16:25:24 +0000 (Fri, 01 Feb 2008)
New Revision: 469
Modified:
itcl3/trunk/debian/changelog
itcl3/trunk/debian/compat
itcl3/trunk/debian/control
itcl3/trunk/debian/itcl3-dev.files
itcl3/trunk/debian/itcl3.files
itcl3/trunk/debian/itk3-dev.files
itcl3/trunk/debian/itk3.files
itcl3/trunk/debian/rules
itcl3/trunk/itcl/pkgIndex.tcl.in
itcl3/trunk/itk/pkgIndex.tcl.in
Log:
[itcl3]
* New maintainer Debian Tcl/Tk Packagers
<pkg-tcltk-devel at lists.alioth.debian.org>.
* Acknowledged NMU by Amaya Rodrigo Sastre.
* Added homepage header to debian/control.
* Removed non-UTF-8 characters from the package descriptions
(closes: #242690).
* Build the package using the default Tcl/Tk version.
* Bumped standards version to 3.7.3.
* Bumped debhelper compatibility level to 5.
* Replaced deprecated Source-Version substitution variable by
binary:Version in debian/control.
* Moved itcl3, itk3 package files to a subdirectory of /usr/share/tcltk
directory to meke the package compliant to Debian Tcl/Tk policy.
* Changed itcl3-doc and itk3-doc packages section to doc.
* Fixed call to make clean and make distclean in clean target of
debian/rules.
* Fixed clean after the package build (closes: #424422).
* Added missing string substitutions in itclConfig.sh and itkConfig.sh
(closes: #244597).
Modified: itcl3/trunk/debian/changelog
===================================================================
--- itcl3/trunk/debian/changelog 2008-01-30 20:20:55 UTC (rev 468)
+++ itcl3/trunk/debian/changelog 2008-02-01 16:25:24 UTC (rev 469)
@@ -1,8 +1,26 @@
-itcl3 (3.2.1-3.2) UNRELEASED; urgency=low
+itcl3 (3.2.1-4) unstable; urgency=low
- * NOT RELEASED YET
+ * New maintainer Debian Tcl/Tk Packagers
+ <pkg-tcltk-devel at lists.alioth.debian.org>.
+ * Acknowledged NMU by Amaya Rodrigo Sastre.
+ * Added homepage header to debian/control.
+ * Removed non-UTF-8 characters from the package descriptions
+ (closes: #242690).
+ * Build the package using the default Tcl/Tk version.
+ * Bumped standards version to 3.7.3.
+ * Bumped debhelper compatibility level to 5.
+ * Replaced deprecated Source-Version substitution variable by
+ binary:Version in debian/control.
+ * Moved itcl3, itk3 package files to a subdirectory of /usr/share/tcltk
+ directory to meke the package compliant to Debian Tcl/Tk policy.
+ * Changed itcl3-doc and itk3-doc packages section to doc.
+ * Fixed call to make clean and make distclean in clean target of
+ debian/rules.
+ * Fixed clean after the package build (closes: #424422).
+ * Added missing string substitutions in itclConfig.sh and itkConfig.sh
+ (closes: #244597).
- -- Sergei Golovan <sgolovan at debian.org> Fri, 18 Jan 2008 16:18:31 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 01 Feb 2008 19:06:33 +0300
itcl3 (3.2.1-3.1) unstable; urgency=low
Modified: itcl3/trunk/debian/compat
===================================================================
--- itcl3/trunk/debian/compat 2008-01-30 20:20:55 UTC (rev 468)
+++ itcl3/trunk/debian/compat 2008-02-01 16:25:24 UTC (rev 469)
@@ -1 +1 @@
-4
+5
Modified: itcl3/trunk/debian/control
===================================================================
--- itcl3/trunk/debian/control 2008-01-30 20:20:55 UTC (rev 468)
+++ itcl3/trunk/debian/control 2008-02-01 16:25:24 UTC (rev 469)
@@ -1,9 +1,11 @@
Source: itcl3
Section: libs
Priority: optional
-Maintainer: Chris Waters <xtifr at debian.org>
-Build-Depends: debhelper (>= 4), libxt-dev, tcl8.4-dev, tk8.4-dev
-Standards-Version: 3.6.0
+Maintainer: Debian Tcl/Tk Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
+Uploaders: Chris Waters <xtifr at debian.org>, Sergei Golovan <sgolovan at debian.org>
+Build-Depends: debhelper (>= 5.0.0), libxt-dev, tcl8.4-dev, tk8.4-dev
+Standards-Version: 3.7.3
+Homepage: http://incrtcl.sourceforge.net/
Package: itcl3
Section: libs
@@ -13,7 +15,7 @@
Suggests: itcl3-doc
Conflicts: insight (<= 5.3+cvs.2003.08.30-1)
Description: [incr Tcl] OOP extension for Tcl - run-time files
- [incr Tcl] (or itcl) is a popular object-oriented extension for the
+ [incr Tcl] (or itcl) is a popular object-oriented extension for the
embeddable Tcl scripting language. The name is a play on C++, and
itcl has a similar object model, including multiple inheritance and
public and private classes and variables. Unlike most OOP extensions
@@ -21,18 +23,16 @@
.
This package contains everything you need to run itcl scripts and
itcl-enabled apps.
- .
- Homepage: http://incrtcl.sourceforge.net/
Package: itcl3-dev
Section: devel
Priority: optional
Architecture: any
-Depends: libc6-dev, tcl8.4-dev, itcl3 (= ${Source-Version})
+Depends: libc6-dev, tcl8.4-dev, itcl3 (= ${binary:Version})
Conflicts: itcl-dev
Recommends: itcl3-doc
Description: [incr Tcl] OOP extension for Tcl - development files
- [incr Tcl] (or itcl) is a popular object-oriented extension for the
+ [incr Tcl] (or itcl) is a popular object-oriented extension for the
embeddable Tcl scripting language. The name is a play on C++, and
itcl has a similar object model, including multiple inheritance and
public and private classes and variables. Unlike most OOP extensions
@@ -40,18 +40,16 @@
.
This package contains the headers and libraries needed to embed or
add C extensions to itcl.
- .
- Homepage: http://incrtcl.sourceforge.net/
Package: itcl3-doc
-Section: devel
+Section: doc
Priority: optional
Architecture: all
Suggests: itcl3
Conflicts: itcl-dev, itcl-doc
Provides: itcl-doc
Description: [incr Tcl] OOP extension for Tcl - manual pages
- [incr Tcl] (or itcl) is a popular object-oriented extension for the
+ [incr Tcl] (or itcl) is a popular object-oriented extension for the
embeddable Tcl scripting language. The name is a play on C++, and
itcl has a similar object model, including multiple inheritance and
public and private classes and variables. Unlike most OOP extensions
@@ -59,14 +57,12 @@
.
This package contains the man pages for the new commands that itcl
adds to Tcl.
- .
- Homepage: http://incrtcl.sourceforge.net/
Package: itk3
Section: libs
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, tk8.4, itcl3 (= ${Source-Version})
+Depends: ${shlibs:Depends}, tk8.4, itcl3 (= ${binary:Version})
Suggests: itk3-doc
Conflicts: insight (<= 5.3+cvs.2003.08.30-1)
Description: [incr Tk] OOP extension for Tk - run-time files
@@ -77,14 +73,12 @@
.
This package contains everything you need to run itk scripts and
itk-enabled apps.
- .
- Homepage: http://incrtcl.sourceforge.net/
Package: itk3-dev
Section: devel
Priority: optional
Architecture: any
-Depends: libc6-dev, itcl3-dev, tk8.4-dev, itk3 (= ${Source-Version})
+Depends: libc6-dev, itcl3-dev, tk8.4-dev, itk3 (= ${binary:Version})
Conflicts: itk-dev, itcl3.0-dev (<< 3.0.1)
Recommends: itk3-doc
Description: [incr Tk] OOP extension for Tk - development files
@@ -95,11 +89,9 @@
.
This package contains the headers and libraries needed to embed or
add C extensions to itk.
- .
- Homepage: http://incrtcl.sourceforge.net/
Package: itk3-doc
-Section: devel
+Section: doc
Priority: optional
Architecture: all
Recommends: itcl3-doc
@@ -113,6 +105,3 @@
the iwidgets package.
.
This package contains the man pages for the classes provided by itk.
- .
- Homepage: http://incrtcl.sourceforge.net/
-
Modified: itcl3/trunk/debian/itcl3-dev.files
===================================================================
--- itcl3/trunk/debian/itcl3-dev.files 2008-01-30 20:20:55 UTC (rev 468)
+++ itcl3/trunk/debian/itcl3-dev.files 2008-02-01 16:25:24 UTC (rev 469)
@@ -1,4 +1,4 @@
usr/include/tcl8.4/itcl*
usr/lib/libitcl*.a
usr/lib/libitcl*.so
-usr/lib/itcl*/*.sh
+usr/share/tcltk/itcl*/*.sh
Modified: itcl3/trunk/debian/itcl3.files
===================================================================
--- itcl3/trunk/debian/itcl3.files 2008-01-30 20:20:55 UTC (rev 468)
+++ itcl3/trunk/debian/itcl3.files 2008-02-01 16:25:24 UTC (rev 469)
@@ -1,2 +1,2 @@
-usr/lib/itcl[0-9]*
+usr/share/tcltk/itcl*/*
usr/lib/libitcl*.so.*
Modified: itcl3/trunk/debian/itk3-dev.files
===================================================================
--- itcl3/trunk/debian/itk3-dev.files 2008-01-30 20:20:55 UTC (rev 468)
+++ itcl3/trunk/debian/itk3-dev.files 2008-02-01 16:25:24 UTC (rev 469)
@@ -1,4 +1,4 @@
usr/include/tcl8.4/itk*
usr/lib/libitk*.a
usr/lib/libitk*.so
-usr/lib/itk*/*.sh
+usr/share/tcltk/itk*/*.sh
Modified: itcl3/trunk/debian/itk3.files
===================================================================
--- itcl3/trunk/debian/itk3.files 2008-01-30 20:20:55 UTC (rev 468)
+++ itcl3/trunk/debian/itk3.files 2008-02-01 16:25:24 UTC (rev 469)
@@ -1,2 +1,2 @@
-usr/lib/itk[0-9]*
+usr/share/tcltk/itk*/*
usr/lib/libitk*.so.*
Modified: itcl3/trunk/debian/rules
===================================================================
--- itcl3/trunk/debian/rules 2008-01-30 20:20:55 UTC (rev 468)
+++ itcl3/trunk/debian/rules 2008-02-01 16:25:24 UTC (rev 469)
@@ -1,17 +1,23 @@
#!/usr/bin/make -f
-v = 3.2
-vv = 3.2.1
-tcltk = 8.4
+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)
dtmp=$(shell pwd)/debian/tmp
+tclv=8.4
+
build: build-stamp
build-stamp:
dh_testdir
- sh ./configure --prefix=/usr --includedir=/usr/include/tcl$(tcltk) \
- --enable-shared --enable-threads --with-tcl=/usr/lib/tcl$(tcltk) \
- --with-tk=/usr/lib/tk$(tcltk)
+ sh ./configure --prefix=/usr \
+ --includedir=/usr/include/tcl$(tclv) \
+ --enable-shared \
+ --enable-threads \
+ --with-tcl=/usr/share/tcltk/tcl$(tclv) \
+ --with-tk=/usr/share/tcltk/tk$(tclv)
$(MAKE)
# Build the static library.
cd itcl && \
@@ -30,9 +36,12 @@
dh_testroot
rm -f build-stamp install-stamp
- -$(MAKE) clean
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) distclean
+ rm -f itcl/itclConfig.sh itcl/libitcl$(v).a itcl/pkgIndex.tcl
+ rm -f itk/itkConfig.sh itk/libitk$(v).a itk/pkgIndex.tcl
+
dh_clean
install: install-stamp
@@ -43,38 +52,52 @@
dh_installdirs
mkdir -p debian/tmp
- $(MAKE) prefix=$(dtmp)/usr exec_prefix=$(dtmp)/usr \
- includedir=$(dtmp)/usr/include/tcl$(tcltk) install
+ $(MAKE) prefix=$(dtmp)/usr \
+ exec_prefix=$(dtmp)/usr \
+ includedir=$(dtmp)/usr/include/tcl$(tclv) \
+ install
+# 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/
+ mv $(dtmp)/usr/lib/itk$(v) $(dtmp)/usr/share/tcltk/
+
# Fix up the itcl libraries.
cp itcl/libitcl$(v).a $(dtmp)/usr/lib
mv $(dtmp)/usr/lib/libitcl$(v).so $(dtmp)/usr/lib/libitcl$(v).so.1
ln -sf libitcl$(v).so.1 $(dtmp)/usr/lib/libitcl$(v).so
# (itclConfig.sh doesn't get installed at all, so we install it here)
- perl -p \
- -e "s|^(ITCL_BUILD_LIB_SPEC)=.*$$|\1='-L/usr/lib -litcl$(v)'|;" \
- -e "s|^(ITCL_BUILD_STUB_LIB_SPEC)=.*$$|\1='-L/usr/lib -litclstub$(v)'|;" \
- -e "s|^(ITCL_SRC_DIR)=.*$$|\1='/usr/include/tcl$(tcltk)/itcl-private'|" \
- itcl/itclConfig.sh > $(dtmp)/usr/lib/itcl$(v)/itclConfig.sh
-# mv $(dtmp)/usr/lib/itcl*.sh $(dtmp)/usr/lib/itcl$(v)
+ sed -e "s|^\(ITCL_\(BUILD_\)\?LIB_SPEC\)=.*$$|\1='-L/usr/lib -litcl$(v)'|" \
+ -e "s|^\(ITCL_\(BUILD_\)\?STUB_LIB_SPEC\)=.*$$|\1='-L/usr/lib -litclstub$(v)'|" \
+ -e "s|^\(ITCL_SRC_DIR\)=.*$$|\1='/usr/include/tcl$(tclv)/itcl-private'|" \
+ -e "s|^\(ITCL_LIB_FILE\)=.*$$|\1=libitcl$(v).so.1|" \
+ -e "s|^\(ITCL_STUB_LIB_FILE\)=.*$$|\1=libitcl$(v).a|" \
+ -e "s|^\(ITCL_VERSION\)=.*$$|\1='$(v)'|" \
+ -e "s|^\(ITCL_MAJOR_VERSION\)=.*$$|\1='$(vmajor)'|" \
+ -e "s|^\(ITCL_MINOR_VERSION\)=.*$$|\1='$(vminor)'|" \
+ -e "s|^\(ITCL_RELEASE_LEVEL\)=.*$$|\1='$(vrelease)'|" \
+ itcl/itclConfig.sh > $(dtmp)/usr/share/tcltk/itcl$(v)/itclConfig.sh
# Fix up the itk libraries.
cp itk/libitk$(v).a $(dtmp)/usr/lib
mv $(dtmp)/usr/lib/libitk$(v).so $(dtmp)/usr/lib/libitk$(v).so.1
ln -sf libitk$(v).so.1 $(dtmp)/usr/lib/libitk$(v).so
# (itkConfig.sh doesn't get installed at all, so we install it here)
- perl -p \
- -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$(tcltk)/itk-private'|" \
- itk/itkConfig.sh > $(dtmp)/usr/lib/itk$(v)/itkConfig.sh
-# mv $(dtmp)/usr/lib/itk*.sh $(dtmp)/usr/lib/itk$(v)
+ 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'|" \
+ -e "s|^\(ITK_LIB_FILE\)=.*$$|\1=libitk$(v).so.1|" \
+ -e "s|^\(ITK_STUB_LIB_FILE\)=.*$$|\1=libitk$(v).a|" \
+ -e "s|^\(ITCL_VERSION\)=.*$$|\1='$(v)'|" \
+ -e "s|^\(ITCL_MAJOR_VERSION\)=.*$$|\1='$(vmajor)'|" \
+ -e "s|^\(ITCL_MINOR_VERSION\)=.*$$|\1='$(vminor)'|" \
+ itk/itkConfig.sh > $(dtmp)/usr/share/tcltk/itk$(v)/itkConfig.sh
# Fix up the include files.
- install -d $(dtmp)/usr/include/tcl$(tcltk)/itcl-private/generic
- cp itcl/generic/*.h $(dtmp)/usr/include/tcl$(tcltk)/itcl-private/generic
- install -d $(dtmp)/usr/include/tcl$(tcltk)/itk-private/generic
- cp itk/generic/*.h $(dtmp)/usr/include/tcl$(tcltk)/itk-private/generic
+ install -d $(dtmp)/usr/include/tcl$(tclv)/itcl-private/generic
+ cp itcl/generic/*.h $(dtmp)/usr/include/tcl$(tclv)/itcl-private/generic
+ install -d $(dtmp)/usr/include/tcl$(tclv)/itk-private/generic
+ cp itk/generic/*.h $(dtmp)/usr/include/tcl$(tclv)/itk-private/generic
# Fix up the manpages.
# - just remove the installed ones, they're all mixed together
@@ -84,15 +107,20 @@
cp itcl/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's/^\.TH \([^ ]\+\) n /.TH \1 3itcl /' $$i ; \
mv $$i `echo $$i | sed -e 's/\.n/\.3itcl/'` ; \
done
cp itk/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's/^\.TH \([^ ]\+\) n /.TH \1 3itk /' $$i ; \
mv $$i `echo $$i | sed -e 's/\.n/\.3itk/'` ; \
done
- dh_movefiles
+ dh_movefiles -pitcl3-dev -pitk3-dev
+ dh_movefiles -Nitcl3-dev -Nitk3-dev
touch install-stamp
@@ -106,6 +134,7 @@
dh_compress -i
dh_fixperms -i
dh_installdeb -i
+ tcltk-depends -i
dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i
@@ -132,6 +161,7 @@
dh_makeshlibs -pitk3 -V 'itk3'
dh_installdeb -a
dh_shlibdeps -a
+ tcltk-depends -a
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
Modified: itcl3/trunk/itcl/pkgIndex.tcl.in
===================================================================
--- itcl3/trunk/itcl/pkgIndex.tcl.in 2008-01-30 20:20:55 UTC (rev 468)
+++ itcl3/trunk/itcl/pkgIndex.tcl.in 2008-02-01 16:25:24 UTC (rev 469)
@@ -1,3 +1,3 @@
# Tcl package index file, version 1.0
-package ifneeded Itcl @VERSION@ [list load [file join $dir @RELPATH@ "@itcl_LIB_FILE at .1"] Itcl]
+package ifneeded Itcl @VERSION@ [list load [file join /usr lib "@itcl_LIB_FILE at .1"] Itcl]
Modified: itcl3/trunk/itk/pkgIndex.tcl.in
===================================================================
--- itcl3/trunk/itk/pkgIndex.tcl.in 2008-01-30 20:20:55 UTC (rev 468)
+++ itcl3/trunk/itk/pkgIndex.tcl.in 2008-02-01 16:25:24 UTC (rev 469)
@@ -1,3 +1,3 @@
# Tcl package index file, version 1.0
-package ifneeded Itk @VERSION@ [list load [file join $dir @RELPATH@ "@itk_LIB_FILE at .1"] Itk]
+package ifneeded Itk @VERSION@ [list load [file join /usr lib "@itk_LIB_FILE at .1"] Itk]
More information about the Pkg-tcltk-commits
mailing list