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

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

    Date: Sunday, November 28, 2010 @ 06:53:00
  Author: gudjon-guest
Revision: 6338

* New upstream release
* Add patch 06_no_blacklist.patch
* Add versioned build dependency on python-sip-dev <<4.11 or >>4.11
  and python-qt4-dev <<4.7.5 or >>4.7.5 and binary dependency on
  python-qt4 <<4.7.5 or >>4.7.5 since these versions are blacklisted 
  in upstream

Added:
  packages/eric/trunk/debian/patches/06_no_blacklist.patch
Modified:
  packages/eric/trunk/debian/changelog
  packages/eric/trunk/debian/control
  packages/eric/trunk/debian/patches/series

Modified: packages/eric/trunk/debian/changelog
===================================================================
--- packages/eric/trunk/debian/changelog	2010-11-28 04:53:59 UTC (rev 6337)
+++ packages/eric/trunk/debian/changelog	2010-11-28 06:53:00 UTC (rev 6338)
@@ -1,3 +1,14 @@
+eric (4.4.9-1) unstable; urgency=low
+
+  * New upstream release
+  * Add patch 06_no_blacklist.patch
+  * Add versioned build dependency on python-sip-dev <<4.11 or >>4.11
+    and python-qt4-dev <<4.7.5 or >>4.7.5 and binary dependency on
+    python-qt4 <<4.7.5 or >>4.7.5 since these versions are blacklisted 
+    in upstream
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sat, 27 Nov 2010 21:10:53 +0100
+
 eric (4.4.7-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/eric/trunk/debian/control
===================================================================
--- packages/eric/trunk/debian/control	2010-11-28 04:53:59 UTC (rev 6337)
+++ packages/eric/trunk/debian/control	2010-11-28 06:53:00 UTC (rev 6338)
@@ -6,7 +6,8 @@
 Build-Depends: debhelper (>= 7), quilt
 Build-Depends-Indep: python-all (>= 2.5), python-qt4 (>= 4.5),
  python-support, python-qscintilla2 (>=2.4.3),
- python-sip-dev , qt4-dev-tools, libqt4-dev, python-qt4-dev
+ python-sip-dev (<<4.11) | python-sip-dev (>>4.11), qt4-dev-tools, libqt4-dev,
+ python-qt4-dev (<<4.7.5) | python-qt4-dev (>>4.7.5)
 #, python-kde4
 XS-Python-Version: >=2.5
 Standards-Version: 3.9.1
@@ -16,7 +17,7 @@
 
 Package: eric
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-qt4 (>= 4.5), bicyclerepair (>= 0.9-4.1), 
+Depends: ${python:Depends}, ${misc:Depends}, python-qt4 (<<4.7.5) | python-qt4 (>>4.7.5), bicyclerepair (>= 0.9-4.1), 
  python-pygments, python-chardet, python-qscintilla2 (>=2.4.3), python (>= 2.6) | python-simplejson
 Recommends: eric-api-files
 Suggests: qt4-designer, qt4-doc-html, pyqt4-dev-tools,

Added: packages/eric/trunk/debian/patches/06_no_blacklist.patch
===================================================================
--- packages/eric/trunk/debian/patches/06_no_blacklist.patch	                        (rev 0)
+++ packages/eric/trunk/debian/patches/06_no_blacklist.patch	2010-11-28 06:53:00 UTC (rev 6338)
@@ -0,0 +1,13 @@
+--- a/eric/eric4.py
++++ b/eric/eric4.py
+@@ -194,8 +194,8 @@
+                                   options)
+     ddindex = Startup.handleArgs(sys.argv, appinfo)
+     
+-    if not Utilities.checkBlacklistedVersions():
+-        sys.exit(100)
++    #if not Utilities.checkBlacklistedVersions():
++    #    sys.exit(100)
+     
+     app = KQApplication(sys.argv, kqOptions)
+     

Modified: packages/eric/trunk/debian/patches/series
===================================================================
--- packages/eric/trunk/debian/patches/series	2010-11-28 04:53:59 UTC (rev 6337)
+++ packages/eric/trunk/debian/patches/series	2010-11-28 06:53:00 UTC (rev 6338)
@@ -3,3 +3,4 @@
 03_disable-update-warning.patch
 04_debian_chardet.patch
 05_minor_docfix.patch
+06_no_blacklist.patch