[SCM] PyKDE4 packaging branch, master, updated. debian/4.6.80-3
Modestas Vainius
modax at alioth.debian.org
Fri Jul 22 09:49:08 UTC 2011
The following commit has been merged in the master branch:
commit 21093349c5f7bce3b7db57987b2fee8f78647490
Author: Modestas Vainius <modax at debian.org>
Date: Fri Jul 22 11:49:14 2011 +0300
Revert "Make python-kde4 depend on dh_python2 based python-qt4."
This reverts commit 5b51fc09468c73794772f44cbaa797c7e755353f.
The next commit will workaround the problem for now.
---
debian/changelog | 1 -
debian/control | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dc3444e..d91a38d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,6 @@ pykde4 (4:4.6.80-3) UNRELEASED; urgency=low
dh_python2 based python-kde4.
* Fix GitWeb Vcs URL.
* Move non-default python library to Suggests again.
- * Make python-kde4 depend on dh_python2 based python-qt4. (Closes: #633499)
-- Modestas Vainius <modax at debian.org> Fri, 08 Jul 2011 00:19:29 +0300
diff --git a/debian/control b/debian/control
index b5ac177..57cfe37 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/pykde4.git
Package: python-kde4
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends},
- python-qt4 (>> 4.8.3-2.), ${sip:Depends}, python-sip
+ python-qt4, ${sip:Depends}, python-sip
Provides: ${python:Provides}
Suggests: ${shlibs:Suggests}
Breaks: plasma-script-engine (<< 4:4.6.5)
--
PyKDE4 packaging
More information about the pkg-kde-commits
mailing list