[Python-apps-commits] r2490 - in packages/eric/trunk/debian (5 files)
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Thu Feb 26 20:09:32 UTC 2009
Date: Thursday, February 26, 2009 @ 20:09:31
Author: gudjon-guest
Revision: 2490
Added patch 07_thirdparty_removal and added information about ThirdParty pygments and chardet libraries to copyright file.
Added:
packages/eric/trunk/debian/patches/07_thirdparty_removal.dpatch
Modified:
packages/eric/trunk/debian/changelog
packages/eric/trunk/debian/control
packages/eric/trunk/debian/copyright
packages/eric/trunk/debian/rules
Modified: packages/eric/trunk/debian/changelog
===================================================================
--- packages/eric/trunk/debian/changelog 2009-02-26 20:02:49 UTC (rev 2489)
+++ packages/eric/trunk/debian/changelog 2009-02-26 20:09:31 UTC (rev 2490)
@@ -1,7 +1,6 @@
eric (4.3.0-1) unstable; urgency=low
[ Marco Rodrigues ]
- * Add myself to Uploaders.
* debian/control:
+ Set new Homepage URL.
+ Add XB-Python-Version to eric-api-files.
@@ -33,8 +32,13 @@
* New upstream release (Closes: #501770)
* Upstream license change from GPL2 to GPL3
* Fix patches 01, 04 and 05
+ * Add dependency on python-pygments and python-chardet
+ * Add pygments license to copyright file
+ * Add patch 07_thirdparty_removal. Makes Eric use the Debian
+ versions of pygments and chardet.
+ * Remove ThirdParty after installation to debian/eric in debian/rules
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Sun, 24 Feb 2009 18:42:11 +0100
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Thu, 26 Feb 2009 21:03:34 +0100
eric (4.2.5-1) experimental; urgency=low
Modified: packages/eric/trunk/debian/control
===================================================================
--- packages/eric/trunk/debian/control 2009-02-26 20:02:49 UTC (rev 2489)
+++ packages/eric/trunk/debian/control 2009-02-26 20:09:31 UTC (rev 2490)
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Gudjon I. Gudjonsson <gudjon at gudjon.org>
-Uploaders: Martin Höfling <martin.hoefling at gmx.de>, Marco Rodrigues <gothicx at sapo.pt>
+Uploaders: Martin Höfling <martin.hoefling at gmx.de>
Build-Depends: debhelper (>= 5.0.38), dpatch
Build-Depends-Indep: python-all-dev (>= 2.4.4-2), python-qt4 (>= 4.3-2), python-qt4-dev (>= 4.3-2),
sip4 (>= 4.7), qt4-dev-tools, python-central (>= 0.5.8), python-qscintilla2,
@@ -14,7 +14,7 @@
Package: eric
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, python-qt4 (>= 4.3.1),
- bicyclerepair (>= 0.9-4.1), python-qscintilla2
+ bicyclerepair (>= 0.9-4.1), python-pygments, python-chardet, python-qscintilla2
Recommends: eric-api-files
Suggests: qt4-assistant, qt4-designer, qt4-doc-html, pyqt4-dev-tools,
qt4-dev-tools, ruby, python-doc, python-qt4-doc, python-kde4-doc, python-profiler
Modified: packages/eric/trunk/debian/copyright
===================================================================
--- packages/eric/trunk/debian/copyright 2009-02-26 20:02:49 UTC (rev 2489)
+++ packages/eric/trunk/debian/copyright 2009-02-26 20:09:31 UTC (rev 2490)
@@ -16,3 +16,78 @@
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-3'.
+
+
+Two third party libraries exist in the code called pygments and chardet.
+They are not used but the debian versions python-pygments and
+python-chardet are used instead.
+
+Pygments has the following license. The AUTHORS file can be found below.
+
+Copyright (c) 2006 by the respective authors (see AUTHORS file).
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * The names of the contributors may not be used to endorse or
+ promote products derived from this software without specific
+ prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+(AUTHORS file)
+Pygments is written and maintained by Georg Brandl <g.brandl at gmx.net>.
+
+Other contributors (as mentionend in :copyright:s) are:
+
+- Armin Ronacher <armin.ronacher at active-4.com>
+- Lukas Meuser <pocoo at quittenbrod.de>
+- Matt Good <trac at matt-good.net>
+- Tim Hatch <tim at timhatch.com>
+- Ronny Pfannschmidt
+- Dennis Kaarsemaker
+- Marek Kubica
+- Ben Bangert
+- Tiberius Teng
+- Adam Blinkinsop <blinks at acm.org>
+- Kirk McDonald
+- Christopher Creutzig <christopher at creutzig.de>
+- Frits van Bommel
+- Matteo Sasso
+- Kumar Appaiah <akumar at ee.iitm.ac.in>
+- Varun Hiremath <varunhiremath at gmail.com>
+- Jeremy Thurgood
+- Matthew Harrison
+- Steven Hazel
+
+Many thanks for all your contributions!
+
+Also thanks to the following contributors that helped fixing minor
+bugs:
+
+- Pierre Bourdon
+
+Chardet has the following license
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 2.1, February 1999
+See: /usr/share/common-licenses/LGPL-2.1
\ No newline at end of file
Added: packages/eric/trunk/debian/patches/07_thirdparty_removal.dpatch
===================================================================
--- packages/eric/trunk/debian/patches/07_thirdparty_removal.dpatch (rev 0)
+++ packages/eric/trunk/debian/patches/07_thirdparty_removal.dpatch 2009-02-26 20:09:31 UTC (rev 2490)
@@ -0,0 +1,80 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_thirdparty_removal.dpatch by Gudjon I. Gudjonsson <gudjon at gudjon.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Makes Eric use the Debian versions of pygments and chardet instead
+## DP: of the ThirdParty libraries in upstream.
+
+ at DPATCH@
+diff -urNad eric-4.3.0~/eric/Utilities/__init__.py eric-4.3.0/eric/Utilities/__init__.py
+--- eric-4.3.0~/eric/Utilities/__init__.py 2009-01-01 14:49:18.000000000 +0100
++++ eric-4.3.0/eric/Utilities/__init__.py 2009-02-26 20:27:40.000000000 +0100
+@@ -123,8 +123,8 @@
+ if Preferences.getEditor("AdvancedEncodingDetection"):
+ # Try the universal character encoding detector
+ try:
+- import ThirdParty.CharDet.chardet
+- guess = ThirdParty.CharDet.chardet.detect(text)
++ import chardet
++ guess = chardet.detect(text)
+ if guess and guess['confidence'] > 0.95 and guess['encoding'] is not None:
+ codec = guess['encoding'].lower()
+ return unicode(text, codec), '%s-guessed' % codec
+diff -urNad eric-4.3.0~/eric/eric4-configure.py eric-4.3.0/eric/eric4-configure.py
+--- eric-4.3.0~/eric/eric4-configure.py 2008-12-30 17:39:34.000000000 +0100
++++ eric-4.3.0/eric/eric4-configure.py 2009-02-26 20:38:36.000000000 +0100
+@@ -22,7 +22,8 @@
+ sys.e4nokde = os.getenv("e4nokde") is not None and os.getenv("e4nokde") == "1"
+
+ # make ThirdParty package available as a packages repository
+-sys.path.insert(2, os.path.join(os.path.dirname(__file__), "ThirdParty"))
++sys.path.insert(2, "/usr/share/python-support/python-pygments")
++sys.path.insert(2, "/usr/share/pyshared")
+
+ from Utilities import Startup
+
+diff -urNad eric-4.3.0~/eric/eric4-editor.py eric-4.3.0/eric/eric4-editor.py
+--- eric-4.3.0~/eric/eric4-editor.py 2008-12-30 17:39:31.000000000 +0100
++++ eric-4.3.0/eric/eric4-editor.py 2009-02-26 20:38:56.000000000 +0100
+@@ -24,7 +24,8 @@
+ sys.e4nokde = os.getenv("e4nokde") is not None and os.getenv("e4nokde") == "1"
+
+ # make ThirdParty package available as a packages repository
+-sys.path.insert(2, os.path.join(os.path.dirname(__file__), "ThirdParty"))
++sys.path.insert(2, "/usr/share/python-support/python-pygments")
++sys.path.insert(2, "/usr/share/pyshared")
+
+ from Utilities import Startup
+
+@@ -66,4 +67,4 @@
+ sys.exit(res)
+
+ if __name__ == '__main__':
+- main()
+\ No newline at end of file
++ main()
+diff -urNad eric-4.3.0~/eric/eric4.py eric-4.3.0/eric/eric4.py
+--- eric-4.3.0~/eric/eric4.py 2009-01-18 15:41:42.000000000 +0100
++++ eric-4.3.0/eric/eric4.py 2009-02-26 20:38:23.000000000 +0100
+@@ -39,7 +39,8 @@
+ sys.e4nokde = os.getenv("e4nokde") is not None and os.getenv("e4nokde") == "1"
+
+ # make ThirdParty package available as a packages repository
+-sys.path.insert(2, os.path.join(os.path.dirname(__file__), "ThirdParty"))
++sys.path.insert(2, "/usr/share/python-support/python-pygments")
++sys.path.insert(2, "/usr/share/pyshared")
+
+ from KdeQt.KQApplication import KQApplication
+
+diff -urNad eric-4.3.0~/eric/pylint.rc eric-4.3.0/eric/pylint.rc
+--- eric-4.3.0~/eric/pylint.rc 2007-11-17 11:27:24.000000000 +0100
++++ eric-4.3.0/eric/pylint.rc 2009-02-26 20:22:04.000000000 +0100
+@@ -18,7 +18,7 @@
+ ignore=CVS,
+ .svn,
+ .hg,
+- ThirdParty,
++# ThirdParty,
+ Examples,
+ Ruby,
+ # ignore autogenerated files for Qt designer forms
Property changes on: packages/eric/trunk/debian/patches/07_thirdparty_removal.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/eric/trunk/debian/rules
===================================================================
--- packages/eric/trunk/debian/rules 2009-02-26 20:02:49 UTC (rev 2489)
+++ packages/eric/trunk/debian/rules 2009-02-26 20:09:31 UTC (rev 2490)
@@ -64,6 +64,8 @@
# remove README-PyXML.txt
rm -f debian/eric/usr/share/doc/eric/README-PyXML.txt
+# remove the ThirdParty libraries
+ rm -rf debian/eric/usr/share/eric/modules/ThirdParty
# Build architecture-independent files here.
binary: patch install
More information about the Python-apps-commits
mailing list