[Python-apps-commits] r2926 - in packages/vitables/trunk/debian (6 files)

xnox-guest at users.alioth.debian.org xnox-guest at users.alioth.debian.org
Mon May 11 13:01:03 UTC 2009 

    Date: Monday, May 11, 2009 @ 13:01:02
  Author: xnox-guest
Revision: 2926

Why does docbook take so long to compile in pbuilder?

Added:
  packages/vitables/trunk/debian/patches/remove_help_from_resources.patch
Modified:
  packages/vitables/trunk/debian/control
  packages/vitables/trunk/debian/patches/series
  packages/vitables/trunk/debian/patches/use_distutils_for_docs.patch
  packages/vitables/trunk/debian/rules
  packages/vitables/trunk/debian/watch

Modified: packages/vitables/trunk/debian/control
===================================================================
--- packages/vitables/trunk/debian/control	2009-05-11 12:37:48 UTC (rev 2925)
+++ packages/vitables/trunk/debian/control	2009-05-11 13:01:02 UTC (rev 2926)
@@ -9,8 +9,10 @@
                python-support,
                pyqt4-dev-tools,
                xsltproc,
-               ldp-docbook-xsl,
-               fop
+               docbook,
+               docbook-xsl,
+               fop,
+               libservlet2.4-java
 Standards-Version: 3.8.1
 Homepage: http://vitables.berlios.de
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/vitables/trunk/ 

Added: packages/vitables/trunk/debian/patches/remove_help_from_resources.patch
===================================================================
--- packages/vitables/trunk/debian/patches/remove_help_from_resources.patch	                        (rev 0)
+++ packages/vitables/trunk/debian/patches/remove_help_from_resources.patch	2009-05-11 13:01:02 UTC (rev 2926)
@@ -0,0 +1,53 @@
+Removing html docs from qtresources and instead pointing to the installed html
+files.
+Index: vitables-2.0+hg96+dfsg/resources.qrc
+===================================================================
+--- vitables-2.0+hg96+dfsg.orig/resources.qrc	2009-05-11 04:46:53.000000000 +0100
++++ vitables-2.0+hg96+dfsg/resources.qrc	2009-05-11 04:47:13.000000000 +0100
+@@ -67,33 +67,6 @@
+ <file>icons/small_icons/vlarray.png</file>
+ <file>icons/small_icons/vlstring.png</file>
+ <file>icons/small_icons/zoom.png</file>
+-<file>doc/html/apa.html</file>
+-<file>doc/html/apb.html</file>
+-<file>doc/html/ch01.html</file>
+-<file>doc/html/ch02.html</file>
+-<file>doc/html/ch03.html</file>
+-<file>doc/html/ch04.html</file>
+-<file>doc/html/index.html</file>
+-<file>doc/html/usersguide_style.css</file>
+-<file>doc/html/images/browseDataset.png</file>
+-<file>doc/html/images/editingUserAttrs.png</file>
+-<file>doc/html/images/extraInfo.png</file>
+-<file>doc/html/images/fileManager.png</file>
+-<file>doc/html/images/fileMenu.png</file>
+-<file>doc/html/images/groupCreation.png</file>
+-<file>doc/html/images/helpBrowser.png</file>
+-<file>doc/html/images/helpMenu.png</file>
+-<file>doc/html/images/logger.png</file>
+-<file>doc/html/images/mainWindow.png</file>
+-<file>doc/html/images/newFilteredTable.png</file>
+-<file>doc/html/images/nodeMenu.png</file>
+-<file>doc/html/images/objectTree.png</file>
+-<file>doc/html/images/propertiesDlg.png</file>
+-<file>doc/html/images/queryMenu.png</file>
+-<file>doc/html/images/toolsMenu.png</file>
+-<file>doc/html/images/treeSymbols.png</file>
+-<file>doc/html/images/windowsMenu.png</file>
+-<file>doc/html/images/workspace.png</file>
+ <file>LICENSE.html</file>
+ </qresource>
+ </RCC>
+Index: vitables-2.0+hg96+dfsg/vitables/docBrowser/helpBrowser.py
+===================================================================
+--- vitables-2.0+hg96+dfsg.orig/vitables/docBrowser/helpBrowser.py	2009-05-11 04:47:31.000000000 +0100
++++ vitables-2.0+hg96+dfsg/vitables/docBrowser/helpBrowser.py	2009-05-11 04:47:53.000000000 +0100
+@@ -171,7 +170,7 @@
+ 
+         src = QDir().fromNativeSeparators(src) # src can be a QString
+         basename = os.path.basename(unicode(src))
+-        url = QUrl("qrc:/doc/html/%s" % basename)
++        url = QUrl("/usr/share/doc/vitables/doc/html/%s" % basename)
+         self.gui.text_browser.setSource(url)
+ 
+ 

Modified: packages/vitables/trunk/debian/patches/series
===================================================================
--- packages/vitables/trunk/debian/patches/series	2009-05-11 12:37:48 UTC (rev 2925)
+++ packages/vitables/trunk/debian/patches/series	2009-05-11 13:01:02 UTC (rev 2926)
@@ -2,3 +2,4 @@
 remove_buildtime_dependency.patch
 
 use_distutils_for_docs.patch
+remove_help_from_resources.patch

Modified: packages/vitables/trunk/debian/patches/use_distutils_for_docs.patch
===================================================================
--- packages/vitables/trunk/debian/patches/use_distutils_for_docs.patch	2009-05-11 12:37:48 UTC (rev 2925)
+++ packages/vitables/trunk/debian/patches/use_distutils_for_docs.patch	2009-05-11 13:01:02 UTC (rev 2926)
@@ -1,7 +1,9 @@
+Adding funtions to distutils to build html and pdf documentation simply by using
+setup.py.
 Index: vitables-2.0+hg96+dfsg/setup.py
 ===================================================================
---- vitables-2.0+hg96+dfsg.orig/setup.py	2009-05-11 04:25:15.000000000 +0100
-+++ vitables-2.0+hg96+dfsg/setup.py	2009-05-11 04:28:28.000000000 +0100
+--- vitables-2.0+hg96+dfsg.orig/setup.py	2009-05-11 08:42:42.000000000 +0100
++++ vitables-2.0+hg96+dfsg/setup.py	2009-05-11 08:53:00.000000000 +0100
 @@ -21,12 +21,87 @@
  #----------------------------------------------------------------------
  # Setup script for the vitables package
@@ -69,18 +71,18 @@
 +            if not os.path.exists(input_file):
 +                raise SystemExit, "File %s is missing." % input_file
 +
-+            input_file_name = os.path.splitext(input_file)[0]
++            input_file_name = os.path.splitext(os.path.split(input_file)[1])[0]
 +            input_dir =os.path.dirname(input_file)
++            remember_location = os.path.abspath(os.path.curdir)
 +
-+            if not os.path.exists(os.path.join(input_dir,"html"))):
-+                os.mkdir(os.path.join(input_dir,"html"))
-+                spawn([self.xsltproc_path, "-o", os.path.join(input_dir, "html", ""), self.xsl_style, input_file])
-+                spawn([self.xsltproc_path, "-o", input_file_name+".fo", self.fop_style, input_file])
-+                spawn([self.fop_path, "-q", input_file_name+".fo", input_file_name+".pdf"])
++            if not os.path.exists(os.path.join(input_dir,"html")):
++                os.chdir(input_dir)
++                spawn([self.xsltproc_path, "-o", os.path.join("html", ""), self.xsl_style, input_file_name+".xml"])
++                spawn([self.xsltproc_path, "-o", input_file_name+".fo", self.fop_style, input_file_name+".xml"])
++                spawn([self.fop_path, "-q", "-c", "fop_conf.xml", input_file_name+".fo", input_file_name+".pdf"])
++                shutil.copytree("images",os.path.join("html","images"))
++                os.chdir(remember_location)
 +
-+                shutil.copytree(os.path.join(input_dir,"images"),os.path.join(input_dir,"html","images"))
-+
-+
 +def has_docbook(build):
 +    return (build.distribution.docbooks is not None and
 +            build.distribution.docbooks != [])

Modified: packages/vitables/trunk/debian/rules
===================================================================
--- packages/vitables/trunk/debian/rules	2009-05-11 12:37:48 UTC (rev 2925)
+++ packages/vitables/trunk/debian/rules	2009-05-11 13:01:02 UTC (rev 2926)
@@ -14,7 +14,6 @@
 			   --install-scripts=/usr
 
 	find debian/vitables/usr/share/doc/ -name '[V|L]*' ! -type d -delete
-	rm -r debian/vitables/usr/share/doc/vitables/doc/images
 	gzip -dfcS .svgz unixapp/vitables.svgz > \
 	debian/vitables/usr/share/pixmaps/vitables.svg
 
@@ -37,6 +36,8 @@
 
 	wget http://hg.berlios.de/repos/vitables/archive/e80739d79701.tar.gz
 	tar xvf *.tar.gz
+	sed -i "s/.png/.png *.svg/" $(tmp_dir)/MANIFEST.in
+	sed -i "s/usersguide.pdf/fop_conf.xml/" $(tmp_dir)/MANIFEST.in
 	echo "include resources.qrc \nrecursive-include icons * \n\
 recursive-include vitables/queries *.ui\nrecursive-include vitables/preferences *.ui" \
 	>> $(tmp_dir)/MANIFEST.in

Modified: packages/vitables/trunk/debian/watch
===================================================================
--- packages/vitables/trunk/debian/watch	2009-05-11 12:37:48 UTC (rev 2925)
+++ packages/vitables/trunk/debian/watch	2009-05-11 13:01:02 UTC (rev 2926)
@@ -1,5 +1,5 @@
 version=3
-opts=downloadurlmangle=s/prdownload/download/ \
+opts="downloadurlmangle=s/prdownload/download/,dversionmangle=s/\+hg.*//"\
     http://developer.berlios.de/project/showfiles.php?group_id=10366 \
     http://prdownload.berlios.de/vitables/ViTables-(.*)\.tar\.gz

More information about the Python-apps-commits mailing list