r17155 - in /desktop/experimental/pygtk/debian: changelog python-gtk2-doc.examples python-gtk2-doc.install python-gtk2-doc.links python-gtk2-doc.preinst rules

[pochu-guest at users.alioth.debian.org]

Author: pochu-guest
Date: Sat Sep 27 00:31:29 2008
New Revision: 17155

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17155
Log:
* debian/python-gtk2-doc.install:
  - Install examples needed by pygtk-demo in /usr/lib/pygtk/2.0
    (their original place) so that pygtk-demo doesn't rely on
    /usr/share/doc being available.
* debian/python-gtk2-doc.links,
  debian/python-gtk2-doc.preinst:
  - Link /usr/share/doc/python-gtk2-doc/examples/demos to /usr/lib/pygtk/2.0
    so that examples are still available in /usr/share/doc.
  - Make sure /usr/share/doc/python-gtk2-doc/examples/demos doesn't exist
    before upgrading to 2.13.0-1, so that the link is successfully created.

Added:
    desktop/experimental/pygtk/debian/python-gtk2-doc.preinst
Modified:
    desktop/experimental/pygtk/debian/changelog
    desktop/experimental/pygtk/debian/python-gtk2-doc.examples
    desktop/experimental/pygtk/debian/python-gtk2-doc.install
    desktop/experimental/pygtk/debian/python-gtk2-doc.links
    desktop/experimental/pygtk/debian/rules

Modified: desktop/experimental/pygtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/changelog?rev=17155&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/changelog (original)
+++ desktop/experimental/pygtk/debian/changelog Sat Sep 27 00:31:29 2008
@@ -49,9 +49,16 @@
     - python-gtk2-doc recommends python-glade2 for the examples, instead
       of suggest it.
     - Add XB-Python-Version to python-gtk2-doc per Python policy.
-  * debian/python-gtk2-doc.links:
-    - Link /usr/lib/pygtk/2.0 to /usr/share/doc/python-gtk2-doc/examples,
-      needed by pygtk-demo.
+  * debian/python-gtk2-doc.install:
+    - Install examples needed by pygtk-demo in /usr/lib/pygtk/2.0
+      (their original place) so that pygtk-demo doesn't rely on
+      /usr/share/doc being available.
+  * debian/python-gtk2-doc.links,
+    debian/python-gtk2-doc.preinst:
+    - Link /usr/share/doc/python-gtk2-doc/examples/demos to /usr/lib/pygtk/2.0
+      so that examples are still available in /usr/share/doc.
+    - Make sure /usr/share/doc/python-gtk2-doc/examples/demos doesn't exist
+      before upgrading to 2.13.0-1, so that the link is successfully created.
   * debian/rules:
     - Call dh_pysupport for python-gtk2-doc, so example scripts are
       byte-compiled.
@@ -63,7 +70,7 @@
   * debian/copyright:
     - Add Copyright holders.
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Thu, 25 Sep 2008 16:02:14 +0200
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 27 Sep 2008 02:16:46 +0200
 
 pygtk (2.13.0-0ubuntu3) intrepid; urgency=low
 

Modified: desktop/experimental/pygtk/debian/python-gtk2-doc.examples
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/python-gtk2-doc.examples?rev=17155&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/python-gtk2-doc.examples (original)
+++ desktop/experimental/pygtk/debian/python-gtk2-doc.examples Sat Sep 27 00:31:29 2008
@@ -1,5 +1,3 @@
-debian/tmp/usr/lib/pygtk/2.0/demos
-debian/tmp/usr/lib/pygtk/2.0/*.py
 examples/atk
 examples/glade
 examples/gtk

Modified: desktop/experimental/pygtk/debian/python-gtk2-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/python-gtk2-doc.install?rev=17155&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/python-gtk2-doc.install (original)
+++ desktop/experimental/pygtk/debian/python-gtk2-doc.install Sat Sep 27 00:31:29 2008
@@ -1,2 +1,3 @@
 debian/tmp/usr/share/gtk-doc
 debian/tmp/usr/bin/pygtk-demo
+debian/tmp/usr/lib/pygtk/2.0

Modified: desktop/experimental/pygtk/debian/python-gtk2-doc.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/python-gtk2-doc.links?rev=17155&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/python-gtk2-doc.links (original)
+++ desktop/experimental/pygtk/debian/python-gtk2-doc.links Sat Sep 27 00:31:29 2008
@@ -1,2 +1,2 @@
 /usr/share/gtk-doc/html/pygtk /usr/share/doc/python-gtk2-doc/html
-/usr/share/doc/python-gtk2-doc/examples /usr/lib/pygtk/2.0
+/usr/lib/pygtk/2.0/demos /usr/share/doc/python-gtk2-doc/examples/demos

Added: desktop/experimental/pygtk/debian/python-gtk2-doc.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/python-gtk2-doc.preinst?rev=17155&op=file
==============================================================================
--- desktop/experimental/pygtk/debian/python-gtk2-doc.preinst (added)
+++ desktop/experimental/pygtk/debian/python-gtk2-doc.preinst Sat Sep 27 00:31:29 2008
@@ -1,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if dpkg --compare-versions "$2" lt "2.13.0-1"; then
+	rm -rf /usr/share/doc/python-gtk2-doc/examples/demos
+fi
+
+#DEBHELPER#

Modified: desktop/experimental/pygtk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/rules?rev=17155&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/rules (original)
+++ desktop/experimental/pygtk/debian/rules Sat Sep 27 00:31:29 2008
@@ -136,7 +136,7 @@
 	dh_fixperms -i
 	# More permission fixing
 	grep -rlZ "^#\!.*python" debian/python-gtk2-dev/usr | xargs -0r chmod 755
-	dh_pysupport -ppython-gtk2-doc /usr/share/doc/python-gtk2-doc/examples
+	dh_pysupport -ppython-gtk2-doc /usr/lib/pygtk
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i