[Pkg-tcltk-commits] r632 - tcllib/trunk/debian

Sun Jun 8 11:31:45 UTC 2008

Author: sgolovan-guest
Date: 2008-06-08 11:31:44 +0000 (Sun, 08 Jun 2008)
New Revision: 632

Removed:
   tcllib/trunk/debian/linda.override
Modified:
   tcllib/trunk/debian/changelog
   tcllib/trunk/debian/control
   tcllib/trunk/debian/copyright
   tcllib/trunk/debian/dirs
   tcllib/trunk/debian/doc-base
   tcllib/trunk/debian/rules
Log:
[tcllib]
  * Protected quilt invocation in debian/rules to make it possible to convert
    bwidget source package to 3.0 (quilt) format (closes: #484924).
  * Cleaned up debian/rules.
  * Bumped standards version to 3.7.3.
  * Removed empty /usr/lib directory from the binary tcllib package.
  * Removed extra leading spaces and changed section name to Programming in
    doc-base register file.
  * Fixed copyright statement in debian/copyright.
  * Removed linda override file.


Modified: tcllib/trunk/debian/changelog
===================================================================

--- tcllib/trunk/debian/changelog	2008-06-08 10:38:15 UTC (rev 631)
+++ tcllib/trunk/debian/changelog	2008-06-08 11:31:44 UTC (rev 632)
@@ -1,8 +1,16 @@
-tcllib (1.10-dfsg-3) UNRELEASED; urgency=low
+tcllib (1.10-dfsg-3) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Protected quilt invocation in debian/rules to make it possible to convert
+    bwidget source package to 3.0 (quilt) format (closes: #484924).
+  * Cleaned up debian/rules.
+  * Bumped standards version to 3.7.3.
+  * Removed empty /usr/lib directory from the binary tcllib package.
+  * Removed extra leading spaces and changed section name to Programming in
+    doc-base register file.
+  * Fixed copyright statement in debian/copyright.
+  * Removed linda override file.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 15 Nov 2007 20:25:10 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 08 Jun 2008 15:00:19 +0400
 
 tcllib (1.10-dfsg-2) unstable; urgency=low
 

Modified: tcllib/trunk/debian/control
===================================================================
--- tcllib/trunk/debian/control	2008-06-08 10:38:15 UTC (rev 631)
+++ tcllib/trunk/debian/control	2008-06-08 11:31:44 UTC (rev 632)
@@ -5,7 +5,7 @@
 Uploaders: Chris Waters <xtifr at debian.org>, Sergei Golovan <sgolovan at debian.org>
 Build-Depends: debhelper (>= 5.0.0), quilt
 Build-Depends-Indep: tcl-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 Homepage: http://tcl.activestate.com/software/tcllib/
 
 Package: tcllib

Modified: tcllib/trunk/debian/copyright
===================================================================
--- tcllib/trunk/debian/copyright	2008-06-08 10:38:15 UTC (rev 631)
+++ tcllib/trunk/debian/copyright	2008-06-08 11:31:44 UTC (rev 632)
@@ -2,12 +2,13 @@
 from sources obtained from:
 http://sourceforge.net/project/showfiles.php?group_id=12883
 
+Copyright 2000-2007 Ajuba Solutions and other parties.
+
 Copyright:
 
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., Scriptics Corporation,
-and other parties.  The following terms apply to all files associated
-with the software unless explicitly disclaimed in individual files.
+This software is copyrighted by Ajuba Solutions and other parties.
+The following terms apply to all files associated with the software unless
+explicitly disclaimed in individual files.
 
 The authors hereby grant permission to use, copy, modify, distribute,
 and license this software and its documentation for any purpose, provided

Modified: tcllib/trunk/debian/dirs
===================================================================
--- tcllib/trunk/debian/dirs	2008-06-08 10:38:15 UTC (rev 631)
+++ tcllib/trunk/debian/dirs	2008-06-08 11:31:44 UTC (rev 632)
@@ -2,4 +2,3 @@
 usr/share/man
 usr/share/tcltk
 usr/share/doc/tcllib
-usr/share/linda/overrides

Modified: tcllib/trunk/debian/doc-base
===================================================================
--- tcllib/trunk/debian/doc-base	2008-06-08 10:38:15 UTC (rev 631)
+++ tcllib/trunk/debian/doc-base	2008-06-08 11:31:44 UTC (rev 632)
@@ -2,9 +2,9 @@
 Title: Tcllib HTML Documentation
 Author: Authors of the Tcllib modules
 Abstract: This is a documentation for Tcllib - the standard Tcl library.
-    It contains documentation on individual Tcllib modules, supplied
-    with upstream distribution.
-Section: Apps/Programming
+ It contains documentation on individual Tcllib modules, supplied
+ with upstream distribution.
+Section: Programming
 
 Format: HTML
 Index: /usr/share/doc/tcllib/index.html

Deleted: tcllib/trunk/debian/linda.override
===================================================================
--- tcllib/trunk/debian/linda.override	2008-06-08 10:38:15 UTC (rev 631)
+++ tcllib/trunk/debian/linda.override	2008-06-08 11:31:44 UTC (rev 632)
@@ -1,2 +0,0 @@
-Tag: non-compressed-changelog
-Data: /usr/share/tcllib*

Modified: tcllib/trunk/debian/rules
===================================================================
--- tcllib/trunk/debian/rules	2008-06-08 10:38:15 UTC (rev 631)
+++ tcllib/trunk/debian/rules	2008-06-08 11:31:44 UTC (rev 632)
@@ -13,62 +13,66 @@
 
 unpatch:
 	dh_testdir
-	-quilt pop -a
+	quilt pop -a || test $$? = 2
 	rm -rf patch-stamp .pc
 
 patch: patch-stamp
 patch-stamp:
 	dh_testdir
-	quilt push -a
+	quilt push -a || test $$? = 2
 	touch patch-stamp
 
-
 # build mostly covers docs and such
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
 	./configure --prefix=/usr --mandir=$(mandir)
 	$(MAKE) html-doc
-
+	#
 	touch build-stamp
 
 clean: clean-patched unpatch
-clean-patched:
 	dh_testdir
+	dh_testroot
+	dh_clean
 
+clean-patched: patch-stamp
+	dh_testdir
+	#
 	[ ! -f Makefile ] || $(MAKE) distclean
-
+	#
 	rm -f build-stamp install-stamp
-	dh_clean config.cache config.status
+	rm -f config.cache config.status
 
 install: build install-stamp
 install-stamp: 
 	dh_testdir
 	dh_testroot
 	dh_installdirs
-
+	#
 	$(MAKE) DESTDIR=$(destdir) install 
-
+	#
 	# install the mpexpand script, which doesn't otherwise get installed.
 	install -p -m 755 modules/doctools/mpexpand $(destdir)/usr/bin
-
+	#
 	# now set the permissions properly, since the Makefile doesn't bother
 	cd $(destdir)/usr/lib && \
 		find . -type f -print | xargs chmod 644
-
+	#
 	# move scripts to /usr/share
 	mv $(destdir)/usr/lib/* $(destdir)/usr/share/tcltk
-
+	rmdir $(destdir)/usr/lib
+	#
 	# rename the man pages into section 3
 	mv $(destdir)$(mandir)/mann $(destdir)$(mandir)/man3
-
+	#
 	# move the man pages for mpexpand, dtplite, page and mpexpand to section 1
 	mkdir $(destdir)$(mandir)/man1
 	mv $(destdir)$(mandir)/man3/mpexpand.n $(destdir)$(mandir)/man1
 	mv $(destdir)$(mandir)/man3/dtplite.n $(destdir)$(mandir)/man1
 	mv $(destdir)$(mandir)/man3/page.n $(destdir)$(mandir)/man1
 	mv $(destdir)$(mandir)/man3/tcldocstrip.n $(destdir)$(mandir)/man1
-
+	#
 	# cleanup manpages
 	cd $(destdir)$(mandir)/man1 && \
 	  for f in *.n ; do \
@@ -79,7 +83,7 @@
 		$$f > `basename $$f .n`.1; \
 	    rm $$f; \
 	  done
-
+	#
 	cd $(destdir)$(mandir)/man3 && \
 	  for f in *.n ; do \
 	    sed -e'/\.so man.macros/ d' \
@@ -97,9 +101,9 @@
 		$$f > `basename $$f .n`.3tcl; \
 	    rm $$f; \
 	  done
-
+	#
 	touch install-stamp
-
+	#
 	# cleanup docs
 	cd doc/html && \
 	  for f in *.html ; do \
@@ -107,7 +111,7 @@
 	    	-e's/math::roman()/math::roman(3tcl)/' \
 	    	-e's/(n)/(3tcl)/g' $$f; \
 	  done
-
+	#
 	# generate documentation index
 	tclsh debian/gen_index.tcl doc/html >$(destdir)$(docdir)/index.html
 
@@ -122,9 +126,6 @@
 	chmod 644 $(destdir)$(exampledir)/logger/snit-logger.tcl
 	chmod 644 $(destdir)$(exampledir)/logger/xotcl-logger.tcl
 	chmod 644 $(destdir)$(exampledir)/mapproj/*
-	# install linda overrides
-	install -m 644 debian/linda.override \
-	    $(destdir)/usr/share/linda/overrides/tcllib
 	dh_installchangelogs ChangeLog
 	dh_link
 	dh_compress -Xusr/share/doc/tcllib/examples/ \


