[Python-apps-commits] r4480 - in packages/eric/trunk/debian (4 files)

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

    Date: Saturday, January 9, 2010 @ 13:45:02
  Author: gudjon-guest
Revision: 4480

Version 4.3.10 is ready for upload

Modified:
  packages/eric/trunk/debian/changelog
  packages/eric/trunk/debian/control
  packages/eric/trunk/debian/get_translations.sh
  packages/eric/trunk/debian/patches/01_path_fix.dpatch

Modified: packages/eric/trunk/debian/changelog
===================================================================
--- packages/eric/trunk/debian/changelog	2010-01-08 21:32:17 UTC (rev 4479)
+++ packages/eric/trunk/debian/changelog	2010-01-09 13:45:02 UTC (rev 4480)
@@ -1,3 +1,12 @@
+eric (4.3.10-1) unstable; urgency=low
+
+  * New upstream release (Closes: #563183)
+  * Change dependency on python-all-dev to python-all
+  * Add misc dependency to eric-api-files
+  * Change patch 01_path_fix to fix qt3 tools
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sat, 09 Jan 2010 14:23:26 +0100
+
 eric (4.3.9-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/eric/trunk/debian/control
===================================================================
--- packages/eric/trunk/debian/control	2010-01-08 21:32:17 UTC (rev 4479)
+++ packages/eric/trunk/debian/control	2010-01-09 13:45:02 UTC (rev 4480)
@@ -4,7 +4,7 @@
 Maintainer: Gudjon I. Gudjonsson <gudjon at gudjon.org>
 Uploaders: Martin Höfling <martin.hoefling at gmx.de>, Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5.0.38), dpatch
-Build-Depends-Indep: python-all-dev (>= 2.4.4-2), python-qt4 (>= 4.5), python-qt4-dev (>= 4.5),
+Build-Depends-Indep: python-all (>= 2.4.4-2), python-qt4 (>= 4.5), python-qt4-dev (>= 4.5),
  sip4 (>= 4.9), qt4-dev-tools, python-support, python-qscintilla2 (>=2.4-3),
  python-qt-dev, libqt4-dev
 XS-Python-Version: >=2.4
@@ -44,7 +44,7 @@
 
 Package: eric-api-files
 Architecture: all
-Depends: eric
+Depends: ${misc:Depends}, eric
 Description: API description files for use with eric
  This package contains code completion API files of
  Python standard modules & builtins, PyQt and PyKDE.

Modified: packages/eric/trunk/debian/get_translations.sh
===================================================================
--- packages/eric/trunk/debian/get_translations.sh	2010-01-08 21:32:17 UTC (rev 4479)
+++ packages/eric/trunk/debian/get_translations.sh	2010-01-09 13:45:02 UTC (rev 4480)
@@ -1,5 +1,5 @@
 #!/bin/sh
-VERSION=4.3.9
+VERSION=4.3.10
 wget http://sourceforge.net/projects/eric-ide/files/eric4/stable/${VERSION}/eric4-i18n-cs-${VERSION}.tar.gz/download
 wget http://sourceforge.net/projects/eric-ide/files/eric4/stable/${VERSION}/eric4-i18n-de-${VERSION}.tar.gz/download
 wget http://sourceforge.net/projects/eric-ide/files/eric4/stable/${VERSION}/eric4-i18n-es-${VERSION}.tar.gz/download

Modified: packages/eric/trunk/debian/patches/01_path_fix.dpatch
===================================================================
--- packages/eric/trunk/debian/patches/01_path_fix.dpatch	2010-01-08 21:32:17 UTC (rev 4479)
+++ packages/eric/trunk/debian/patches/01_path_fix.dpatch	2010-01-09 13:45:02 UTC (rev 4480)
@@ -6,9 +6,9 @@
 ## DP: Fixes paths and toolname extensions.
 
 @DPATCH@
-diff -urNad eric-4.3.0~/eric/Preferences/__init__.py eric-4.3.0/eric/Preferences/__init__.py
---- eric-4.3.0~/eric/Preferences/__init__.py	2009-02-19 22:26:06.000000000 +0100
-+++ eric-4.3.0/eric/Preferences/__init__.py	2009-02-19 22:28:11.000000000 +0100
+diff -urNad eric-4.3.10~/eric/Preferences/__init__.py eric-4.3.10/eric/Preferences/__init__.py
+--- eric-4.3.10~/eric/Preferences/__init__.py	2010-01-09 14:19:02.000000000 +0100
++++ eric-4.3.10/eric/Preferences/__init__.py	2010-01-09 14:23:12.000000000 +0100
 @@ -499,10 +499,10 @@
      helpDefaults = {
          "HelpViewerType" : 1,      # this coresponds with the radio button id
@@ -24,18 +24,17 @@
          "PyKDE4DocDir" : "", 
          "SingleHelpWindow" : 1,
          "SaveGeometry" : 1,
-@@ -562,14 +562,14 @@
+@@ -565,14 +565,14 @@
  
      # defaults for Qt related stuff
      qtDefaults = {
 -        "QtDir" : "",
-+        "QtDir" : "/usr/share/qt5",
++        "QtDir" : "/usr/share/qt3",
          "ExportQtDir" : 0,
          "DisableQt3" : 0,
          "Qt4TranslationsDir" : "",
          "QtToolsPrefix3" : "", 
--        "QtToolsPostfix3" : "", 
-+        "QtToolsPostfix3" : "-qt3", 
+         "QtToolsPostfix3" : "", 
          "QtToolsPrefix4" : "", 
 -        "QtToolsPostfix4" : "", 
 +        "QtToolsPostfix4" : "-qt4",