[Python-apps-commits] r2520 - in packages/eric/trunk/debian (5 files)

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

    Date: Wednesday, March 4, 2009 @ 11:35:49
  Author: gudjon-guest
Revision: 2520

Fixed a problem with chardet from previous Debian version.

Modified:
  packages/eric/trunk/debian/changelog
  packages/eric/trunk/debian/patches/00list
  packages/eric/trunk/debian/rules
Deleted:
  packages/eric/trunk/debian/chardet__init__.py
  packages/eric/trunk/debian/pygments__init__.py

Modified: packages/eric/trunk/debian/changelog
===================================================================
--- packages/eric/trunk/debian/changelog	2009-03-03 18:31:04 UTC (rev 2519)
+++ packages/eric/trunk/debian/changelog	2009-03-04 11:35:49 UTC (rev 2520)
@@ -1,3 +1,11 @@
+eric (4.3.0-2) unstable; urgency=low
+
+  * Add a patch 07_debian_chardet to make eric use python-chardet
+    instead of the upstream one
+  * Remove the whole ThirdParty directory from the package
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Wed, 04 Mar 2009 12:31:58 +0100
+
 eric (4.3.0-1) unstable; urgency=low
 
   [ Marco Rodrigues ]

Deleted: packages/eric/trunk/debian/chardet__init__.py
===================================================================
--- packages/eric/trunk/debian/chardet__init__.py	2009-03-03 18:31:04 UTC (rev 2519)
+++ packages/eric/trunk/debian/chardet__init__.py	2009-03-04 11:35:49 UTC (rev 2520)
@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# A file to include the Debian packaged chardet
-# libraries instead of the original ThirdParty upstream library.
-
-import chardet

Modified: packages/eric/trunk/debian/patches/00list
===================================================================
--- packages/eric/trunk/debian/patches/00list	2009-03-03 18:31:04 UTC (rev 2519)
+++ packages/eric/trunk/debian/patches/00list	2009-03-04 11:35:49 UTC (rev 2520)
@@ -4,3 +4,4 @@
 04_documentation_paths
 05_fix-api-path
 #06_disable-update-warning
+07_debian_chardet

Deleted: packages/eric/trunk/debian/pygments__init__.py
===================================================================
--- packages/eric/trunk/debian/pygments__init__.py	2009-03-03 18:31:04 UTC (rev 2519)
+++ packages/eric/trunk/debian/pygments__init__.py	2009-03-04 11:35:49 UTC (rev 2520)
@@ -1,6 +0,0 @@
-# -*- 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-03-03 18:31:04 UTC (rev 2519)
+++ packages/eric/trunk/debian/rules	2009-03-04 11:35:49 UTC (rev 2520)
@@ -65,10 +65,7 @@
 #   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/*
-	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
+	rm -rf debian/eric/usr/share/eric/modules/ThirdParty
 
 # Build architecture-independent files here.
 binary: patch install