[Python-modules-commits] r10157 - in packages/ldaptor/trunk/debian (4 files)

[jandd at users.alioth.debian.org]

    Date: Wednesday, October 21, 2009 @ 09:45:09
  Author: jandd
Revision: 10157

add fix for #545663 by calling dia with different parameters
build still broken due to trial call with broken module installations

Added:
  packages/ldaptor/trunk/debian/patches/03_fix_dia_invocation_545663.dpatch
Modified:
  packages/ldaptor/trunk/debian/changelog
  packages/ldaptor/trunk/debian/control
  packages/ldaptor/trunk/debian/patches/00list

Modified: packages/ldaptor/trunk/debian/changelog
===================================================================
--- packages/ldaptor/trunk/debian/changelog	2009-10-20 21:04:58 UTC (rev 10156)
+++ packages/ldaptor/trunk/debian/changelog	2009-10-21 09:45:09 UTC (rev 10157)
@@ -3,6 +3,9 @@
   * add debian/patches/02_fix_526522.dpatch:
     - fixes the reason of the traceback generated by ldaptor-ldap2passwd
       --help (Closes: #526522)
+  * add debian/patches/03_fix_dia_invocation_545663.dpatch:
+    - fixes invocation of dia to generate images during doc build in
+      headless environments (Closes: #545663)
   * debian/changelog:
     - fix spelling error (fixes lintian warning)
   * debian/README.source:
@@ -10,7 +13,7 @@
       tarball
   * debian/control:
     - change to d.o email address
-    - update Standards-Version to 3.8.2 (no changes needed)
+    - update Standards-Version to 3.8.3 (no changes needed)
   * debian/ldaptor-ldap2passwd.1, debian/ldaptor-find-server.1,
     debian/ldaptor-ldap2dnszones.1, debian/ldaptor-ldap2pdns.1,
     debian/ldaptor-getfreenumber.1, debian/ldaptor-passwd.1,

Modified: packages/ldaptor/trunk/debian/control
===================================================================
--- packages/ldaptor/trunk/debian/control	2009-10-20 21:04:58 UTC (rev 10156)
+++ packages/ldaptor/trunk/debian/control	2009-10-21 09:45:09 UTC (rev 10157)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>, Jan Dittberner <jandd at debian.org>
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Build-Depends-Indep: docbook-slides (>= 3.2.0), xsltproc,
  source-highlight, python-epydoc, dia (>= 0.93-2),
  python-twisted-core, python-twisted-names, python-twisted-mail,

Modified: packages/ldaptor/trunk/debian/patches/00list
===================================================================
--- packages/ldaptor/trunk/debian/patches/00list	2009-10-20 21:04:58 UTC (rev 10156)
+++ packages/ldaptor/trunk/debian/patches/00list	2009-10-21 09:45:09 UTC (rev 10157)
@@ -1,2 +1,3 @@
 01_restore_pristine_code
 02_fix_526522
+03_fix_dia_invocation_545663

Added: packages/ldaptor/trunk/debian/patches/03_fix_dia_invocation_545663.dpatch
===================================================================
--- packages/ldaptor/trunk/debian/patches/03_fix_dia_invocation_545663.dpatch	                        (rev 0)
+++ packages/ldaptor/trunk/debian/patches/03_fix_dia_invocation_545663.dpatch	2009-10-21 09:45:09 UTC (rev 10157)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03fix_dia_invocation_545663.dpatch by Jan Dittberner <jandd at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes the invocation of dia for diagramm generation in a headless 
+## DP: environment
+
+ at DPATCH@
+
+--- ldaptor-0.4.3.orig/doc/Makefile	2009-10-21 10:12:44.000000000 +0200
++++ ldaptor-0.4.3/doc/Makefile	2009-10-21 10:14:10.000000000 +0200
+@@ -129,7 +129,7 @@
+ 		'$(@D)'/foil*.html
+ 
+ %.dia.png: %.dia
+-	dia -t png-libart --export=$@.tmp $<
++	dia -n -t cairo-alpha-png --export=$@.tmp $<
+ 	mv $@.tmp $@
+ 
+ api:


Property changes on: packages/ldaptor/trunk/debian/patches/03_fix_dia_invocation_545663.dpatch
___________________________________________________________________
Added: svn:executable
   + *