[Python-modules-commits] r28748 - in packages/ipython/trunk/debian (9 files)
jtaylor-guest at users.alioth.debian.org
jtaylor-guest at users.alioth.debian.org
Sat May 3 15:41:05 UTC 2014
Date: Saturday, May 3, 2014 @ 15:41:04
Author: jtaylor-guest
Revision: 28748
update installed files
pycolor, irunner and iplogger are removed
Modified:
packages/ipython/trunk/debian/ipython-doc.examples
packages/ipython/trunk/debian/ipython-qtconsole.install
packages/ipython/trunk/debian/ipython.install
packages/ipython/trunk/debian/ipython.manpages
packages/ipython/trunk/debian/ipython3.install
packages/ipython/trunk/debian/ipython3.manpages
packages/ipython/trunk/debian/patches/series
packages/ipython/trunk/debian/rules
Deleted:
packages/ipython/trunk/debian/patches/use-ipython-icon-in-desktop-files.patch
Modified: packages/ipython/trunk/debian/ipython-doc.examples
===================================================================
--- packages/ipython/trunk/debian/ipython-doc.examples 2014-05-03 15:41:01 UTC (rev 28747)
+++ packages/ipython/trunk/debian/ipython-doc.examples 2014-05-03 15:41:04 UTC (rev 28748)
@@ -1,4 +1 @@
-examples/core
-examples/lib
-examples/parallel
-examples/notebooks
+examples/
Modified: packages/ipython/trunk/debian/ipython-qtconsole.install
===================================================================
--- packages/ipython/trunk/debian/ipython-qtconsole.install 2014-05-03 15:41:01 UTC (rev 28747)
+++ packages/ipython/trunk/debian/ipython-qtconsole.install 2014-05-03 15:41:04 UTC (rev 28748)
@@ -1,2 +1 @@
/usr/lib/python2*/dist-packages/IPython/qt/
-examples/core/ipython-qtconsole.desktop usr/share/applications/
Modified: packages/ipython/trunk/debian/ipython.install
===================================================================
--- packages/ipython/trunk/debian/ipython.install 2014-05-03 15:41:01 UTC (rev 28747)
+++ packages/ipython/trunk/debian/ipython.install 2014-05-03 15:41:04 UTC (rev 28748)
@@ -1,11 +1,5 @@
/usr/bin/ipcluster
/usr/bin/ipcontroller
/usr/bin/ipengine
-/usr/bin/iplogger
/usr/bin/ipython
-/usr/bin/irunner
-/usr/bin/pycolor
/usr/lib/python2.*
-/usr/share/doc/ipython/extensions
-docs/emacs/ipython.el usr/share/emacs/site-lisp
-examples/core/ipython.desktop usr/share/applications/
Modified: packages/ipython/trunk/debian/ipython.manpages
===================================================================
--- packages/ipython/trunk/debian/ipython.manpages 2014-05-03 15:41:01 UTC (rev 28747)
+++ packages/ipython/trunk/debian/ipython.manpages 2014-05-03 15:41:04 UTC (rev 28748)
@@ -1,7 +1,4 @@
docs/man/ipython.1
-docs/man/irunner.1
-docs/man/pycolor.1
docs/man/ipcluster.1
docs/man/ipcontroller.1
docs/man/ipengine.1
-docs/man/iplogger.1
Modified: packages/ipython/trunk/debian/ipython3.install
===================================================================
--- packages/ipython/trunk/debian/ipython3.install 2014-05-03 15:41:01 UTC (rev 28747)
+++ packages/ipython/trunk/debian/ipython3.install 2014-05-03 15:41:04 UTC (rev 28748)
@@ -1,7 +1,5 @@
/usr/bin/ipcluster3
/usr/bin/ipcontroller3
/usr/bin/ipengine3
-/usr/bin/iplogger3
/usr/bin/ipython3
-/usr/bin/irunner3
/usr/lib/python3
Modified: packages/ipython/trunk/debian/ipython3.manpages
===================================================================
--- packages/ipython/trunk/debian/ipython3.manpages 2014-05-03 15:41:01 UTC (rev 28747)
+++ packages/ipython/trunk/debian/ipython3.manpages 2014-05-03 15:41:04 UTC (rev 28748)
@@ -1,6 +1,4 @@
docs/man/ipython.1
-docs/man/irunner.1
docs/man/ipcluster.1
docs/man/ipcontroller.1
docs/man/ipengine.1
-docs/man/iplogger.1
Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series 2014-05-03 15:41:01 UTC (rev 28747)
+++ packages/ipython/trunk/debian/patches/series 2014-05-03 15:41:04 UTC (rev 28748)
@@ -1,6 +1,5 @@
use-LightBG-colorscheme.patch
debianize-error-messages.patch
-use-ipython-icon-in-desktop-files.patch
use-system-mathjax-if-available.patch
shared-static-path.patch
no-submodule-check.patch
Deleted: packages/ipython/trunk/debian/patches/use-ipython-icon-in-desktop-files.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-ipython-icon-in-desktop-files.patch 2014-05-03 15:41:01 UTC (rev 28747)
+++ packages/ipython/trunk/debian/patches/use-ipython-icon-in-desktop-files.patch 2014-05-03 15:41:04 UTC (rev 28748)
@@ -1,27 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Wed, 9 Nov 2011 18:07:12 +0100
-Subject: use ipython icon in desktop files
-
-
---- a/examples/IPython Kernel/ipython-qtconsole.desktop
-+++ b/examples/IPython Kernel/ipython-qtconsole.desktop
-@@ -6,7 +6,7 @@ Comment=Enhanced interactive Python qtco
- Exec=ipython qtconsole
- GenericName[en_US]=Python shell
- GenericName=Python shell
--Icon=gnome-netstatus-idle
-+Icon=ipython
- Name[en_US]=IPython Qt console
- Name=IPython Qt console
- Categories=Development;Utility;
---- a/examples/IPython Kernel/ipython.desktop
-+++ b/examples/IPython Kernel/ipython.desktop
-@@ -6,7 +6,7 @@ Comment=Enhanced interactive Python shel
- Exec=ipython
- GenericName[en_US]=IPython
- GenericName=IPython
--Icon=gnome-netstatus-idle
-+Icon=ipython
- Name[en_US]=ipython
- Name=ipython
- Categories=Development;Utility;
Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules 2014-05-03 15:41:01 UTC (rev 28747)
+++ packages/ipython/trunk/debian/rules 2014-05-03 15:41:04 UTC (rev 28748)
@@ -50,13 +50,15 @@
$$pyvers setup.py install --install-layout=deb \
--force --no-compile -O0 --root=$(CURDIR)/debian/tmp; \
done
- # py3 uses entrypoints where --excutable in build has no effect
+ # fix shebangs
+ sed -i '1c#!/usr/bin/env python' $(CURDIR)/debian/tmp/usr/bin/ipython
+ sed -i '1c#!/usr/bin/env python' $(CURDIR)/debian/tmp/usr/bin/ipcluster
+ sed -i '1c#!/usr/bin/env python' $(CURDIR)/debian/tmp/usr/bin/ipcontroller
+ sed -i '1c#!/usr/bin/env python' $(CURDIR)/debian/tmp/usr/bin/ipengine
sed -i '1c#!/usr/bin/env python3' $(CURDIR)/debian/tmp/usr/bin/ipython3
- sed -i '1c#!/usr/bin/env python3' $(CURDIR)/debian/tmp/usr/bin/irunner3
sed -i '1c#!/usr/bin/env python3' $(CURDIR)/debian/tmp/usr/bin/ipcluster3
sed -i '1c#!/usr/bin/env python3' $(CURDIR)/debian/tmp/usr/bin/ipcontroller3
sed -i '1c#!/usr/bin/env python3' $(CURDIR)/debian/tmp/usr/bin/ipengine3
- sed -i '1c#!/usr/bin/env python3' $(CURDIR)/debian/tmp/usr/bin/iplogger3
override_dh_install:
dh_install -pipython \
@@ -72,6 +74,11 @@
--exclude=tests
dh_install -pipython3-notebook --exclude="html/static/" --exclude=tests
dh_install -pipython3-qtconsole --exclude=tests
+ # no space allowed in dh_install
+ install -D -m 644 "examples/IPython Kernel/ipython.desktop" debian/ipython/usr/share/applications/ipython.desktop
+ install -D -m 644 "examples/IPython Kernel/ipython-qtconsole.desktop" debian/ipython-qtconsole/usr/share/applications/ipython-qtconsole.desktop
+ # workaround for broken by space launchpad builds
+ sed -i -e "s/gnome-netstatus-idle/ipython/" debian/ipython*/usr/share/applications/*desktop
rm -rf $(NB)/components/marked/
@@ -85,8 +92,6 @@
rm -rf $(NB)/components/jquery/
install -D IPython/html/static/components/jquery/jquery.js $(NB)/components/jquery/jquery.min.js
- rm -rf $(NB)/components/less.js/
-
rm -rf $(NB)/components/highlight.js/
rm -rf $(NB)/components/requirejs/
@@ -105,10 +110,12 @@
mkdir -p debian/ipython3/usr/share/applications/
sed -e "s/ipython/ipython3/" -e "s/IPython/IPython3/" \
- examples/core/ipython.desktop > debian/ipython3/usr/share/applications/ipython3.desktop
+ debian/ipython/usr/share/applications/ipython.desktop > \
+ debian/ipython3/usr/share/applications/ipython3.desktop
mkdir -p debian/ipython3-qtconsole/usr/share/applications/
sed -e "s/ipython/ipython3/" -e "s/IPython/IPython3/" \
- examples/core/ipython-qtconsole.desktop > debian/ipython3-qtconsole/usr/share/applications/ipython3-qtconsole.desktop
+ debian/ipython-qtconsole/usr/share/applications/ipython-qtconsole.desktop > \
+ debian/ipython3-qtconsole/usr/share/applications/ipython3-qtconsole.desktop
mkdir -p $(CURDIR)/debian/ipython/usr/share/icons/hicolor/scalable/apps/
cp IPython/qt/console/resources/icon/IPythonConsole.svg \
@@ -117,10 +124,6 @@
cp IPython/qt/console/resources/icon/IPythonConsole.svg \
$(CURDIR)/debian/ipython3/usr/share/icons/hicolor/scalable/apps/ipython3.svg
- # remove embedded arparse
- find $(CURDIR)/debian/ipython/usr/ -name _argparse.py -delete
- find $(CURDIR)/debian/ipython3/usr/ -name _argparse.py -delete
-
# remove embedded simplegeneric
find $(CURDIR)/debian/ipython/usr/ -name _simplegeneric.py -delete
find $(CURDIR)/debian/ipython3/usr/ -name _simplegeneric.py -delete
@@ -132,19 +135,6 @@
# remove embedded pexpect
find $(CURDIR)/debian/ipython/usr/ -name _pexpect.py -delete
- # add wrapper scripts for all python versions
- set -e ;\
- firstpyver="" ;\
- for pyvers in $(PYVERS); do \
- if [ "$${firstpyver}" = "" ]; then \
- install -m 755 debian/ipython.sh $(CURDIR)/debian/ipython/usr/bin/ipython$$pyvers ;\
- firstpyver="$$pyvers" ;\
- else \
- dh_link -pipython /usr/bin/ipython$${firstpyver} /usr/bin/ipython$$pyvers ;\
- fi ;\
- dh_link -pipython /usr/share/man/man1/ipython.1.gz /usr/share/man/man1/ipython$$pyvers.1.gz ;\
- done
-
# change permission on scripts
find $(CURDIR)/debian/ipython-notebook-common -type f | xargs chmod a-x
@@ -169,24 +159,20 @@
dh_python2 -pipython-notebook
override_dh_python3:
- dh_python3 -pipython3
- dh_python3 -pipython3-qtconsole
- dh_python3 -pipython3-notebook
+ dh_python3 -pipython3 --no-shebang-rewrite || dh_python3 -pipython3
+ dh_python3 -pipython3-qtconsole --no-shebang-rewrite || dh_python3 -pipython3-qtconsole
+ dh_python3 -pipython3-notebook --no-shebang-rewrite || dh_python3 -pipython3-notebook
override_dh_installman:
dh_installman
mv debian/ipython3/usr/share/man/man1/ipython.1 \
debian/ipython3/usr/share/man/man1/ipython3.1
- mv debian/ipython3/usr/share/man/man1/irunner.1 \
- debian/ipython3/usr/share/man/man1/irunner3.1
mv debian/ipython3/usr/share/man/man1/ipcluster.1 \
debian/ipython3/usr/share/man/man1/ipcluster3.1
mv debian/ipython3/usr/share/man/man1/ipcontroller.1 \
debian/ipython3/usr/share/man/man1/ipcontroller3.1
mv debian/ipython3/usr/share/man/man1/ipengine.1 \
debian/ipython3/usr/share/man/man1/ipengine3.1
- mv debian/ipython3/usr/share/man/man1/iplogger.1 \
- debian/ipython3/usr/share/man/man1/iplogger3.1
override_dh_sphinxdoc:
ifeq (,$(filter nodocs,$(DEB_BUILD_OPTIONS)))
More information about the Python-modules-commits
mailing list