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

Sat Jul 19 00:34:30 UTC 2008

Date: Saturday, July 19, 2008 @ 00:34:29
  Author: smcv
Revision: 5994

Add 16_disable_picins.dpatch, Suggest the necessary bits for rst2latex, add README.source

Added:
  packages/python-docutils/trunk/debian/README.source
  packages/python-docutils/trunk/debian/patches/16_disable_picins.dpatch
Modified:
  packages/python-docutils/trunk/debian/README.Debian
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/control
  packages/python-docutils/trunk/debian/patches/00list
Deleted:
  packages/python-docutils/trunk/debian/python-roman.override

Modified: packages/python-docutils/trunk/debian/README.Debian
===================================================================

--- packages/python-docutils/trunk/debian/README.Debian	2008-07-18 23:50:21 UTC (rev 5993)
+++ packages/python-docutils/trunk/debian/README.Debian	2008-07-19 00:34:29 UTC (rev 5994)
@@ -1,6 +1,12 @@
 python-docutils for Debian
 ==========================
 
+Processing rst2newlatex output
+------------------------------
+
+To process rst2newlatex output you'll need to have this package's
+Suggests installed.
+
 Integration with Emacs
 ----------------------
 

Added: packages/python-docutils/trunk/debian/README.source
===================================================================
--- packages/python-docutils/trunk/debian/README.source	                        (rev 0)
+++ packages/python-docutils/trunk/debian/README.source	2008-07-19 00:34:29 UTC (rev 5994)
@@ -0,0 +1,11 @@
+python-docutils package source
+==============================
+
+Generating debian/patches
+-------------------------
+
+The diffs in debian/patches are generated from the 'debian-0.5' git branch
+in alioth:~smcv/public_git/python-docutils.git, using git-format-patch.
+
+rsync the repository (rather than checking it out with git) if you want
+the git-svn metadata (to pull upstream versions into the 'upstream' branch) too.

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2008-07-18 23:50:21 UTC (rev 5993)
+++ packages/python-docutils/trunk/debian/changelog	2008-07-19 00:34:29 UTC (rev 5994)
@@ -12,10 +12,15 @@
     12_more_usrbinenv.dpatch
   * 13_nodes_namespace.dpatch: removed, I have no idea what it was doing there
     in the first place...
+  * 16_disable_picins.dpatch: avoid referencing a non-free LaTeX style
+    (which, as far as I can tell, served no purpose anyway)
   * All other patches updated and re-diffed
   * Mentioned s5 in README.Debian (closes: #490139)
+  * Added Suggests: on the necessary texlive packages to use rst2newlatex
+    output, and mentioned them in README.Debian
   * Switched to my Debian email address in Uploaders
   * Removed lintian override for false-positive GPL detection in -roman
+  * Added a README.source explaining where the patches come from
 
  -- Simon McVittie <smcv at debian.org>  Fri, 18 Apr 2008 15:58:48 +0100
 

Modified: packages/python-docutils/trunk/debian/control
===================================================================
--- packages/python-docutils/trunk/debian/control	2008-07-18 23:50:21 UTC (rev 5993)
+++ packages/python-docutils/trunk/debian/control	2008-07-19 00:34:29 UTC (rev 5994)
@@ -16,6 +16,7 @@
 Architecture: all
 Depends: ${python:Depends}, python-roman
 Provides: ${python:Provides}
+Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french
 XB-Python-Version: ${python:Versions}
 Description: Utilities for the documentation of Python modules
  The purpose of the Docutils project is to create a set of tools for

Modified: packages/python-docutils/trunk/debian/patches/00list
===================================================================
--- packages/python-docutils/trunk/debian/patches/00list	2008-07-18 23:50:21 UTC (rev 5993)
+++ packages/python-docutils/trunk/debian/patches/00list	2008-07-19 00:34:29 UTC (rev 5994)
@@ -3,3 +3,4 @@
 12_more_usrbinenv.dpatch
 14_distutils_setup.dpatch
 15_emacs_debian_paths.dpatch
+16_disable_picins.dpatch

Added: packages/python-docutils/trunk/debian/patches/16_disable_picins.dpatch
===================================================================
--- packages/python-docutils/trunk/debian/patches/16_disable_picins.dpatch	                        (rev 0)
+++ packages/python-docutils/trunk/debian/patches/16_disable_picins.dpatch	2008-07-19 00:34:29 UTC (rev 5994)
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 16_disable_picins.dpatch by Simon McVittie <smcv at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove reference to picins from newlatex2e's base.tex
+
+ at DPATCH@
+
+From ddb489b024dabe4607acc899bc3b8c525689bd25 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv at debian.org>
+Date: Sat, 19 Jul 2008 01:14:22 +0100
+Subject: [PATCH] Remove reference to picins from newlatex2e's base.tex
+
+picins.sty is non-free and is not shipped by Debian. The only reference I
+can find to it is in a "sidebar" command defined in base.tex, which is not
+used anywhere else in base.tex or __init__.py, so hopefully removing it
+won't hurt.
+---
+ docutils/writers/newlatex2e/base.tex |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/docutils/writers/newlatex2e/base.tex b/docutils/writers/newlatex2e/base.tex
+index 4955e60..64a4d4f 100644
+--- a/docutils/writers/newlatex2e/base.tex
++++ b/docutils/writers/newlatex2e/base.tex
+@@ -81,8 +81,6 @@
+   \usepackage{color}
+   % Get \textnhtt macro (non-hyphenating type writer).
+   \usepackage{hyphenat}
+-  % For sidebars.
+-  \usepackage{picins}
+   % We use longtable to create tables.
+   \usepackage{longtable}
+   % Images.
+@@ -801,7 +799,6 @@
+ % Width.
+ \Dprovidelength{\Dsidebarwidth}{0.45\linewidth}
+ \providecommand{\DNsidebar}[1]{
+-  \parpic[\Dsidebarposition]{%
+     \begin{minipage}[t]{\Dsidebarwidth}%
+       % Doing this with nested minipages is ugly, but I haven't found
+       % another way to place vertical space before and after the fbox.
+@@ -818,7 +815,6 @@
+       }%
+       \vspace{\Dsidebarvmargin}%
+     \end{minipage}%
+-  }%
+ }
+ 
+ 
+-- 
+1.5.6.2
+

Deleted: packages/python-docutils/trunk/debian/python-roman.override
===================================================================
--- packages/python-docutils/trunk/debian/python-roman.override	2008-07-18 23:50:21 UTC (rev 5993)
+++ packages/python-docutils/trunk/debian/python-roman.override	2008-07-19 00:34:29 UTC (rev 5994)
@@ -1 +0,0 @@
-python-roman: copyright-should-refer-to-common-license-file-for-gpl


