diff -Nru tk8.4-8.4.19/debian/changelog tk8.4-8.4.19/debian/changelog --- tk8.4-8.4.19/debian/changelog 2012-05-30 10:14:20.000000000 +0000 +++ tk8.4-8.4.19/debian/changelog 2012-05-29 15:34:14.000000000 +0000 @@ -1,3 +1,18 @@ +tk8.4 (8.4.19-5) unstable; urgency=low + + * Moved /usr/share/tcltk/tk8.4/tkConfig.sh back to the /usr/lib/tk8.4 + directory because it is architecture dependent. + * Fixed options(3tk) manpage (closes: #649128). + * Removed Chris Waters wrom the uploaders list (closes: #664116). + * Added ${misc:Depends} substitution variable to debian/control because the + package uses debhelper. + * Switched to 3.0 (quilt) source package format. + * Bumped debhelper compatibility version to 8. + * Added hardening build flags using dpkg-buildflags (closes: #658017). + * Bumped standards version to 3.9.3. + + -- Sergei Golovan Tue, 29 May 2012 19:34:11 +0400 + tk8.4 (8.4.19-4) unstable; urgency=low * Removed Anselm Lingnau from uploaders list (closes: #540858). @@ -22,7 +37,7 @@ command, so debhelper logs are removed now). * Added a patch by upstream to mitigate a design bug in Tk event system (Tk events break if built with x11proto-core 7.0.13). - * Removed obsolete package x-dev from build dependencies. This means tk8.5 + * Removed obsolete package x-dev from build dependencies. This means tk8.4 will not built on sarge anymore. * Bumped standards version to 3.8.0. diff -Nru tk8.4-8.4.19/debian/compat tk8.4-8.4.19/debian/compat --- tk8.4-8.4.19/debian/compat 2012-05-30 10:14:20.000000000 +0000 +++ tk8.4-8.4.19/debian/compat 2012-05-29 14:51:01.000000000 +0000 @@ -1 +1 @@ -5 +8 diff -Nru tk8.4-8.4.19/debian/control tk8.4-8.4.19/debian/control --- tk8.4-8.4.19/debian/control 2012-05-30 10:14:20.000000000 +0000 +++ tk8.4-8.4.19/debian/control 2012-05-29 15:37:47.000000000 +0000 @@ -2,16 +2,16 @@ Section: libs Priority: optional Maintainer: Debian Tcl/Tk Packagers -Uploaders: Chris Waters , Sergei Golovan -Build-Depends: debhelper (>= 5.0.0), x11proto-core-dev, libx11-dev, libxt-dev, tcl8.4-dev (>= 8.4.2), quilt -Standards-Version: 3.8.3 +Uploaders: Sergei Golovan +Build-Depends: debhelper (>= 8.0.0), dpkg-dev (>= 1.16.1~), x11proto-core-dev, libx11-dev, libxt-dev, tcl8.4-dev (>= 8.4.2) +Standards-Version: 3.9.3 Homepage: http://www.tcl.tk/ Package: tk8.4 Section: libs Priority: optional Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: xterm | x-terminal-emulator Conflicts: tk40 (<= 4.0p3-2), libtk-img (<< 1.2.5) Provides: wish @@ -25,7 +25,7 @@ Section: devel Priority: optional Architecture: any -Depends: x11proto-core-dev, libx11-dev, libxt-dev, tcl8.4-dev (>= 8.4.2), tk8.4 (= ${binary:Version}) +Depends: x11proto-core-dev, libx11-dev, libxt-dev, tcl8.4-dev (>= 8.4.2), tk8.4 (= ${binary:Version}), ${misc:Depends} Suggests: tk8.4-doc Description: Tk toolkit for Tcl and X11, v8.4 - development files Tk is a cross-platform graphical toolkit which provides the Motif @@ -37,6 +37,7 @@ Section: doc Priority: optional Architecture: all +Depends: ${misc:Depends} Suggests: tk8.4 Conflicts: tkdoc, tk8.3-doc Provides: tkdoc diff -Nru tk8.4-8.4.19/debian/README.source tk8.4-8.4.19/debian/README.source --- tk8.4-8.4.19/debian/README.source 2012-05-30 10:14:20.000000000 +0000 +++ tk8.4-8.4.19/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -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 Sat, 05 Sep 2009 11:33:56 +0400 diff -Nru tk8.4-8.4.19/debian/rules tk8.4-8.4.19/debian/rules --- tk8.4-8.4.19/debian/rules 2012-05-30 10:14:20.000000000 +0000 +++ tk8.4-8.4.19/debian/rules 2012-05-29 15:38:09.000000000 +0000 @@ -1,177 +1,106 @@ #!/usr/bin/make -f -# debian/rules that uses debhelper. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -export QUILT_PATCHES := debian/patches v = 8.4 +DIR = $(shell pwd)/debian/tmp -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) -CFLAGS=-g -O0 -else +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + +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 - -patch: patch-stamp -patch-stamp: - dh_testdir - quilt push -a || test $$? = 2 - touch patch-stamp - -build: build-stamp -build-stamp: patch-stamp - dh_testdir - cd unix && \ - TK_LIBRARY="/usr/share/tcltk/tk$(v)" \ - ./configure --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr \ +%: + dh $@ + +override_dh_auto_configure: + TK_LIBRARY="/usr/share/tcltk/tk$(v)" \ + CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + dh_auto_configure -Dunix -- \ --includedir=/usr/include/tcl$(v) \ --with-tcl=/usr/lib/tcl$(v) \ --enable-shared \ --enable-threads \ - --enable-man-symlinks \ - --enable-man-compression=gzip && \ - $(MAKE) CFLAGS="$(CFLAGS)" -# Build the static library. + --enable-man-symlinks + +override_dh_auto_build: + $(MAKE) -C unix + # Build the static library cd unix && \ ar cr libtk$(v).a *.o && \ ar d libtk$(v).a tkAppInit.o && \ ranlib libtk$(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 - -install: install-stamp -install-stamp: build-stamp - dh_testdir - dh_testroot - dh_installdirs - mkdir -p debian/tmp/usr - 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 pkgInstall.tcl - cp debian/tmp/usr/lib/tk$(v)/* debian/tmp/usr/share/tcltk/tk$(v) -# Fix up the libraries. - cp unix/libtk$(v).a debian/tmp/usr/lib - mv debian/tmp/usr/lib/libtk$(v).so debian/tmp/usr/lib/libtk$(v).so.0 - ln -sf libtk$(v).so.0 debian/tmp/usr/lib/libtk$(v).so - mv debian/tmp/usr/lib/*.sh debian/tmp/usr/share/tcltk/tk$(v) -# Fix up the include files. - install -d debian/tmp/usr/include/tcl$(v)/tk-private/generic - cp generic/*.h debian/tmp/usr/include/tcl$(v)/tk-private/generic - install -d debian/tmp/usr/include/tcl$(v)/tk-private/unix - cp unix/*.h debian/tmp/usr/include/tcl$(v)/tk-private/unix - install -d debian/tmp/usr/include/tcl$(v)/tk-private/compat - cp compat/*.h debian/tmp/usr/include/tcl$(v)/tk-private/compat -# Fix up the manpages. - cd debian/tmp/usr/share/man/man1 && \ - mv wish.1.gz wish$(v).1.gz - cd debian/tmp/usr/share/man/man3 && \ - for f in *.[3n].gz ; do \ +override_dh_auto_install: + $(MAKE) -C unix INSTALL_ROOT=$(DIR) \ + MAN_INSTALL_DIR=$(DIR)/usr/share/man \ + MANN_INSTALL_DIR=$(DIR)/usr/share/man/man3 \ + install + # Fix up pkgInstall.tcl + cp $(DIR)/usr/lib/tk$(v)/* $(DIR)/usr/share/tcltk/tk$(v) + # Fix up the libraries + cp unix/libtk$(v).a $(DIR)/usr/lib + mv $(DIR)/usr/lib/libtk$(v).so $(DIR)/usr/lib/libtk$(v).so.0 + ln -sf libtk$(v).so.0 $(DIR)/usr/lib/libtk$(v).so + mv $(DIR)/usr/lib/*.sh $(DIR)/usr/lib/tk$(v) + # Fix up the include files + install -d -m 755 $(DIR)/usr/include/tcl$(v)/tk-private/generic + cp generic/*.h $(DIR)/usr/include/tcl$(v)/tk-private/generic + install -d -m 755 $(DIR)/usr/include/tcl$(v)/tk-private/unix + cp unix/*.h $(DIR)/usr/include/tcl$(v)/tk-private/unix + install -d -m 755 $(DIR)/usr/include/tcl$(v)/tk-private/compat + cp compat/*.h $(DIR)/usr/include/tcl$(v)/tk-private/compat + # Move around the demos + install -d -m 755 $(DIR)/usr/share/doc/tk$(v)/examples + cp -a library/demos/* $(DIR)/usr/share/doc/tk$(v)/examples/ + rm -f $(DIR)/usr/share/doc/tk$(v)/examples/license.terms + # Fix up the manpages + cd $(DIR)/usr/share/man/man1 && mv wish.1 wish$(v).1 + cd $(DIR)/usr/share/man/man3 && \ + for f in *.[3n] ; do \ f2=$$(echo $$f | sed -e 's/\.[3n]/.3tk/') ; \ if [ -L $$f ]; then \ l=$$(readlink -n $$f |sed -e 's/\.[3n]/.3tk/') ; \ rm $$f ; \ ln -sf $$l $$f2 ; \ else \ - zcat $$f | sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tk/' \ - -e 's/\([0-9A-Za-z]\+\)(3)/\1(3tk)/g' \ - -e 's/bgerror(n)/bgerror(3tcl)/g' \ - -e 's/fconfigure(n)/fconfigure(3tcl)/g' \ - -e 's/history(n)/history(3tcl)/g' \ - -e 's/interp(n)/interp(3tcl)/g' \ - -e 's/library(n)/library(3tcl)/g' \ - -e 's/load(n)/load(3tcl)/g' \ - -e 's/package(n)/package(3tcl)/g' \ - -e 's/puts(n)/puts(3tcl)/g' \ - -e 's/safe(n)/safe(3tcl)/g' \ - -e 's/source(n)/source(3tcl)/g' \ - -e 's/tclvars(n)/tclvars(3tcl)/g' \ - -e 's/unknown(n)/unknown(3tcl)/g' \ - -e 's/(n)/(3tk)/g' \ - | gzip -9 >$$f2 ; \ + sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tk/' \ + -e 's/\([0-9A-Za-z]\+\)(3)/\1(3tk)/g' \ + -e 's/bgerror(n)/bgerror(3tcl)/g' \ + -e 's/fconfigure(n)/fconfigure(3tcl)/g' \ + -e 's/history(n)/history(3tcl)/g' \ + -e 's/interp(n)/interp(3tcl)/g' \ + -e 's/library(n)/library(3tcl)/g' \ + -e 's/load(n)/load(3tcl)/g' \ + -e 's/package(n)/package(3tcl)/g' \ + -e 's/puts(n)/puts(3tcl)/g' \ + -e 's/safe(n)/safe(3tcl)/g' \ + -e 's/source(n)/source(3tcl)/g' \ + -e 's/tclvars(n)/tclvars(3tcl)/g' \ + -e 's/unknown(n)/unknown(3tcl)/g' \ + -e 's/(n)/(3tk)/g' \ + -e 's/^\.de OP$$/.de OOP/' \ + -e 's/^.OP /.OOP /' \ + $$f >$$f2 ; \ rm $$f ; \ fi ; \ done - rm -rf `pwd`/debian/tmp/usr/share/tcltk/tk$(v)/demos - ln -sf ../../doc/tk$(v)/examples `pwd`/debian/tmp/usr/share/tcltk/tk$(v)/demos - 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 - -# 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 - mv debian/tk$(v)/usr/share/tcltk/tk$(v)/*.sh \ - debian/tk$(v)-dev/usr/share/tcltk/tk$(v) - ln -s ../../share/tcltk/tk$(v)/tkConfig.sh \ - debian/tk$(v)-dev/usr/lib/tk$(v)/tkConfig.sh - dh_installdocs -a - install -d `pwd`/debian/tk$(v)/usr/share/doc/tk$(v)/examples/ -# move around the demos - cp -a library/demos/* `pwd`/debian/tk$(v)/usr/share/doc/tk$(v)/examples/ - rm -f debian/tk$(v)/usr/share/doc/tk$(v)/examples/license.terms - dh_installmenu -a - dh_installchangelogs -a ChangeLog - install -m 644 debian/tk$(v).lintian-override \ - debian/tk$(v)/usr/share/lintian/overrides/tk$(v) - dh_fixperms -a - dh_strip -a - dh_compress -a -Xusr/share/doc/tk$(v)/examples/ - dh_makeshlibs -a -V 'tk$(v) (>= 8.4.16)' - dh_installdeb -a - dh_shlibdeps -a -ldebian/tk$(v)/usr/lib - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a + rm -rf $(DIR)/usr/share/tcltk/tk$(v)/demos + ln -sf ../../doc/tk$(v)/examples $(DIR)/usr/share/tcltk/tk$(v)/demos + +override_dh_compress: + dh_compress -Xusr/share/doc/tk$(v)/examples/ -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false +override_dh_makeshlibs: + dh_makeshlibs -V 'tk$(v) (>= 8.4.16)' -binary: binary-indep binary-arch +override_dh_shlibdeps: + dh_shlibdeps -ldebian/tk$(v)/usr/lib get-orig-source: wget -O tk8.4_8.4.19.orig.tar.gz \ http://prdownloads.sourceforge.net/tcl/tk8.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_configure override_dh_auto_build override_dh_auto_install override_dh_compress override_dh_makeshlibs override_dh_shlibdeps get-orig-source diff -Nru tk8.4-8.4.19/debian/source/format tk8.4-8.4.19/debian/source/format --- tk8.4-8.4.19/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ tk8.4-8.4.19/debian/source/format 2012-05-30 10:14:21.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru tk8.4-8.4.19/debian/tk8.4-dev.files tk8.4-8.4.19/debian/tk8.4-dev.files --- tk8.4-8.4.19/debian/tk8.4-dev.files 2012-05-30 10:14:20.000000000 +0000 +++ tk8.4-8.4.19/debian/tk8.4-dev.files 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/include -usr/lib/*.a -usr/lib/*.so diff -Nru tk8.4-8.4.19/debian/tk8.4-dev.install tk8.4-8.4.19/debian/tk8.4-dev.install --- tk8.4-8.4.19/debian/tk8.4-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ tk8.4-8.4.19/debian/tk8.4-dev.install 2012-05-29 14:51:35.000000000 +0000 @@ -0,0 +1,4 @@ +usr/include +usr/lib/*.a +usr/lib/*.so +usr/lib/tk*/*.sh diff -Nru tk8.4-8.4.19/debian/tk8.4.dirs tk8.4-8.4.19/debian/tk8.4.dirs --- tk8.4-8.4.19/debian/tk8.4.dirs 2012-05-30 10:14:20.000000000 +0000 +++ tk8.4-8.4.19/debian/tk8.4.dirs 2012-05-29 15:02:37.000000000 +0000 @@ -1 +1 @@ -usr/share/lintian/overrides +usr/share/doc/tk8.4/examples diff -Nru tk8.4-8.4.19/debian/tk8.4-doc.files tk8.4-8.4.19/debian/tk8.4-doc.files --- tk8.4-8.4.19/debian/tk8.4-doc.files 2012-05-30 10:14:20.000000000 +0000 +++ tk8.4-8.4.19/debian/tk8.4-doc.files 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/man/man3 diff -Nru tk8.4-8.4.19/debian/tk8.4-doc.install tk8.4-8.4.19/debian/tk8.4-doc.install --- tk8.4-8.4.19/debian/tk8.4-doc.install 1970-01-01 00:00:00.000000000 +0000 +++ tk8.4-8.4.19/debian/tk8.4-doc.install 2012-05-29 14:49:07.000000000 +0000 @@ -0,0 +1 @@ +usr/share/man/man3 diff -Nru tk8.4-8.4.19/debian/tk8.4.files tk8.4-8.4.19/debian/tk8.4.files --- tk8.4-8.4.19/debian/tk8.4.files 2012-05-30 10:14:20.000000000 +0000 +++ tk8.4-8.4.19/debian/tk8.4.files 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -usr/bin -usr/share/tcltk/tk8.4 -usr/lib/*.so.* -usr/share/man/man1 diff -Nru tk8.4-8.4.19/debian/tk8.4.install tk8.4-8.4.19/debian/tk8.4.install --- tk8.4-8.4.19/debian/tk8.4.install 1970-01-01 00:00:00.000000000 +0000 +++ tk8.4-8.4.19/debian/tk8.4.install 2012-05-29 15:19:40.000000000 +0000 @@ -0,0 +1,5 @@ +usr/bin +usr/share/tcltk/tk* +usr/lib/*.so.* +usr/share/doc/tk*/examples +usr/share/man/man1 diff -Nru tk8.4-8.4.19/debian/tk8.4.lintian-override tk8.4-8.4.19/debian/tk8.4.lintian-override --- tk8.4-8.4.19/debian/tk8.4.lintian-override 2012-05-30 10:14:20.000000000 +0000 +++ tk8.4-8.4.19/debian/tk8.4.lintian-override 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -tk8.4: package-name-doesnt-match-sonames diff -Nru tk8.4-8.4.19/debian/tk8.4.lintian-overrides tk8.4-8.4.19/debian/tk8.4.lintian-overrides --- tk8.4-8.4.19/debian/tk8.4.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ tk8.4-8.4.19/debian/tk8.4.lintian-overrides 2012-05-29 14:49:20.000000000 +0000 @@ -0,0 +1 @@ +tk8.4: package-name-doesnt-match-sonames