r308 - in zope-attachmentfield/trunk: . debian

[Jérémy Bobbio]

Author: lunar-guest
Date: 2006-10-13 21:05:03 +0000 (Fri, 13 Oct 2006)
New Revision: 308

Removed:
   zope-attachmentfield/trunk/debian/patches/
Modified:
   zope-attachmentfield/trunk/OOAttachment.py
   zope-attachmentfield/trunk/debian/changelog
   zope-attachmentfield/trunk/debian/control
   zope-attachmentfield/trunk/debian/rules
   zope-attachmentfield/trunk/ooconverter.py
Log:
Move away from dpatch in favor of real VCS features.


Modified: zope-attachmentfield/trunk/OOAttachment.py
===================================================================
--- zope-attachmentfield/trunk/OOAttachment.py	2006-10-13 20:59:21 UTC (rev 307)
+++ zope-attachmentfield/trunk/OOAttachment.py	2006-10-13 21:05:03 UTC (rev 308)
@@ -158,6 +158,11 @@
     Log(LOG_WARNING, """libxml2 or libxslt not available. Under windows, download it at http://users.skynet.be/sbi/libxml-python/
     Open-Office indexing will be disabled.""")
 else:
-    from ooconverter import oo_to_html
-    AttachmentHandler.registerHandler(OOAttachment)
-
+    try:
+        from ooconverter import oo_to_html
+    except libxml2.parserError, e:
+        Log(LOG_WARNING, "Error while reading OpenOffice.org conversion stylesheet " +
+                         "(Is the openoffice.org-common package installed?). " +
+                         "OpenOffice.org indexing will be disabled.")
+    else:
+        AttachmentHandler.registerHandler(OOAttachment)

Modified: zope-attachmentfield/trunk/debian/changelog
===================================================================
--- zope-attachmentfield/trunk/debian/changelog	2006-10-13 20:59:21 UTC (rev 307)
+++ zope-attachmentfield/trunk/debian/changelog	2006-10-13 21:05:03 UTC (rev 308)
@@ -1,8 +1,10 @@
 zope-attachmentfield (1.3.10-1) UNRELEASED; urgency=low
 
-  * New upstream release
+  * New upstream release.
+  * Recommends python-libxml2 and python-libxslt1 instead of python2.3-*.
+  * Add XS-Vcs-Svn field to debian/control.
 
- -- Jérémy Bobbio <jeremy.bobbio at etu.upmc.fr>  Fri, 13 Oct 2006 22:50:54 +0200
+ -- Jérémy Bobbio <jeremy.bobbio at etu.upmc.fr>  Fri, 13 Oct 2006 22:54:30 +0200
 
 zope-attachmentfield (1.3.6-1) unstable; urgency=low
 

Modified: zope-attachmentfield/trunk/debian/control
===================================================================
--- zope-attachmentfield/trunk/debian/control	2006-10-13 20:59:21 UTC (rev 307)
+++ zope-attachmentfield/trunk/debian/control	2006-10-13 21:05:03 UTC (rev 308)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Jérémy Bobbio <jeremy.bobbio at etu.upmc.fr>, Fabio Tranchitella <kobold at debian.org>
-Build-Depends: debhelper (>= 5.0.0), dpatch
+Build-Depends: debhelper (>= 5.0.0)
 Build-Depends-Indep: zope-debhelper (>= 0.3.2.7)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/zope-attachmentfield/trunk

Modified: zope-attachmentfield/trunk/debian/rules
===================================================================
--- zope-attachmentfield/trunk/debian/rules	2006-10-13 20:59:21 UTC (rev 307)
+++ zope-attachmentfield/trunk/debian/rules	2006-10-13 21:05:03 UTC (rev 308)
@@ -3,11 +3,11 @@
 # Uncomment this to turn on verbose mode
 #export DH_VERBOSE=1
 
-build: patch-stamp build-stamp
+build: build-stamp
 build-stamp:
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	-rm -f build-stamp
@@ -36,4 +36,3 @@
 
 .PHONY: build clean binary-indep binary install
 
-include /usr/share/dpatch/dpatch.make

Modified: zope-attachmentfield/trunk/ooconverter.py
===================================================================
--- zope-attachmentfield/trunk/ooconverter.py	2006-10-13 20:59:21 UTC (rev 307)
+++ zope-attachmentfield/trunk/ooconverter.py	2006-10-13 21:05:03 UTC (rev 308)
@@ -478,8 +478,7 @@
 
 # load the openoffice.org to html transformation stylesheet
 packageDir=Globals.package_home(globals())
-__stylefile=packageDir.split(os.sep)+['converters', 'OpenOffice', 'sx2ml', 'main_html.xsl']
-__stylefile='/'.join(__stylefile)
+__stylefile='/usr/lib/openoffice/share/xslt/export/xhtml/ooo2xhtml.xsl'
 __styledoc=libxml2.parseFile(__stylefile)
 _style=libxslt.parseStylesheetDoc(__styledoc)