[SCM] A Python IDE for scientists branch, master, updated. debian/2.0.11-1-1-gcdb6fdc

Picca Frédéric-Emma?==?UTF-8?Q?nuel picca at synchrotron-soleil.fr
Mon Jun 13 15:13:11 UTC 2011


The following commit has been merged in the master branch:
commit cdb6fdc62609f85fa1f2cadff40c0120bdddb4b5
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Mon Jun 13 15:55:58 2011 +0200

    first attempt to split spyder into spyder and python-spyderlib

diff --git a/debian/changelog b/debian/changelog
index 4762c48..f0ee1ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+spyder (2.0.11-2) unstable; urgency=low
+
+  * update my email now that I am DD.
+  * debian/control :
+    - split spyder into spyder and python-spyderlib
+    - add the Vcs-* fields.
+  * debian/spyder.desktop :
+    - add for the menu entries
+  * debian/copyright :
+    - switch to dep5 format
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Mon, 13 Jun 2011 12:17:14 +0200
+
 spyder (2.0.11-1) unstable; urgency=low
 
   * Imported Upstream version 2.0.11
diff --git a/debian/control b/debian/control
index 598e2f9..ef07362 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,14 @@ Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Aubry <laubrycomm at free.fr>,
 	   Alexandre Fayolle <afayolle at debian.org>,
-	   Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
+	   Picca Frédéric-Emmanuel <picca at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8.1.1), python-all (>= 2.6.6-3~)
 Build-Depends-Indep: python-sphinx, xsltproc
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.6
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/spyder.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/spyder.git
 Homepage: http://code.google.com/p/spyderlib/
 
 Package: spyder
@@ -17,12 +19,24 @@ Architecture: all
 Section: devel
 Depends: ${misc:Depends},
 	 ${python:Depends},
+	 python-spyderlib (= ${binary:Version})
+Description: Python IDE for scientists
+ Spyder (previously known as Pydee) is a free open-source Python
+ development environment providing MATLAB-like features in a simple
+ and light-weighted software
+
+Package: python-spyderlib
+Architecture: all
+Section: python
+Depends: ${misc:Depends},
+	 ${python:Depends},
 	 python-qt4,
 	 libjs-jquery
 Recommends: python-scipy, python-numpy, python-matplotlib, ipython, pyflakes, pylint, python-rope, python-sphinx
 Provides: ${python:Provides}
+Breaks: ${python:Breaks}, spyder (<< 2.0.11-1),
+Replaces: spyder (<< 2.0.11-1)
 Description: Python IDE for scientists
  Spyder (previously known as Pydee) is a free open-source Python
  development environment providing MATLAB-like features in a simple
  and light-weighted software.
-
diff --git a/debian/copyright b/debian/copyright
index 562c1d7..0d9ca6f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,44 +1,35 @@
-This work was packaged for Debian by:
-
-    Ludovic Aubry <laubrycomm at free.fr> on Wed, 07 Oct 2009 22:47:05 +0200
-
-It was downloaded from http://code.google.com/p/spyderlib/
-
-Upstream Author(s):
-
-    Pierre Raybaut
-
-Copyright:
-
-    Copyright (C) 2009, 2010 Pierre Raybaut
-
-License:
-
-The MIT License
-
-Copyright (c) 2009, 2010 Pierre Raybaut
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-The Debian packaging is:
-
-    Copyright (C) 2009, 2010 Ludovic Aubry <laubrycomm at free.fr>
-
-and is licensed under the same MIT License as above. 
-
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: Pierre Raybaut <pierre.raybaut at gmail.com>
+Upstream-Contact: pierre.raybaut at gmail.com
+Source: http://code.google.com/p/spyderlib
+
+Files: debian/*
+Copyright: © 2009-2010 Ludovic Aubry <laubrycomm at free.fr>
+	   © 2010-2011, Picca Frédéric-Emmanuel <picca at debian.org>
+Licence: MIT
+
+Files: *
+Copyright: © 2009-2011 Pierre Raybaut <pierre.raybaut at gmail.com>
+Licence: MIT
+
+Licence: MIT
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+ 
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
diff --git a/debian/manpage.links b/debian/manpage.links
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/doc-base b/debian/python-spyderlib.doc-base
similarity index 53%
rename from debian/doc-base
rename to debian/python-spyderlib.doc-base
index f004ce4..dad9a74 100644
--- a/debian/doc-base
+++ b/debian/python-spyderlib.doc-base
@@ -1,12 +1,12 @@
-Document: spyder-manual
-Title: spyder documentation manual
+Document: python-spyderlib-manual
+Title: spyderlib documentation manual
 Author: pierre.raybaut at cea.fr
-Abstract: spyder_
+Abstract: python-spyderlib_
  Spyder (previously known as Pydee) is a free open-source Python
  development environment providing MATLAB-like features in a simple
  and light-weighted software.
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/spyder/html/index.html
-Files: /usr/share/doc/spyder/html/*
+Index: /usr/share/doc/python-spyderlib/html/index.html
+Files: /usr/share/doc/python-spyderlib/html/*
diff --git a/debian/python-spyderlib.install b/debian/python-spyderlib.install
new file mode 100644
index 0000000..0d5487b
--- /dev/null
+++ b/debian/python-spyderlib.install
@@ -0,0 +1 @@
+usr/lib
\ No newline at end of file
diff --git a/debian/links b/debian/python-spyderlib.links
similarity index 56%
rename from debian/links
rename to debian/python-spyderlib.links
index b4a85a7..1896a29 100644
--- a/debian/links
+++ b/debian/python-spyderlib.links
@@ -1,2 +1,2 @@
 /usr/share/javascript/jquery/jquery.js /usr/share/pyshared/spyderlib/doc/_static/jquery.js
-/usr/share/pyshared/spyderlib/doc /usr/share/doc/spyder/html
+/usr/share/pyshared/spyderlib/doc /usr/share/doc/python-spyderlib/html
diff --git a/debian/spyder.desktop b/debian/spyder.desktop
new file mode 100644
index 0000000..d35f15a
--- /dev/null
+++ b/debian/spyder.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=spyder
+GenericName=spyder
+Comment=Python IDE for scientists
+TryExec=spyder
+Exec=spyder
+Categories=Education;Science;Physics;
diff --git a/debian/docs b/debian/spyder.docs
similarity index 100%
rename from debian/docs
rename to debian/spyder.docs
diff --git a/debian/spyder.install b/debian/spyder.install
new file mode 100644
index 0000000..f7aed70
--- /dev/null
+++ b/debian/spyder.install
@@ -0,0 +1,2 @@
+usr/bin
+debian/spyder.desktop /usr/share/applications
diff --git a/debian/spyder.links b/debian/spyder.links
new file mode 100644
index 0000000..e0efc17
--- /dev/null
+++ b/debian/spyder.links
@@ -0,0 +1 @@
+/usr/share/pyshared/spyderlib/doc /usr/share/doc/spyder/html
diff --git a/debian/manpages b/debian/spyder.manpages
similarity index 100%
rename from debian/manpages
rename to debian/spyder.manpages
diff --git a/debian/menu b/debian/spyder.menu
similarity index 100%
rename from debian/menu
rename to debian/spyder.menu

-- 
A Python IDE for scientists



More information about the debian-science-commits mailing list