[Pkg-tcltk-commits] r1241 - in tcl8.4/trunk/debian: . source
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Mon May 28 12:33:36 UTC 2012
Author: sgolovan
Date: 2012-05-28 12:33:35 +0000 (Mon, 28 May 2012)
New Revision: 1241
Added:
tcl8.4/trunk/debian/source/
tcl8.4/trunk/debian/source/format
tcl8.4/trunk/debian/tcl8.4-dev.install
tcl8.4/trunk/debian/tcl8.4-doc.install
tcl8.4/trunk/debian/tcl8.4.install
tcl8.4/trunk/debian/tcl8.4.lintian-overrides
Removed:
tcl8.4/trunk/debian/README.source
tcl8.4/trunk/debian/tcl8.4-dev.files
tcl8.4/trunk/debian/tcl8.4-doc.files
tcl8.4/trunk/debian/tcl8.4.files
tcl8.4/trunk/debian/tcl8.4.lintian-override
Modified:
tcl8.4/trunk/debian/changelog
tcl8.4/trunk/debian/compat
tcl8.4/trunk/debian/control
tcl8.4/trunk/debian/rules
Log:
[tcl8.4]
* Moved /usr/share/tcltk/tcl8.4/tclConfig.sh back to the /usr/lib/tcl8.4
directory because it is architecture dependent.
* Removed Chris Waters wrom the uploaders list (closes: #664111).
* Renamed suggested dependency to tcl-tclreadline.
* Switched to 3.0 (quilt) source package format.
* Bumped debhelper compatibility version to 8.
* Added hardening build flags using dpkg-buildflags.
* Bumped standards version to 3.9.3.
Deleted: tcl8.4/trunk/debian/README.source
===================================================================
--- tcl8.4/trunk/debian/README.source 2012-05-27 18:55:39 UTC (rev 1240)
+++ tcl8.4/trunk/debian/README.source 2012-05-28 12:33:35 UTC (rev 1241)
@@ -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> Sat, 05 Sep 2009 11:33:56 +0400
Modified: tcl8.4/trunk/debian/changelog
===================================================================
--- tcl8.4/trunk/debian/changelog 2012-05-27 18:55:39 UTC (rev 1240)
+++ tcl8.4/trunk/debian/changelog 2012-05-28 12:33:35 UTC (rev 1241)
@@ -1,8 +1,15 @@
-tcl8.4 (8.4.19-5) UNRELEASED; urgency=low
+tcl8.4 (8.4.19-5) unstable; urgency=low
- * NOT RELEASED YET
+ * Moved /usr/share/tcltk/tcl8.4/tclConfig.sh back to the /usr/lib/tcl8.4
+ directory because it is architecture dependent.
+ * Removed Chris Waters wrom the uploaders list (closes: #664111).
+ * Renamed suggested dependency to tcl-tclreadline.
+ * Switched to 3.0 (quilt) source package format.
+ * Bumped debhelper compatibility version to 8.
+ * Added hardening build flags using dpkg-buildflags.
+ * Bumped standards version to 3.9.3.
- -- Sergei Golovan <sgolovan at debian.org> Sat, 05 Sep 2009 12:43:00 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 28 May 2012 16:31:52 +0400
tcl8.4 (8.4.19-4) unstable; urgency=low
Modified: tcl8.4/trunk/debian/compat
===================================================================
--- tcl8.4/trunk/debian/compat 2012-05-27 18:55:39 UTC (rev 1240)
+++ tcl8.4/trunk/debian/compat 2012-05-28 12:33:35 UTC (rev 1241)
@@ -1 +1 @@
-5
+8
Modified: tcl8.4/trunk/debian/control
===================================================================
--- tcl8.4/trunk/debian/control 2012-05-27 18:55:39 UTC (rev 1240)
+++ tcl8.4/trunk/debian/control 2012-05-28 12:33:35 UTC (rev 1241)
@@ -2,19 +2,19 @@
Section: libs
Priority: optional
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), quilt
-Standards-Version: 3.8.3
+Uploaders: Sergei Golovan <sgolovan at debian.org>
+Build-Depends: debhelper (>= 8.0.0), dpkg-dev (>= 1.16.1~)
+Standards-Version: 3.9.3
Homepage: http://www.tcl.tk/
Package: tcl8.4
Section: interpreters
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: tcl74 (<= 7.4p3-2)
Provides: tclsh
-Suggests: tclreadline
+Suggests: tcl-tclreadline
Description: Tcl (the Tool Command Language) v8.4 - run-time files
Tcl is a powerful, easy to use, embeddable, cross-platform interpreted
scripting language. This package contains everything you need to run
@@ -24,6 +24,7 @@
Section: doc
Priority: optional
Architecture: all
+Depends: ${misc:Depends}
Suggests: tcl8.4
Conflicts: tcldoc, tcl8.3-doc
Provides: tcldoc
@@ -35,7 +36,7 @@
Section: devel
Priority: optional
Architecture: any
-Depends: tcl8.4 (= ${binary:Version})
+Depends: tcl8.4 (= ${binary:Version}), ${misc:Depends}
Suggests: tcl8.4-doc
Description: Tcl (the Tool Command Language) v8.4 - development files
Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted
Modified: tcl8.4/trunk/debian/rules
===================================================================
--- tcl8.4/trunk/debian/rules 2012-05-27 18:55:39 UTC (rev 1240)
+++ tcl8.4/trunk/debian/rules 2012-05-28 12:33:35 UTC (rev 1241)
@@ -1,100 +1,68 @@
#!/usr/bin/make -f
-# debian/rules that uses debhelper.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+v = 8.4
+DIR = $(shell pwd)/debian/tmp
-DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
-export QUILT_PATCHES := debian/patches
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+export LDFLAGS
-v = 8.4
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS=-g -O0
-else
+ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
# See bug #446335
-CFLAGS=-g -O2 -fno-unit-at-a-time
+CFLAGS += -fno-unit-at-a-time
endif
-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: build-stamp
-build-stamp: patch-stamp
- dh_testdir
-# So so ugly but it works...
+override_dh_auto_configure:
+ # So so ugly but it works...
touch generic/tclStubInit.c
+ TCL_LIBRARY="/usr/share/tcltk/tcl$(v)" \
+ TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk /usr/lib" \
+ CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ dh_auto_configure -Dunix -- \
+ --includedir=/usr/include/tcl$(v) \
+ --enable-shared \
+ --enable-threads \
+ --enable-man-symlinks \
+ --enable-man-compression=gzip
+
+override_dh_auto_build:
+ # Another ugly part
+ touch generic/tclStubInit.c && \
+ $(MAKE) -C unix
+ # Build the static library
cd unix && \
- TCL_LIBRARY="/usr/share/tcltk/tcl$(v)" \
- TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk /usr/lib" \
- ./configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --includedir=/usr/include/tcl$(v) \
- --enable-shared \
- --enable-threads \
- --mandir=/usr/share/man \
- --enable-man-symlinks \
- --enable-man-compression=gzip && \
- touch ../generic/tclStubInit.c && \
- $(MAKE) CFLAGS="$(CFLAGS)"
-# Build the static library.
- cd unix && \
ar cr libtcl$(v).a *.o && \
ar d libtcl$(v).a tclAppInit.o && \
ranlib libtcl$(v).a
- touch build-stamp
-clean: clean-patched unpatch
- dh_testdir
- dh_testroot
- dh_clean
-
-clean-patched:
- dh_testdir
- dh_testroot
- rm -f build-stamp install-stamp
- cd unix && [ ! -f Makefile ] || $(MAKE) distclean
-# Remove forgotten files
- rm -f tests/pkg/pkga.so unix/config.log unix/Tcltest.so
-
-install: install-stamp
-install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- cd unix && \
- GZIP=-9 \
- $(MAKE) INSTALL_ROOT=`pwd`/../debian/tmp \
- MAN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man \
- MANN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man/man3 \
- install
-# Fix up the libraries.
+override_dh_auto_install:
+ GZIP=-9 \
+ $(MAKE) -C unix INSTALL_ROOT=$(DIR) \
+ MAN_INSTALL_DIR=$(DIR)/usr/share/man \
+ MANN_INSTALL_DIR=$(DIR)/usr/share/man/man3 \
+ install
+ # Fix up the libraries
cp unix/libtcl$(v).a debian/tmp/usr/lib
mv debian/tmp/usr/lib/libtcl$(v).so debian/tmp/usr/lib/libtcl$(v).so.0
ln -sf libtcl$(v).so.0 debian/tmp/usr/lib/libtcl$(v).so
- mv debian/tmp/usr/lib/*.sh debian/tmp/usr/share/tcltk/tcl$(v)
- cp unix/tcl.m4 debian/tmp/usr/share/tcltk/tcl$(v)/tcl.m4
+ mkdir debian/tmp/usr/lib/tcl$(v)
+ mv debian/tmp/usr/lib/*.sh debian/tmp/usr/lib/tcl$(v)
+ mkdir debian/tmp/usr/share/aclocal
+ cp unix/tcl.m4 debian/tmp/usr/share/aclocal/tcl$(v).m4
rm -f debian/tmp/usr/share/tcltk/tcl$(v)/ldAix
-# Fix up the include files.
+ # Fix up the include files
install -d debian/tmp/usr/include/tcl$(v)/tcl-private/generic
cp generic/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/generic
install -d debian/tmp/usr/include/tcl$(v)/tcl-private/unix
cp unix/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/unix
install -d debian/tmp/usr/include/tcl$(v)/tcl-private/compat
cp compat/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/compat
-# Fix up the manpages.
+ # Fix up the manpages
cd debian/tmp/usr/share/man/man1 && \
zcat tclsh.1.gz | sed -e 's/(n)/(3tcl)/g' | gzip -9 > tclsh$(v).1.gz && \
rm tclsh.1.gz
@@ -118,57 +86,16 @@
rm $$f ; \
fi ; \
done
- touch install-stamp
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_movefiles -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_makeshlibs:
+ dh_makeshlibs -V 'tcl$(v) (>= 8.4.16)' -XTcltest
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_movefiles -a
-# now, fix up file locations for .sh and .m4
- mv debian/tcl$(v)/usr/share/tcltk/tcl$(v)/tcl.m4 \
- debian/tcl$(v)-dev/usr/share/aclocal/tcl$(v).m4
- mv debian/tcl$(v)/usr/share/tcltk/tcl$(v)/tclConfig.sh \
- debian/tcl$(v)-dev/usr/share/tcltk/tcl$(v)
- ln -s ../../share/tcltk/tcl$(v)/tclConfig.sh \
- debian/tcl$(v)-dev/usr/lib/tcl$(v)/tclConfig.sh
- dh_installdocs -a
- dh_installmenu -a
- dh_installchangelogs -a ChangeLog
- install -m 644 debian/tcl$(v).lintian-override \
- debian/tcl$(v)/usr/share/lintian/overrides/tcl$(v)
- dh_fixperms -a
- dh_strip -a
- dh_compress -a
- dh_makeshlibs -a -V 'tcl$(v) (>= 8.4.16)' -XTcltest
- dh_installdeb -a
- dh_shlibdeps -a -ldebian/tcl$(v)/usr/lib
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+override_dh_shlibdeps:
+ dh_shlibdeps -ldebian/tcl$(v)/usr/lib
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-
get-orig-source:
wget -O tcl8.4_8.4.19.orig.tar.gz \
http://prdownloads.sourceforge.net/tcl/tcl8.4.19-src.tar.gz
-.PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
+.PHONY: override_dh_auto_configure override_dh_auto_install override_dh_makeshlibs override_dh_shlibdeps get-orig-source
Added: tcl8.4/trunk/debian/source/format
===================================================================
--- tcl8.4/trunk/debian/source/format (rev 0)
+++ tcl8.4/trunk/debian/source/format 2012-05-28 12:33:35 UTC (rev 1241)
@@ -0,0 +1 @@
+3.0 (quilt)
Deleted: tcl8.4/trunk/debian/tcl8.4-dev.files
===================================================================
--- tcl8.4/trunk/debian/tcl8.4-dev.files 2012-05-27 18:55:39 UTC (rev 1240)
+++ tcl8.4/trunk/debian/tcl8.4-dev.files 2012-05-28 12:33:35 UTC (rev 1241)
@@ -1,3 +0,0 @@
-usr/include
-usr/lib/*.a
-usr/lib/*.so
Copied: tcl8.4/trunk/debian/tcl8.4-dev.install (from rev 1237, tcl8.4/trunk/debian/tcl8.4-dev.files)
===================================================================
--- tcl8.4/trunk/debian/tcl8.4-dev.install (rev 0)
+++ tcl8.4/trunk/debian/tcl8.4-dev.install 2012-05-28 12:33:35 UTC (rev 1241)
@@ -0,0 +1,5 @@
+usr/include
+usr/lib/*.a
+usr/lib/*.so
+usr/lib/tcl*
+usr/share/aclocal/*.m4
Deleted: tcl8.4/trunk/debian/tcl8.4-doc.files
===================================================================
--- tcl8.4/trunk/debian/tcl8.4-doc.files 2012-05-27 18:55:39 UTC (rev 1240)
+++ tcl8.4/trunk/debian/tcl8.4-doc.files 2012-05-28 12:33:35 UTC (rev 1241)
@@ -1 +0,0 @@
-usr/share/man/man3
Copied: tcl8.4/trunk/debian/tcl8.4-doc.install (from rev 1237, tcl8.4/trunk/debian/tcl8.4-doc.files)
===================================================================
--- tcl8.4/trunk/debian/tcl8.4-doc.install (rev 0)
+++ tcl8.4/trunk/debian/tcl8.4-doc.install 2012-05-28 12:33:35 UTC (rev 1241)
@@ -0,0 +1 @@
+usr/share/man/man3
Deleted: tcl8.4/trunk/debian/tcl8.4.files
===================================================================
--- tcl8.4/trunk/debian/tcl8.4.files 2012-05-27 18:55:39 UTC (rev 1240)
+++ tcl8.4/trunk/debian/tcl8.4.files 2012-05-28 12:33:35 UTC (rev 1241)
@@ -1,4 +0,0 @@
-usr/bin
-usr/share/tcltk/tcl8.4
-usr/lib/*.so.*
-usr/share/man/man1
Copied: tcl8.4/trunk/debian/tcl8.4.install (from rev 1237, tcl8.4/trunk/debian/tcl8.4.files)
===================================================================
--- tcl8.4/trunk/debian/tcl8.4.install (rev 0)
+++ tcl8.4/trunk/debian/tcl8.4.install 2012-05-28 12:33:35 UTC (rev 1241)
@@ -0,0 +1,4 @@
+usr/bin
+usr/share/tcltk/tcl8.4
+usr/lib/*.so.*
+usr/share/man/man1
Deleted: tcl8.4/trunk/debian/tcl8.4.lintian-override
===================================================================
--- tcl8.4/trunk/debian/tcl8.4.lintian-override 2012-05-27 18:55:39 UTC (rev 1240)
+++ tcl8.4/trunk/debian/tcl8.4.lintian-override 2012-05-28 12:33:35 UTC (rev 1241)
@@ -1 +0,0 @@
-tcl8.4: package-name-doesnt-match-sonames
Copied: tcl8.4/trunk/debian/tcl8.4.lintian-overrides (from rev 1237, tcl8.4/trunk/debian/tcl8.4.lintian-override)
===================================================================
--- tcl8.4/trunk/debian/tcl8.4.lintian-overrides (rev 0)
+++ tcl8.4/trunk/debian/tcl8.4.lintian-overrides 2012-05-28 12:33:35 UTC (rev 1241)
@@ -0,0 +1 @@
+tcl8.4: package-name-doesnt-match-sonames
More information about the Pkg-tcltk-commits
mailing list