[Python-apps-commits] r10332 - in packages/eric/trunk/debian (8 files)

gudjon-guest at users.alioth.debian.org gudjon-guest at users.alioth.debian.org
Sun Jan 5 14:25:00 UTC 2014 

    Date: Sunday, January 5, 2014 @ 14:24:59
  Author: gudjon-guest
Revision: 10332

* New upstream release
* Bump standards version to 3.9.5
* Add path to PyKDE4 doc to patch 01_path_fix

Modified:
  packages/eric/trunk/debian/changelog
  packages/eric/trunk/debian/control
  packages/eric/trunk/debian/patches/01_path_fix.patch
  packages/eric/trunk/debian/patches/02_missing-profile.patch
  packages/eric/trunk/debian/patches/03_disable-update-warning.patch
  packages/eric/trunk/debian/patches/04_debian_chardet.patch
  packages/eric/trunk/debian/patches/05_minor_docfix.patch
  packages/eric/trunk/debian/patches/06_no_blacklist.patch

Modified: packages/eric/trunk/debian/changelog
===================================================================
--- packages/eric/trunk/debian/changelog	2014-01-05 14:05:12 UTC (rev 10331)
+++ packages/eric/trunk/debian/changelog	2014-01-05 14:24:59 UTC (rev 10332)
@@ -1,3 +1,11 @@
+eric (4.5.17-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump standards version to 3.9.5
+  * Add path to PyKDE4 doc to patch 01_path_fix
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Fri, 13 Dec 2013 22:15:23 +0100
+
 eric (4.5.13-1) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/eric/trunk/debian/control
===================================================================
--- packages/eric/trunk/debian/control	2014-01-05 14:05:12 UTC (rev 10331)
+++ packages/eric/trunk/debian/control	2014-01-05 14:24:59 UTC (rev 10332)
@@ -9,7 +9,7 @@
  python-sip-dev, qt4-dev-tools, libqt4-dev, python-qt4-dev
 #, python-kde4
 X-Python-Version: >=2.5
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://eric-ide.python-projects.org/
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/eric/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/eric/trunk/

Modified: packages/eric/trunk/debian/patches/01_path_fix.patch
===================================================================
--- packages/eric/trunk/debian/patches/01_path_fix.patch	2014-01-05 14:05:12 UTC (rev 10331)
+++ packages/eric/trunk/debian/patches/01_path_fix.patch	2014-01-05 14:24:59 UTC (rev 10332)
@@ -2,7 +2,7 @@
 Fixes paths and toolname extensions.
 --- a/eric/Preferences/__init__.py
 +++ b/eric/Preferences/__init__.py
-@@ -531,10 +531,10 @@
+@@ -575,11 +575,11 @@
      helpDefaults = {
          "HelpViewerType" : 1,      # this coresponds with the radio button id
          "CustomViewer" : "",
@@ -10,14 +10,16 @@
 -        "QtDocDir" : "",
 -        "Qt4DocDir" : "",
 -        "PyQt4DocDir" : "",
+-        "PyKDE4DocDir" : "",
 +        "PythonDocDir" : "/usr/share/doc/python-doc/html/index.html",
 +        "QtDocDir" : "/usr/share/doc/qt3-doc/html/",
 +        "Qt4DocDir" : "/usr/share/doc/qt4-doc-html/html/index.html",
 +        "PyQt4DocDir" : "/usr/share/doc/python-qt4-doc/html/",
-         "PyKDE4DocDir" : "",
++        "PyKDE4DocDir" : "/usr/share/doc/python-kde4-doc/html/",
          "PySideDocDir" : "", 
          "SingleHelpWindow" : 1,
-@@ -622,8 +622,8 @@
+         "SaveGeometry" : 1,
+@@ -666,8 +666,8 @@
      qtDefaults = {
          "Qt4TranslationsDir" : "",
          "QtToolsPrefix4" : "", 

Modified: packages/eric/trunk/debian/patches/02_missing-profile.patch
===================================================================
--- packages/eric/trunk/debian/patches/02_missing-profile.patch	2014-01-05 14:05:12 UTC (rev 10331)
+++ packages/eric/trunk/debian/patches/02_missing-profile.patch	2014-01-05 14:24:59 UTC (rev 10332)
@@ -3,7 +3,7 @@
 in non-free
 --- a/eric/Debugger/DebugUI.py
 +++ b/eric/Debugger/DebugUI.py
-@@ -1356,6 +1356,22 @@
+@@ -1370,6 +1370,22 @@
          @param runProject flag indicating coverage of the current project (True)
                  or script (false)
          """

Modified: packages/eric/trunk/debian/patches/03_disable-update-warning.patch
===================================================================
--- packages/eric/trunk/debian/patches/03_disable-update-warning.patch	2014-01-05 14:05:12 UTC (rev 10331)
+++ packages/eric/trunk/debian/patches/03_disable-update-warning.patch	2014-01-05 14:24:59 UTC (rev 10332)
@@ -1,9 +1,6 @@
-Index: eric-4.4.1/eric/UI/UserInterface.py
-Disables upgrade of eric outside the Debian package system
-===================================================================
---- eric-4.4.1.orig/eric/UI/UserInterface.py	2010-03-26 20:40:23.000000000 +0100
-+++ eric-4.4.1/eric/UI/UserInterface.py	2010-03-26 20:42:03.000000000 +0100
-@@ -5510,7 +5510,8 @@
+--- a/eric/UI/UserInterface.py
++++ b/eric/UI/UserInterface.py
+@@ -5508,7 +5508,8 @@
                      res = KQMessageBox.information(None,
                          self.trUtf8("Update available"),
                          self.trUtf8("""The update to <b>%1</b> of eric4 is available"""
@@ -13,7 +10,7 @@
                              .arg(versions[0]).arg(versions[1]),
                          QMessageBox.StandardButtons(\
                              QMessageBox.No | \
-@@ -5527,8 +5528,8 @@
+@@ -5525,8 +5526,8 @@
                  self.trUtf8("Error during updates check"),
                  self.trUtf8("""Could not perform updates check."""))
          

Modified: packages/eric/trunk/debian/patches/04_debian_chardet.patch
===================================================================
--- packages/eric/trunk/debian/patches/04_debian_chardet.patch	2014-01-05 14:05:12 UTC (rev 10331)
+++ packages/eric/trunk/debian/patches/04_debian_chardet.patch	2014-01-05 14:24:59 UTC (rev 10332)
@@ -2,7 +2,7 @@
 of the upstream ThirdParty one.
 --- a/eric/Utilities/__init__.py
 +++ b/eric/Utilities/__init__.py
-@@ -129,8 +129,8 @@
+@@ -172,8 +172,8 @@
      if Preferences.getEditor("AdvancedEncodingDetection"):
          # Try the universal character encoding detector
          try:

Modified: packages/eric/trunk/debian/patches/05_minor_docfix.patch
===================================================================
--- packages/eric/trunk/debian/patches/05_minor_docfix.patch	2014-01-05 14:05:12 UTC (rev 10331)
+++ packages/eric/trunk/debian/patches/05_minor_docfix.patch	2014-01-05 14:24:59 UTC (rev 10332)
@@ -1,7 +1,7 @@
 Minor changes to documentation
 --- a/eric/Documentation/Source/eric4.QScintilla.QsciScintillaCompat.html
 +++ b/eric/Documentation/Source/eric4.QScintilla.QsciScintillaCompat.html
-@@ -245,7 +245,7 @@
+@@ -258,7 +258,7 @@
  <td>Public method to set the current indicator.</td>
  </tr><tr>
  <td><a href="#QsciScintillaCompat.setCursorFlashTime">setCursorFlashTime</a></td>
@@ -10,7 +10,7 @@
  </tr><tr>
  <td><a href="#QsciScintillaCompat.setEolModeByEolString">setEolModeByEolString</a></td>
  <td>Public method to set the eol mode given the eol string.</td>
-@@ -973,7 +973,7 @@
+@@ -1023,7 +1023,7 @@
  <h4>QsciScintillaCompat.setCursorFlashTime</h4>
  <b>setCursorFlashTime</b>(<i>time</i>)
  <p>
@@ -19,7 +19,7 @@
  </p><p>
          The flash time is the time required to display, invert and restore the 
          caret display. Usually the text cursor is displayed for half the cursor 
-@@ -1173,4 +1173,4 @@
+@@ -1223,4 +1223,4 @@
  </dl>
  <div align="right"><a href="#top">Up</a></div>
  <hr />

Modified: packages/eric/trunk/debian/patches/06_no_blacklist.patch
===================================================================
--- packages/eric/trunk/debian/patches/06_no_blacklist.patch	2014-01-05 14:05:12 UTC (rev 10331)
+++ packages/eric/trunk/debian/patches/06_no_blacklist.patch	2014-01-05 14:24:59 UTC (rev 10332)
@@ -2,7 +2,7 @@
 in the control file. 
 --- a/eric/eric4.py
 +++ b/eric/eric4.py
-@@ -194,8 +194,8 @@
+@@ -192,8 +192,8 @@
                                    options)
      ddindex = Startup.handleArgs(sys.argv, appinfo)

More information about the Python-apps-commits mailing list