[Python-modules-commits] r23420 - in packages/ipython/trunk/debian (5 files)

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

    Date: Saturday, February 2, 2013 @ 16:53:09
  Author: jtaylor-guest
Revision: 23420

don't link documentation of ipython-doc

so ipython3 does not depend on ipython (Closes: #695554)
Requires ipython-doc.preinst to not lose copyright on upgrade

Added:
  packages/ipython/trunk/debian/ipython-doc.preinst
Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/ipython-doc.doc-base
  packages/ipython/trunk/debian/rules
Deleted:
  packages/ipython/trunk/debian/ipython-doc.lintian-overrides

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2013-02-02 16:52:50 UTC (rev 23419)
+++ packages/ipython/trunk/debian/changelog	2013-02-02 16:53:09 UTC (rev 23420)
@@ -1,9 +1,12 @@
-ipython (0.13.1-3) UNRELEASED; urgency=low
+ipython (0.13.1-3) experimental; urgency=low
 
   * pass -a to xvfb-run
   * drop DM-Upload-Allowed, not needed anymore
+  * don't link documentation of ipython-doc so ipython3 does not depend on
+    ipython (Closes: #695554)
+    Requires ipython-doc.preinst to not lose copyright on upgrade
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Wed, 28 Nov 2012 19:49:59 +0100
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 02 Feb 2013 11:14:27 +0100
 
 ipython (0.13.1-2) unstable; urgency=low
 

Modified: packages/ipython/trunk/debian/ipython-doc.doc-base
===================================================================
--- packages/ipython/trunk/debian/ipython-doc.doc-base	2013-02-02 16:52:50 UTC (rev 23419)
+++ packages/ipython/trunk/debian/ipython-doc.doc-base	2013-02-02 16:53:09 UTC (rev 23420)
@@ -6,5 +6,5 @@
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/ipython/html/index.html
-Files: /usr/share/doc/ipython/html/*
+Index: /usr/share/doc/ipython-doc/html/index.html
+Files: /usr/share/doc/ipython-doc/html/*

Deleted: packages/ipython/trunk/debian/ipython-doc.lintian-overrides
===================================================================
--- packages/ipython/trunk/debian/ipython-doc.lintian-overrides	2013-02-02 16:52:50 UTC (rev 23419)
+++ packages/ipython/trunk/debian/ipython-doc.lintian-overrides	2013-02-02 16:53:09 UTC (rev 23420)
@@ -1,3 +0,0 @@
-# I prefer single doc dir over the ability to install -doc without the package
-# arch argument does not apply
-ipython-doc binary: doc-package-depends-on-main-package

Added: packages/ipython/trunk/debian/ipython-doc.preinst
===================================================================
--- packages/ipython/trunk/debian/ipython-doc.preinst	                        (rev 0)
+++ packages/ipython/trunk/debian/ipython-doc.preinst	2013-02-02 16:53:09 UTC (rev 23420)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    install|upgrade)
+        test ! -L /usr/share/doc/ipython-doc || rm /usr/share/doc/ipython-doc
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+
+#DEBHELPER#
+

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2013-02-02 16:52:50 UTC (rev 23419)
+++ packages/ipython/trunk/debian/rules	2013-02-02 16:53:09 UTC (rev 23420)
@@ -124,7 +124,7 @@
 	dh_installdocs -pipython-notebook --link-doc=ipython
 	dh_installdocs -pipython3-notebook --link-doc=ipython3
 	dh_installdocs -pipython-notebook-common
-	dh_installdocs -pipython-doc --link-doc=ipython
+	dh_installdocs -pipython-doc
 	find $(CURDIR)/debian/ipython -type d -empty -delete
 
 	# remove all the duplicates to keep -doc small
@@ -136,15 +136,15 @@
 	plot_simple_python.png ms_visual_studio.png notebook_specgram.png \
 	qtconsole.png qtconsole_tabbed.png; \
 	do \
-	  rm -f $(CURDIR)/debian/ipython-doc/usr/share/doc/ipython/html/_images/$$f; \
-	  dh_link -pipython-doc usr/share/doc/ipython/html/_static/$$f usr/share/doc/ipython/html/_images/$$f; \
+	  rm -f $(CURDIR)/debian/ipython-doc/usr/share/doc/ipython-doc/html/_images/$$f; \
+	  dh_link -pipython-doc usr/share/doc/ipython-doc/html/_static/$$f usr/share/doc/ipython-doc/html/_images/$$f; \
 	done
-	rm -f $(CURDIR)/debian/ipython-doc/usr/share/doc/ipython/html/_static/plot_simple.png
-	dh_link -pipython-doc usr/share/doc/ipython/html/_static/plot_simple_python.png \
-	  usr/share/doc/ipython/html/_static/plot_simple.png
-	rm -f $(CURDIR)/debian/ipython-doc/usr/share/doc/ipython/html/_images/qtconsole1.png
-	dh_link -pipython-doc usr/share/doc/ipython/html/_static/qtconsole.png \
-	  usr/share/doc/ipython/html/_images/qtconsole1.png
+	rm -f $(CURDIR)/debian/ipython-doc/usr/share/doc/ipython-doc/html/_static/plot_simple.png
+	dh_link -pipython-doc usr/share/doc/ipython-doc/html/_static/plot_simple_python.png \
+	  usr/share/doc/ipython-doc/html/_static/plot_simple.png
+	rm -f $(CURDIR)/debian/ipython-doc/usr/share/doc/ipython-doc/html/_images/qtconsole1.png
+	dh_link -pipython-doc usr/share/doc/ipython-doc/html/_static/qtconsole.png \
+	  usr/share/doc/ipython-doc/html/_images/qtconsole1.png
 endif
 
 # work around #683108