[Python-apps-commits] r2491 - 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:54:38 UTC 2009
Date: Thursday, February 26, 2009 @ 20:54:37
Author: gudjon-guest
Revision: 2491
Removed patch 07_remove_thirdparty but added a new __init__.py files that import the Debian packaged libraries
Added:
packages/eric/trunk/debian/chardet__init__.py
packages/eric/trunk/debian/pygments__init__.py
Modified:
packages/eric/trunk/debian/changelog
packages/eric/trunk/debian/rules
Deleted:
packages/eric/trunk/debian/patches/07_thirdparty_removal.dpatch
Modified: packages/eric/trunk/debian/changelog
===================================================================
--- packages/eric/trunk/debian/changelog 2009-02-26 20:09:31 UTC (rev 2490)
+++ packages/eric/trunk/debian/changelog 2009-02-26 20:54:37 UTC (rev 2491)
@@ -34,11 +34,11 @@
* 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
+ * Make new ThirdParty __init__.py files to import pygments and chardet
+ files
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Thu, 26 Feb 2009 21:03:34 +0100
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Thu, 26 Feb 2009 21:52:36 +0100
eric (4.2.5-1) experimental; urgency=low
Added: packages/eric/trunk/debian/chardet__init__.py
===================================================================
--- packages/eric/trunk/debian/chardet__init__.py (rev 0)
+++ packages/eric/trunk/debian/chardet__init__.py 2009-02-26 20:54:37 UTC (rev 2491)
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+
+# A file to include the Debian packaged chardet
+# libraries instead of the original ThirdParty upstream library.
+
+import chardet
Deleted: packages/eric/trunk/debian/patches/07_thirdparty_removal.dpatch
===================================================================
--- packages/eric/trunk/debian/patches/07_thirdparty_removal.dpatch 2009-02-26 20:09:31 UTC (rev 2490)
+++ packages/eric/trunk/debian/patches/07_thirdparty_removal.dpatch 2009-02-26 20:54:37 UTC (rev 2491)
@@ -1,80 +0,0 @@
-#! /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
Added: packages/eric/trunk/debian/pygments__init__.py
===================================================================
--- packages/eric/trunk/debian/pygments__init__.py (rev 0)
+++ packages/eric/trunk/debian/pygments__init__.py 2009-02-26 20:54:37 UTC (rev 2491)
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+
+# A file to include the Debian packaged pygments and chardet
+# libraries instead of the original ThirdParty upstream libraries.
+
+import pygments
Modified: packages/eric/trunk/debian/rules
===================================================================
--- packages/eric/trunk/debian/rules 2009-02-26 20:09:31 UTC (rev 2490)
+++ packages/eric/trunk/debian/rules 2009-02-26 20:54:37 UTC (rev 2491)
@@ -65,7 +65,10 @@
# 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
+ rm -rf debian/eric/usr/share/eric/modules/ThirdParty/*
+ mkdir -p debian/eric/usr/share/eric/modules/ThirdParty/CharDet
+ cp debian/chardet__init__.py debian/eric/usr/share/eric/modules/ThirdParty/CharDet/__init__.py
+ cp debian/pygments__init__.py debian/eric/usr/share/eric/modules/ThirdParty/__init__.py
# Build architecture-independent files here.
binary: patch install
More information about the Python-apps-commits
mailing list