[Pkg-tcltk-commits] r1251 - in tk8.4/trunk/debian: . source
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Tue May 29 15:41:32 UTC 2012
Author: sgolovan
Date: 2012-05-29 15:41:32 +0000 (Tue, 29 May 2012)
New Revision: 1251
Added:
tk8.4/trunk/debian/source/
tk8.4/trunk/debian/source/format
tk8.4/trunk/debian/tk8.4-dev.install
tk8.4/trunk/debian/tk8.4-doc.install
tk8.4/trunk/debian/tk8.4.install
tk8.4/trunk/debian/tk8.4.lintian-overrides
Removed:
tk8.4/trunk/debian/README.source
tk8.4/trunk/debian/tk8.4-dev.files
tk8.4/trunk/debian/tk8.4-doc.files
tk8.4/trunk/debian/tk8.4.files
tk8.4/trunk/debian/tk8.4.lintian-override
Modified:
tk8.4/trunk/debian/changelog
tk8.4/trunk/debian/compat
tk8.4/trunk/debian/control
tk8.4/trunk/debian/rules
tk8.4/trunk/debian/tk8.4.dirs
Log:
[tk8.4]
* 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.
Deleted: tk8.4/trunk/debian/README.source
===================================================================
--- tk8.4/trunk/debian/README.source 2012-05-28 14:26:20 UTC (rev 1250)
+++ tk8.4/trunk/debian/README.source 2012-05-29 15:41:32 UTC (rev 1251)
@@ -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: tk8.4/trunk/debian/changelog
===================================================================
--- tk8.4/trunk/debian/changelog 2012-05-28 14:26:20 UTC (rev 1250)
+++ tk8.4/trunk/debian/changelog 2012-05-29 15:41:32 UTC (rev 1251)
@@ -1,12 +1,17 @@
tk8.4 (8.4.19-5) unstable; urgency=low
- * Replaced xterm by xvt in recommended dependencies to reduce implicit
- dependencies list (closes: #601591).
- * Added ${misc:Depends} to debian/control file because the binary packages
- are built using debhelper.
- * Bumped standards version to 3.9.1.
+ * 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 <sgolovan at debian.org> Sun, 31 Oct 2010 14:55:16 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 29 May 2012 19:34:11 +0400
tk8.4 (8.4.19-4) unstable; urgency=low
@@ -32,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.
Modified: tk8.4/trunk/debian/compat
===================================================================
--- tk8.4/trunk/debian/compat 2012-05-28 14:26:20 UTC (rev 1250)
+++ tk8.4/trunk/debian/compat 2012-05-29 15:41:32 UTC (rev 1251)
@@ -1 +1 @@
-5
+8
Modified: tk8.4/trunk/debian/control
===================================================================
--- tk8.4/trunk/debian/control 2012-05-28 14:26:20 UTC (rev 1250)
+++ tk8.4/trunk/debian/control 2012-05-29 15:41:32 UTC (rev 1251)
@@ -2,9 +2,9 @@
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), x11proto-core-dev, libx11-dev, libxt-dev, tcl8.4-dev (>= 8.4.2), quilt
-Standards-Version: 3.9.1
+Uploaders: Sergei Golovan <sgolovan at debian.org>
+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
@@ -12,7 +12,7 @@
Priority: optional
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: xvt | x-terminal-emulator
+Recommends: xterm | x-terminal-emulator
Conflicts: tk40 (<= 4.0p3-2), libtk-img (<< 1.2.5)
Provides: wish
Description: Tk toolkit for Tcl and X11, v8.4 - run-time files
Modified: tk8.4/trunk/debian/rules
===================================================================
--- tk8.4/trunk/debian/rules 2012-05-28 14:26:20 UTC (rev 1250)
+++ tk8.4/trunk/debian/rules 2012-05-29 15:41:32 UTC (rev 1251)
@@ -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
+%:
+ 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
- cd unix && \
- TK_LIBRARY="/usr/share/tcltk/tk$(v)" \
- ./configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
+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
+ rm -rf $(DIR)/usr/share/tcltk/tk$(v)/demos
+ ln -sf ../../doc/tk$(v)/examples $(DIR)/usr/share/tcltk/tk$(v)/demos
-# 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_compress:
+ dh_compress -Xusr/share/doc/tk$(v)/examples/
-# 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
+override_dh_makeshlibs:
+ dh_makeshlibs -V 'tk$(v) (>= 8.4.16)'
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+override_dh_shlibdeps:
+ dh_shlibdeps -ldebian/tk$(v)/usr/lib
-binary: binary-indep binary-arch
-
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
Added: tk8.4/trunk/debian/source/format
===================================================================
--- tk8.4/trunk/debian/source/format (rev 0)
+++ tk8.4/trunk/debian/source/format 2012-05-29 15:41:32 UTC (rev 1251)
@@ -0,0 +1 @@
+3.0 (quilt)
Deleted: tk8.4/trunk/debian/tk8.4-dev.files
===================================================================
--- tk8.4/trunk/debian/tk8.4-dev.files 2012-05-28 14:26:20 UTC (rev 1250)
+++ tk8.4/trunk/debian/tk8.4-dev.files 2012-05-29 15:41:32 UTC (rev 1251)
@@ -1,3 +0,0 @@
-usr/include
-usr/lib/*.a
-usr/lib/*.so
Copied: tk8.4/trunk/debian/tk8.4-dev.install (from rev 1250, tk8.4/trunk/debian/tk8.4-dev.files)
===================================================================
--- tk8.4/trunk/debian/tk8.4-dev.install (rev 0)
+++ tk8.4/trunk/debian/tk8.4-dev.install 2012-05-29 15:41:32 UTC (rev 1251)
@@ -0,0 +1,4 @@
+usr/include
+usr/lib/*.a
+usr/lib/*.so
+usr/lib/tk*/*.sh
Deleted: tk8.4/trunk/debian/tk8.4-doc.files
===================================================================
--- tk8.4/trunk/debian/tk8.4-doc.files 2012-05-28 14:26:20 UTC (rev 1250)
+++ tk8.4/trunk/debian/tk8.4-doc.files 2012-05-29 15:41:32 UTC (rev 1251)
@@ -1 +0,0 @@
-usr/share/man/man3
Copied: tk8.4/trunk/debian/tk8.4-doc.install (from rev 1250, tk8.4/trunk/debian/tk8.4-doc.files)
===================================================================
--- tk8.4/trunk/debian/tk8.4-doc.install (rev 0)
+++ tk8.4/trunk/debian/tk8.4-doc.install 2012-05-29 15:41:32 UTC (rev 1251)
@@ -0,0 +1 @@
+usr/share/man/man3
Modified: tk8.4/trunk/debian/tk8.4.dirs
===================================================================
--- tk8.4/trunk/debian/tk8.4.dirs 2012-05-28 14:26:20 UTC (rev 1250)
+++ tk8.4/trunk/debian/tk8.4.dirs 2012-05-29 15:41:32 UTC (rev 1251)
@@ -1 +1 @@
-usr/share/lintian/overrides
+usr/share/doc/tk8.4/examples
Deleted: tk8.4/trunk/debian/tk8.4.files
===================================================================
--- tk8.4/trunk/debian/tk8.4.files 2012-05-28 14:26:20 UTC (rev 1250)
+++ tk8.4/trunk/debian/tk8.4.files 2012-05-29 15:41:32 UTC (rev 1251)
@@ -1,4 +0,0 @@
-usr/bin
-usr/share/tcltk/tk8.4
-usr/lib/*.so.*
-usr/share/man/man1
Copied: tk8.4/trunk/debian/tk8.4.install (from rev 1250, tk8.4/trunk/debian/tk8.4.files)
===================================================================
--- tk8.4/trunk/debian/tk8.4.install (rev 0)
+++ tk8.4/trunk/debian/tk8.4.install 2012-05-29 15:41:32 UTC (rev 1251)
@@ -0,0 +1,5 @@
+usr/bin
+usr/share/tcltk/tk*
+usr/lib/*.so.*
+usr/share/doc/tk*/examples
+usr/share/man/man1
Deleted: tk8.4/trunk/debian/tk8.4.lintian-override
===================================================================
--- tk8.4/trunk/debian/tk8.4.lintian-override 2012-05-28 14:26:20 UTC (rev 1250)
+++ tk8.4/trunk/debian/tk8.4.lintian-override 2012-05-29 15:41:32 UTC (rev 1251)
@@ -1 +0,0 @@
-tk8.4: package-name-doesnt-match-sonames
Copied: tk8.4/trunk/debian/tk8.4.lintian-overrides (from rev 1250, tk8.4/trunk/debian/tk8.4.lintian-override)
===================================================================
--- tk8.4/trunk/debian/tk8.4.lintian-overrides (rev 0)
+++ tk8.4/trunk/debian/tk8.4.lintian-overrides 2012-05-29 15:41:32 UTC (rev 1251)
@@ -0,0 +1 @@
+tk8.4: package-name-doesnt-match-sonames
More information about the Pkg-tcltk-commits
mailing list