[Python-apps-commits] r3818 - in packages/phatch/trunk/debian (4 files)

[piotr at users.alioth.debian.org]

    Date: Wednesday, September 23, 2009 @ 09:22:01
  Author: piotr
Revision: 3818

* Add python-sphinx and locate to build depens (docs are regenerated at
  build time)
* Add lintian override for extra-license-file in phatch-doc (false positive)

Added:
  packages/phatch/trunk/debian/phatch-doc.dirs
Modified:
  packages/phatch/trunk/debian/changelog
  packages/phatch/trunk/debian/control
  packages/phatch/trunk/debian/rules

Modified: packages/phatch/trunk/debian/changelog
===================================================================
--- packages/phatch/trunk/debian/changelog	2009-09-22 23:43:01 UTC (rev 3817)
+++ packages/phatch/trunk/debian/changelog	2009-09-23 09:22:01 UTC (rev 3818)
@@ -43,10 +43,12 @@
   * Add ttf-freefont and ttf-thai-tlwg to phatch-cli Depends (and add symlinks
     to use fonts from these packages instead of local copies)
   * Add locate to phatch-cli's Depends (used to find fonts)
-  * Add python-sphinx to build depens (docs are regenerated at build time)
+  * Add python-sphinx and locate to build depens (docs are regenerated at
+    build time)
+  * Add lintian override for extra-license-file in phatch-doc (false positive)
   * Bump Standards-Version to 3.8.3 (no changes needed)
 
- -- Piotr Ożarowski <piotr at debian.org>  Tue, 25 Aug 2009 20:41:45 +0200
+ -- Piotr Ożarowski <piotr at debian.org>  Wed, 23 Sep 2009 10:24:46 +0200
 
 phatch (0.1.6-1) unstable; urgency=low
 

Modified: packages/phatch/trunk/debian/control
===================================================================
--- packages/phatch/trunk/debian/control	2009-09-22 23:43:01 UTC (rev 3817)
+++ packages/phatch/trunk/debian/control	2009-09-23 09:22:01 UTC (rev 3818)
@@ -14,7 +14,8 @@
 Build-Depends-Indep: python-support (>= 0.5.3),
                      python-nautilus,
                      pkg-config,
-                     python-sphinx
+                     python-sphinx,
+                     locate
 
 Package: phatch
 Architecture: all

Added: packages/phatch/trunk/debian/phatch-doc.dirs
===================================================================
--- packages/phatch/trunk/debian/phatch-doc.dirs	                        (rev 0)
+++ packages/phatch/trunk/debian/phatch-doc.dirs	2009-09-23 09:22:01 UTC (rev 3818)
@@ -0,0 +1,2 @@
+/usr/share/doc/phatch/html/
+/usr/share/lintian/overrides

Modified: packages/phatch/trunk/debian/rules
===================================================================
--- packages/phatch/trunk/debian/rules	2009-09-22 23:43:01 UTC (rev 3817)
+++ packages/phatch/trunk/debian/rules	2009-09-23 09:22:01 UTC (rev 3818)
@@ -14,6 +14,7 @@
 DEB_PYTHON_INSTALL_ARGS_ALL = --install-lib=/usr/share/phatch --root=$(PKG_C_DIR)
 
 binary-install/phatch-cli::
+	rm -rf $(PKG_C_DIR)/usr/share/phatch/docs # install_data creates it
 	find $(PKG_C_DIR) -name '*.py[co]' -delete
 	sed -i -e "s|import phatch|sys.path.insert(0,'/usr/share/phatch/');import phatch|" $(PKG_C_DIR)/usr/bin/phatch
 
@@ -29,13 +30,15 @@
 	mv $(PKG_C_DIR)/usr/share/phatch/phatch/lib/linux/nautilusExtension.py\
 	   $(PKG_N_DIR)/usr/share/phatch/phatch/lib/linux/
 
-binary-install/phatch-docs::
-	mkdir -p $(PKG_D_DIR)/usr/share/doc/phatch/html/
+binary-install/phatch-doc::
+	dh_installdirs
 	cd docs && python update.py
 	dh_install -p phatch-doc docs/build/html /usr/share/doc/phatch/
 	dh_link -p phatch-doc /usr/share/javascript/jquery/jquery.js \
 	    /usr/share/doc/phatch/html/_static/jquery.js
 	rm -f $(PKG_D_DIR)/usr/share/doc/phatch/html/.buildinfo
+	echo "phatch-doc: extra-license-file usr/share/doc/phatch/html/_sources/data.license.txt" \
+		>> $(PKG_D_DIR)/usr/share/lintian/overrides/phatch-doc
 
 clean::
 	rm -rf docs/build