[Pkg-tcltk-commits] r930 - tk8.4/trunk/debian

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2009-09-05 08:18:59 +0000 (Sat, 05 Sep 2009)
New Revision: 930

Added:
   tk8.4/trunk/debian/README.source
Modified:
   tk8.4/trunk/debian/changelog
   tk8.4/trunk/debian/control
   tk8.4/trunk/debian/rules
   tk8.4/trunk/debian/watch
Log:
[tk8.4]
  * Removed Anselm Lingnau from uploaders list (closes: #540858).
  * Protected quilt calls in debian/rules to make conversion to source
    format 3.0 (quilt) possible (closes: #484920).
  * Added README.source which describes how to work with quilt.
  * Use SourceForge redirector in debian/watch uscan control file.
  * Bumped standards version to 3.8.3.


Added: tk8.4/trunk/debian/README.source
===================================================================
--- tk8.4/trunk/debian/README.source	                        (rev 0)
+++ tk8.4/trunk/debian/README.source	2009-09-05 08:18:59 UTC (rev 930)
@@ -0,0 +1,8 @@
+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	2009-09-05 07:57:15 UTC (rev 929)
+++ tk8.4/trunk/debian/changelog	2009-09-05 08:18:59 UTC (rev 930)
@@ -1,8 +1,13 @@
-tk8.4 (8.4.19-4) UNRELEASED; urgency=low
+tk8.4 (8.4.19-4) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Removed Anselm Lingnau from uploaders list (closes: #540858).
+  * Protected quilt calls in debian/rules to make conversion to source
+    format 3.0 (quilt) possible (closes: #484920).
+  * Added README.source which describes how to work with quilt.
+  * Use SourceForge redirector in debian/watch uscan control file.
+  * Bumped standards version to 3.8.3.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 01 Mar 2009 13:18:57 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 05 Sep 2009 12:12:26 +0400
 
 tk8.4 (8.4.19-3) unstable; urgency=low
 

Modified: tk8.4/trunk/debian/control
===================================================================
--- tk8.4/trunk/debian/control	2009-09-05 07:57:15 UTC (rev 929)
+++ tk8.4/trunk/debian/control	2009-09-05 08:18:59 UTC (rev 930)
@@ -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>, Anselm Lingnau <lingnau at debian.org>, Sergei Golovan <sgolovan at 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.8.0
+Standards-Version: 3.8.3
 Homepage: http://www.tcl.tk/
 
 Package: tk8.4
@@ -21,18 +21,6 @@
  This package contains everything you need to run Tk (wish) scripts
  and Tk-enabled apps.
 
-Package: tk8.4-doc
-Section: doc
-Priority: optional
-Architecture: all
-Suggests: tk8.4
-Conflicts: tkdoc, tk8.3-doc, tk8.5-doc
-Provides: tkdoc
-Description: Tk toolkit for Tcl and X11, v8.4 - manual pages
- Tk is a cross-platform graphical toolkit which provides the Motif
- look-and-feel and is implemented using the Tcl scripting language.
- This package contains the manual pages for the Tk commands.
-
 Package: tk8.4-dev
 Section: devel
 Priority: optional
@@ -44,3 +32,15 @@
  look-and-feel and is implemented using the Tcl scripting language.
  This package contains the headers and libraries needed to extend
  or embed Tk.
+
+Package: tk8.4-doc
+Section: doc
+Priority: optional
+Architecture: all
+Suggests: tk8.4
+Conflicts: tkdoc, tk8.3-doc
+Provides: tkdoc
+Description: Tk toolkit for Tcl and X11, v8.4 - manual pages
+ Tk is a cross-platform graphical toolkit which provides the Motif
+ look-and-feel and is implemented using the Tcl scripting language.
+ This package contains the manual pages for the Tk commands.

Modified: tk8.4/trunk/debian/rules
===================================================================
--- tk8.4/trunk/debian/rules	2009-09-05 07:57:15 UTC (rev 929)
+++ tk8.4/trunk/debian/rules	2009-09-05 08:18:59 UTC (rev 930)
@@ -20,13 +20,13 @@
 
 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: build-stamp

Modified: tk8.4/trunk/debian/watch
===================================================================
--- tk8.4/trunk/debian/watch	2009-09-05 07:57:15 UTC (rev 929)
+++ tk8.4/trunk/debian/watch	2009-09-05 08:18:59 UTC (rev 930)
@@ -3,4 +3,4 @@
 # Compulsory line, this is a version 3 file
 version=3
 
-http://heanet.dl.sourceforge.net/sourceforge/tcl/tk(8\.4\.[\d.]*)(?:-src)?.tar.gz
+http://sf.net/tcl/tk(8\.4\.[\d.]*)(?:-src)?.tar.gz