[Python-modules-commits] r17294 - in packages/python-docutils/trunk/debian (12 files)

Sun Jun 5 23:18:12 UTC 2011

Date: Sunday, June 5, 2011 @ 23:18:11
  Author: jwilk
Revision: 17294

Split new binary packages: docutils-doc (documentation), docutils-common (data files).

Added:
  packages/python-docutils/trunk/debian/docutils-common.copyright
  packages/python-docutils/trunk/debian/docutils-common.install
  packages/python-docutils/trunk/debian/docutils-doc.copyright
  packages/python-docutils/trunk/debian/docutils-doc.doc-base
    (from rev 17290, packages/python-docutils/trunk/debian/python-docutils.doc-base)
  packages/python-docutils/trunk/debian/docutils-doc.install
  packages/python-docutils/trunk/debian/docutils-doc.links
  packages/python-docutils/trunk/debian/docutils-doc.preinst
Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/control
  packages/python-docutils/trunk/debian/python-docutils.install
  packages/python-docutils/trunk/debian/rules
Deleted:
  packages/python-docutils/trunk/debian/python-docutils.doc-base

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================

--- packages/python-docutils/trunk/debian/changelog	2011-06-05 21:56:35 UTC (rev 17293)
+++ packages/python-docutils/trunk/debian/changelog	2011-06-05 23:18:11 UTC (rev 17294)
@@ -11,8 +11,12 @@
   * Fix patch headers to be in line with DEP-3.
   * Remove files created by the test suite in the clean target.
   * Move all data files to /usr/share/docutils/.
+  * Split new binary packages: docutils-doc (documentation), docutils-common
+    (data files).
+    + /usr/share/doc/python-docutils/docs used to be a directory, but is now a
+      symlink. Add a preinst snippet to deal with this situation.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 Jun 2011 23:38:05 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Mon, 06 Jun 2011 00:55:50 +0200
 
 python-docutils (0.7-2) unstable; urgency=low
 

Modified: packages/python-docutils/trunk/debian/control
===================================================================
--- packages/python-docutils/trunk/debian/control	2011-06-05 21:56:35 UTC (rev 17293)
+++ packages/python-docutils/trunk/debian/control	2011-06-05 23:18:11 UTC (rev 17294)
@@ -20,11 +20,13 @@
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
          python-roman,
+         docutils-common (= ${source:Version})
 Recommends: python-imaging,
             python-pygments,
             libpaper-utils,
             python-lxml,            
-            python (>= 2.5) | python-elementtree
+            python (>= 2.5) | python-elementtree,
+            docutils-doc (= ${source:Version})
 Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french
 Provides: docutils-writer-manpage,
           python-odtwriter,
@@ -47,9 +49,34 @@
  XML, and TeX.
  .
  The package includes the reStructuredText parser, the Python
- Docstring Processing System project, and documentation in HTML and
- (gzipped) reST formats.
+ Docstring Processing System project. 
 
+Package: docutils-common
+Architecture: all
+Depends: ${misc:Depends}, 
+Recommends: python-docutils
+Breaks: python-docutils (<< 0.7-3~)
+Replaces: python-docutils (<< 0.7-3~)
+Description: utilities for the documentation of Python modules - data files
+ The purpose of the Docutils project is to create a set of tools for
+ processing plaintext documentation into useful formats, such as HTML,
+ XML, and TeX.
+ .
+ This package includes data files.
+
+Package: docutils-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: python-docutils (<< 0.7-3~)
+Replaces: python-docutils (<< 0.7-3~)
+Description: utilities for the documentation of Python modules - documentation
+ The purpose of the Docutils project is to create a set of tools for
+ processing plaintext documentation into useful formats, such as HTML,
+ XML, and TeX.
+ .
+ This package includes documentation in HTML and (gzipped) reST formats.
+
 Package: python-roman
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}

Added: packages/python-docutils/trunk/debian/docutils-common.copyright
===================================================================
--- packages/python-docutils/trunk/debian/docutils-common.copyright	                        (rev 0)
+++ packages/python-docutils/trunk/debian/docutils-common.copyright	2011-06-05 23:18:11 UTC (rev 17294)
@@ -0,0 +1 @@
+link python-docutils.copyright
\ No newline at end of file


Property changes on: packages/python-docutils/trunk/debian/docutils-common.copyright
___________________________________________________________________
Added: svn:special
   + *

Added: packages/python-docutils/trunk/debian/docutils-common.install
===================================================================
--- packages/python-docutils/trunk/debian/docutils-common.install	                        (rev 0)
+++ packages/python-docutils/trunk/debian/docutils-common.install	2011-06-05 23:18:11 UTC (rev 17294)
@@ -0,0 +1,2 @@
+/usr/share/docutils/
+tools/editors/emacs/rst.el usr/share/emacs/site-lisp

Added: packages/python-docutils/trunk/debian/docutils-doc.copyright
===================================================================
--- packages/python-docutils/trunk/debian/docutils-doc.copyright	                        (rev 0)
+++ packages/python-docutils/trunk/debian/docutils-doc.copyright	2011-06-05 23:18:11 UTC (rev 17294)
@@ -0,0 +1 @@
+link python-docutils.copyright
\ No newline at end of file


Property changes on: packages/python-docutils/trunk/debian/docutils-doc.copyright
___________________________________________________________________
Added: svn:special
   + *

Copied: packages/python-docutils/trunk/debian/docutils-doc.doc-base (from rev 17290, packages/python-docutils/trunk/debian/python-docutils.doc-base)
===================================================================
--- packages/python-docutils/trunk/debian/docutils-doc.doc-base	                        (rev 0)
+++ packages/python-docutils/trunk/debian/docutils-doc.doc-base	2011-06-05 23:18:11 UTC (rev 17294)
@@ -0,0 +1,19 @@
+Document: docutils-documentation
+Title: Docutils Project Documentation
+Author:
+  Martin Blais, Dethe Elza, David Goodger, Engelbert Gruber, Richard Jones,
+  Dave Kuhlman, Chris Liechti, Guenter Milde, Guido van Rossum, Janet Swisher,
+  Lea Wiemann
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/docutils-doc/docs/index.html
+Files:
+  /usr/share/doc/docutils-doc/docs/*/*.html
+  /usr/share/doc/docutils-doc/docs/*/*/*.html
+
+Format: Text
+Index: /usr/share/doc/python-docutils/docs/index.txt.gz
+Files:
+  /usr/share/doc/docutils-doc/docs/*/*.txt /usr/share/doc/docutils-doc/docs/*/*/*.txt.gz
+  /usr/share/doc/docutils-doc/docs/*/*.txt /usr/share/doc/docutils-doc/docs/*/*/*.txt.gz

Added: packages/python-docutils/trunk/debian/docutils-doc.install
===================================================================
Added: packages/python-docutils/trunk/debian/docutils-doc.links
===================================================================
--- packages/python-docutils/trunk/debian/docutils-doc.links	                        (rev 0)
+++ packages/python-docutils/trunk/debian/docutils-doc.links	2011-06-05 23:18:11 UTC (rev 17294)
@@ -0,0 +1,2 @@
+/usr/share/doc/docutils-doc/docs /usr/share/doc/python-docutils/docs
+/usr/share/doc/docutils-doc/HISTORY.txt /usr/share/doc/docutils-doc/changelog

Added: packages/python-docutils/trunk/debian/docutils-doc.preinst
===================================================================
--- packages/python-docutils/trunk/debian/docutils-doc.preinst	                        (rev 0)
+++ packages/python-docutils/trunk/debian/docutils-doc.preinst	2011-06-05 23:18:11 UTC (rev 17294)
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+# TODO: Remove this snippet and wheezy release.
+
+# dpkg cannot replace directory with a symlink to a directory:
+docs=/usr/share/doc/python-docutils/docs
+if ! [ -s $docs ] && [ -d $docs ]
+then
+	rm -rf $docs/
+fi
+unset docs
+
+#DEBHELPER#

Deleted: packages/python-docutils/trunk/debian/python-docutils.doc-base
===================================================================
--- packages/python-docutils/trunk/debian/python-docutils.doc-base	2011-06-05 21:56:35 UTC (rev 17293)
+++ packages/python-docutils/trunk/debian/python-docutils.doc-base	2011-06-05 23:18:11 UTC (rev 17294)
@@ -1,19 +0,0 @@
-Document: docutils-documentation
-Title: Docutils Project Documentation
-Author:
-  Martin Blais, Dethe Elza, David Goodger, Engelbert Gruber, Richard Jones,
-  Dave Kuhlman, Chris Liechti, Guenter Milde, Guido van Rossum, Janet Swisher,
-  Lea Wiemann
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/python-docutils/docs/index.html
-Files:
-  /usr/share/doc/python-docutils/docs/*/*.html
-  /usr/share/doc/python-docutils/docs/*/*/*.html
-
-Format: Text
-Index: /usr/share/doc/python-docutils/docs/index.txt.gz
-Files:
-  /usr/share/doc/python-docutils/docs/*/*.txt /usr/share/doc/python-docutils/docs/*/*/*.txt.gz
-  /usr/share/doc/python-docutils/docs/*/*.txt /usr/share/doc/python-docutils/docs/*/*/*.txt.gz

Modified: packages/python-docutils/trunk/debian/python-docutils.install
===================================================================
--- packages/python-docutils/trunk/debian/python-docutils.install	2011-06-05 21:56:35 UTC (rev 17293)
+++ packages/python-docutils/trunk/debian/python-docutils.install	2011-06-05 23:18:11 UTC (rev 17294)
@@ -1,6 +1,4 @@
 /usr/bin/*
 /usr/lib/python*.*/*-packages/docutils*.egg-info
 /usr/lib/python*.*/*-packages/docutils
-/usr/share/docutils/
-tools/editors/emacs/rst.el usr/share/emacs/site-lisp
 debian/50python-docutils.el etc/emacs/site-start.d

Modified: packages/python-docutils/trunk/debian/rules
===================================================================
--- packages/python-docutils/trunk/debian/rules	2011-06-05 21:56:35 UTC (rev 17293)
+++ packages/python-docutils/trunk/debian/rules	2011-06-05 23:18:11 UTC (rev 17294)
@@ -94,15 +94,18 @@
 	: # Install documentation
 	rm -f $(d)/usr/share/doc/$(p)/COPYING[-.]*
 	set -e && ( cd docs; find . -name SCCS -prune -o -type d -print ) | \
-		while read f ; do install -d $(d)/usr/share/doc/$(p)/docs/$$f ; done
+		while read f ; do install -d debian/docutils-doc/usr/share/doc/docutils-doc/docs/$$f ; done
 	set -e && ( cd docs; find . -name SCCS -prune -o -type f -print ) | \
-		while read f ; do install -o root -m 755 docs/$$f $(d)/usr/share/doc/$(p)/docs/$$f ; done
+		while read f ; do install -o root -m 755 docs/$$f debian/docutils-doc/usr/share/doc/docutils-doc/docs/$$f ; done
 
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs *.txt *.html -XCOPYING
+	dh_installdocs *.txt -XCOPYING
+	dh_installdocs -p docutils-doc *.txt *.html -XCOPYING
+	mkdir -p debian/docutils-doc/usr/share/doc/python-docutils/
+	cd debian/docutils-doc/usr/share/doc/python-docutils/ && ln -s ../docutils-doc/*.html .
 	dh_install -i
 	dh_lintian
 	dh_pysupport


