[Pkg-tcltk-commits] r1248 - in tcl8.6/trunk/debian: . patches source

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Mon May 28 14:21:45 UTC 2012 

Author: sgolovan
Date: 2012-05-28 14:21:44 +0000 (Mon, 28 May 2012)
New Revision: 1248

Added:
   tcl8.6/trunk/debian/source/
   tcl8.6/trunk/debian/source/format
   tcl8.6/trunk/debian/tcl8.6-dev.install
   tcl8.6/trunk/debian/tcl8.6-doc.install
   tcl8.6/trunk/debian/tcl8.6.install
   tcl8.6/trunk/debian/tcl8.6.lintian-overrides
Removed:
   tcl8.6/trunk/debian/README.source
   tcl8.6/trunk/debian/tcl8.6-dev.files
   tcl8.6/trunk/debian/tcl8.6-doc.files
   tcl8.6/trunk/debian/tcl8.6.files
   tcl8.6/trunk/debian/tcl8.6.lintian-override
Modified:
   tcl8.6/trunk/debian/changelog
   tcl8.6/trunk/debian/compat
   tcl8.6/trunk/debian/control
   tcl8.6/trunk/debian/patches/manpages.diff
   tcl8.6/trunk/debian/rules
Log:
[tcl8.6]
  * Install library(3tcl), packagens(3tcl), pkgMkIndex(3tcl) and safe(3tcl)
    manpages despite of upstream renaming them because they are referenced
    from the other pages.
  * Don't break the build if tdbc headers aren't in the tarball (helps
    to build the package using sources from the upstream repository).
  * Removed Chris Waters wrom the uploaders list (closes: #664113).
  * 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.6/trunk/debian/README.source
===================================================================
--- tcl8.6/trunk/debian/README.source	2012-05-28 13:38:25 UTC (rev 1247)
+++ tcl8.6/trunk/debian/README.source	2012-05-28 14:21:44 UTC (rev 1248)
@@ -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, 20 Jul 2011 22:23:20 +0400

Modified: tcl8.6/trunk/debian/changelog
===================================================================
--- tcl8.6/trunk/debian/changelog	2012-05-28 13:38:25 UTC (rev 1247)
+++ tcl8.6/trunk/debian/changelog	2012-05-28 14:21:44 UTC (rev 1248)
@@ -1,10 +1,18 @@
-tcl8.6 (8.6.0~b2-2) UNRELEASED; urgency=low
+tcl8.6 (8.6.0~b2-2) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * Install library(3tcl), packagens(3tcl), pkgMkIndex(3tcl) and safe(3tcl)
+    manpages despite of upstream renaming them because they are referenced
+    from the other pages.
   * Don't break the build if tdbc headers aren't in the tarball (helps
     to build the package using sources from the upstream repository).
+  * Removed Chris Waters wrom the uploaders list (closes: #664113).
+  * 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>  Sun, 29 Jan 2012 11:32:25 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 28 May 2012 18:13:35 +0400
 
 tcl8.6 (8.6.0~b2-1) experimental; urgency=low
 

Modified: tcl8.6/trunk/debian/compat
===================================================================
--- tcl8.6/trunk/debian/compat	2012-05-28 13:38:25 UTC (rev 1247)
+++ tcl8.6/trunk/debian/compat	2012-05-28 14:21:44 UTC (rev 1248)
@@ -1 +1 @@
-5
+8

Modified: tcl8.6/trunk/debian/control
===================================================================
--- tcl8.6/trunk/debian/control	2012-05-28 13:38:25 UTC (rev 1247)
+++ tcl8.6/trunk/debian/control	2012-05-28 14:21:44 UTC (rev 1248)
@@ -2,9 +2,9 @@
 Section: libs
 Priority: optional
 Maintainer: Tcl/Tk Debian 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), zlib1g-dev, quilt
-Standards-Version: 3.9.2
+Uploaders: Sergei Golovan <sgolovan at debian.org>
+Build-Depends: debhelper (>= 8.0.0), dpkg-dev (>= 1.16.1~), zlib1g-dev
+Standards-Version: 3.9.3
 Homepage: http://www.tcl.tk/
 
 Package: tcl8.6
@@ -14,7 +14,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: tcl74 (<= 7.4p3-2)
 Provides: tclsh
-Suggests: tclreadline
+Suggests: tcl-tclreadline
 Description: Tcl (the Tool Command Language) v8.6 - run-time files
  Tcl is a powerful, easy to use, embeddable, cross-platform interpreted
  scripting language.  This package contains everything you need to run

Modified: tcl8.6/trunk/debian/patches/manpages.diff
===================================================================
--- tcl8.6/trunk/debian/patches/manpages.diff	2012-05-28 13:38:25 UTC (rev 1247)
+++ tcl8.6/trunk/debian/patches/manpages.diff	2012-05-28 14:21:44 UTC (rev 1248)
@@ -15,7 +15,7 @@
  ### Process Page to Create Target Pages
  ###
  
-+Specials="DString Thread Notifier RegExp"
++Specials="DString Thread Notifier RegExp library packagens pkgMkIndex safesock"
 +for n in $Specials; do
 +    if [ "$Name" = "$n" ] ; then
 +	Names="$n $Names"

Modified: tcl8.6/trunk/debian/rules
===================================================================
--- tcl8.6/trunk/debian/rules	2012-05-28 13:38:25 UTC (rev 1247)
+++ tcl8.6/trunk/debian/rules	2012-05-28 14:21:44 UTC (rev 1248)
@@ -1,130 +1,95 @@
 #!/usr/bin/make -f
-# debian/rules that uses debhelper.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+v = 8.6
+DIR = $(shell pwd)/debian/tmp
 
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-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.6
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS=-g -O0
-else
+ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 # See bug #446335 for -fno-unit-at-a-time
 ifeq ($(DEB_HOST_ARCH), hppa)
 # Disable stack checking for hppa (it doesn't work properly yet)
-CFLAGS=-g -O2 -fno-unit-at-a-time -DTCL_NO_STACK_CHECK=1
+CFLAGS += -fno-unit-at-a-time -DTCL_NO_STACK_CHECK=1
 else
-CFLAGS=-g -O2 -fno-unit-at-a-time
+CFLAGS += -fno-unit-at-a-time
 endif
 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
+%:
+	dh $@
 
-build: build-stamp
-build-stamp: patch-stamp
-	dh_testdir
+override_dh_auto_configure:
 	# So so ugly but it works...
 	touch generic/tclStubInit.c
-	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/tcltk/tcl$(v) /usr/lib" \
-	  CFLAGS="$(CFLAGS)" \
-	  ./configure --host=$(DEB_HOST_GNU_TYPE) \
-		      --build=$(DEB_BUILD_GNU_TYPE) \
-		      --prefix=/usr \
+	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/tcltk/tcl$(v) /usr/lib" \
+	CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+	dh_auto_configure -Dunix -- \
 		      --includedir=/usr/include/tcl$(v) \
 		      --enable-shared \
 		      --enable-threads \
 		      --enable-dll-unloading \
 		      --disable-rpath \
-		      --mandir=/usr/share/man \
-		      --enable-man-symlinks && \
-	  touch ../generic/tclStubInit.c && \
-	  $(MAKE)
-	# Build the static library.
+		      --enable-man-symlinks
+
+override_dh_auto_build:
+	touch generic/tclStubInit.c && \
+	$(MAKE) -C unix
+	# 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: patch-stamp
-	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 \
-		  TCL_MODULE_PATH="/usr/lib/tcltk /usr/share/tcltk" \
-		  install
-	# Fix up the modules.
+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 \
+			TCL_MODULE_PATH="/usr/lib/tcltk /usr/share/tcltk" \
+		install
+	# Fix up the modules
 	sed -i -e's:variable paths {}:variable paths {/usr/share/tcltk/tcl$(v)/tcl8}:' \
-	    debian/tmp/usr/share/tcltk/tcl$(v)/tm.tcl
-	install -d -m 755 `pwd`/debian/tmp/usr/share/tcltk/tcl$(v)/tcl8
-	mv debian/tmp/usr/share/tcltk/tcl8/*/* debian/tmp/usr/share/tcltk/tcl$(v)/tcl8
-	# 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
-	mkdir debian/tmp/usr/lib/tcl$(v)
-	mv debian/tmp/usr/lib/*.sh debian/tmp/usr/lib/tcl$(v)
-	cp unix/tcl.m4 debian/tmp/usr/share/tcltk/tcl$(v)/tcl.m4
-	rm -f debian/tmp/usr/share/tcltk/tcl$(v)/ldAix
+	    $(DIR)/usr/share/tcltk/tcl$(v)/tm.tcl
+	install -d -m 755 $(DIR)/usr/share/tcltk/tcl$(v)/tcl8
+	mv $(DIR)/usr/share/tcltk/tcl8/*/* $(DIR)/usr/share/tcltk/tcl$(v)/tcl8
+	# Fix up the libraries
+	cp unix/libtcl$(v).a $(DIR)/usr/lib
+	#mv $(DIR)/usr/lib/libtcl$(v).so $(DIR)/usr/lib/libtcl$(v).so.0
+	#ln -sf libtcl$(v).so.0 $(DIR)/usr/lib/libtcl$(v).so
+	install -d -m 755 $(DIR)/usr/lib/tcl$(v)
+	mv $(DIR)/usr/lib/*.sh $(DIR)/usr/lib/tcl$(v)
+	sh debian/filterconfig $(DIR)/usr/lib/tcl$(v)/tclConfig.sh
+	install -d -m 755 $(DIR)/usr/share/aclocal
+	cp unix/tcl.m4 $(DIR)/usr/share/aclocal/tcl$(v).m4
+	rm -f $(DIR)/usr/share/tcltk/tcl$(v)/ldAix
+	# Fix up the include files
+	install -d $(DIR)/usr/include/tcl$(v)/tcl-private/generic
+	cp generic/*.h $(DIR)/usr/include/tcl$(v)/tcl-private/generic
+	install -d $(DIR)/usr/include/tcl$(v)/tcl-private/unix
+	cp unix/*.h $(DIR)/usr/include/tcl$(v)/tcl-private/unix
+	install -d $(DIR)/usr/include/tcl$(v)/tcl-private/compat
+	cp compat/*.h $(DIR)/usr/include/tcl$(v)/tcl-private/compat
+	install -d $(DIR)/usr/include/tcl$(v)/tcl-private/libtommath
+	cp libtommath/*.h $(DIR)/usr/include/tcl$(v)/tcl-private/libtommath
+	-rm $(DIR)/usr/include/tcl$(v)/tdbc*.h
 	#
-	# 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
-	install -d debian/tmp/usr/include/tcl$(v)/tcl-private/libtommath
-	cp libtommath/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/libtommath
-	-rm debian/tmp/usr/include/tcl$(v)/tdbc*.h
-	#
 	# Fix up the manpages.
-	cd debian/tmp/usr/share/man/man1 && \
-	  cat tclsh.1 | sed -e 's/(n)/(3tcl)/g' | gzip -9 > tclsh$(v).1.gz && \
+	cd $(DIR)/usr/share/man/man1 && \
+	  cat tclsh.1 | sed -e 's/(n)/(3tcl)/g' > tclsh$(v).1 && \
 	  rm tclsh.1
-	cd debian/tmp/usr/share/man/man3 && \
+	cd $(DIR)/usr/share/man/man3 && \
 	  for f in *.[3n] ; do \
 	     f2=$$(echo $$f | sed -e 's/\.[3n]/.3tcl/') ; \
 	     if [ -L $$f ]; then \
 		l=$$(readlink -n $$f | sed -e 's/\.[3n]/.3tcl/') ; \
 		rm $$f ; \
-		ln -sf $$l.gz $$f2.gz ; \
+		ln -sf $$l $$f2 ; \
 	     else \
 		cat $$f | sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tcl/' \
 			       -e 's/\(Tk_[0-9A-Za-z]*\)(3)/\1(3tk)/g' \
@@ -135,59 +100,20 @@
 			       -e 's/winfo(n)/winfo(3tk)/g' \
 			       -e 's/(n)/(3tcl)/g' \
 			       -e "s/\\N'244'/\\[^o]/g" \
-			 | gzip -9 >$$f2.gz ; \
+			 >$$f2 ; \
 		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
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_movefiles -a
-	# now, fix up file locations for .m4
-	mv debian/tcl$(v)/usr/share/tcltk/tcl$(v)/tcl.m4 \
-	   debian/tcl$(v)-dev/usr/share/aclocal/tcl$(v).m4
-	sh debian/filterconfig \
-	   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
+override_dh_makeshlibs:
 	dh_makeshlibs -a -V 'tcl$(v) (>= 8.6.0~b1)' -XTcltest
-	dh_installdeb -a
+
+override_dh_shlibdeps:
 	dh_shlibdeps -a -ldebian/tcl$(v)/usr/lib
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
 
-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.6_8.6.0~b2.orig.tar.gz \
 	     http://prdownloads.sourceforge.net/tcl/tcl8.6b2-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.6/trunk/debian/source/format
===================================================================
--- tcl8.6/trunk/debian/source/format	                        (rev 0)
+++ tcl8.6/trunk/debian/source/format	2012-05-28 14:21:44 UTC (rev 1248)
@@ -0,0 +1 @@
+3.0 (quilt)

Deleted: tcl8.6/trunk/debian/tcl8.6-dev.files
===================================================================
--- tcl8.6/trunk/debian/tcl8.6-dev.files	2012-05-28 13:38:25 UTC (rev 1247)
+++ tcl8.6/trunk/debian/tcl8.6-dev.files	2012-05-28 14:21:44 UTC (rev 1248)
@@ -1,4 +0,0 @@
-usr/include
-usr/lib/*.a
-usr/lib/*.so
-usr/lib/tcl8.6/*.sh

Copied: tcl8.6/trunk/debian/tcl8.6-dev.install (from rev 1247, tcl8.6/trunk/debian/tcl8.6-dev.files)
===================================================================
--- tcl8.6/trunk/debian/tcl8.6-dev.install	                        (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6-dev.install	2012-05-28 14:21:44 UTC (rev 1248)
@@ -0,0 +1,5 @@
+usr/include
+usr/lib/*.a
+usr/lib/*.so
+usr/lib/tcl*/*.sh
+usr/share/aclocal/*.m4

Deleted: tcl8.6/trunk/debian/tcl8.6-doc.files
===================================================================
--- tcl8.6/trunk/debian/tcl8.6-doc.files	2012-05-28 13:38:25 UTC (rev 1247)
+++ tcl8.6/trunk/debian/tcl8.6-doc.files	2012-05-28 14:21:44 UTC (rev 1248)
@@ -1 +0,0 @@
-usr/share/man/man3

Copied: tcl8.6/trunk/debian/tcl8.6-doc.install (from rev 1247, tcl8.6/trunk/debian/tcl8.6-doc.files)
===================================================================
--- tcl8.6/trunk/debian/tcl8.6-doc.install	                        (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6-doc.install	2012-05-28 14:21:44 UTC (rev 1248)
@@ -0,0 +1 @@
+usr/share/man/man3

Deleted: tcl8.6/trunk/debian/tcl8.6.files
===================================================================
--- tcl8.6/trunk/debian/tcl8.6.files	2012-05-28 13:38:25 UTC (rev 1247)
+++ tcl8.6/trunk/debian/tcl8.6.files	2012-05-28 14:21:44 UTC (rev 1248)
@@ -1,5 +0,0 @@
-usr/bin
-usr/share/tcltk/tcl8
-usr/share/tcltk/tcl8.6
-usr/lib/*.so.*
-usr/share/man/man1

Copied: tcl8.6/trunk/debian/tcl8.6.install (from rev 1247, tcl8.6/trunk/debian/tcl8.6.files)
===================================================================
--- tcl8.6/trunk/debian/tcl8.6.install	                        (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6.install	2012-05-28 14:21:44 UTC (rev 1248)
@@ -0,0 +1,5 @@
+usr/bin
+usr/share/tcltk/tcl8
+usr/share/tcltk/tcl8.6
+usr/lib/*.so.*
+usr/share/man/man1

Deleted: tcl8.6/trunk/debian/tcl8.6.lintian-override
===================================================================
--- tcl8.6/trunk/debian/tcl8.6.lintian-override	2012-05-28 13:38:25 UTC (rev 1247)
+++ tcl8.6/trunk/debian/tcl8.6.lintian-override	2012-05-28 14:21:44 UTC (rev 1248)
@@ -1 +0,0 @@
-tcl8.6: package-name-doesnt-match-sonames

Copied: tcl8.6/trunk/debian/tcl8.6.lintian-overrides (from rev 1247, tcl8.6/trunk/debian/tcl8.6.lintian-override)
===================================================================
--- tcl8.6/trunk/debian/tcl8.6.lintian-overrides	                        (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6.lintian-overrides	2012-05-28 14:21:44 UTC (rev 1248)
@@ -0,0 +1 @@
+tcl8.6: package-name-doesnt-match-sonames

More information about the Pkg-tcltk-commits mailing list