[74554] trunk/dports/python

[snc at macports.org]

Revision: 74554
          http://trac.macports.org/changeset/74554
Author:   snc at macports.org
Date:     2010-12-21 11:20:35 -0800 (Tue, 21 Dec 2010)
Log Message:
-----------
conflict: py26-pqyt4 and py27-pyqt4

Modified Paths:
--------------
    trunk/dports/python/py26-pyqt4/Portfile
    trunk/dports/python/py27-pyqt4/Portfile

Modified: trunk/dports/python/py26-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py26-pyqt4/Portfile	2010-12-21 19:14:04 UTC (rev 74553)
+++ trunk/dports/python/py26-pyqt4/Portfile	2010-12-21 19:20:35 UTC (rev 74554)
@@ -9,6 +9,7 @@
 categories	python devel
 platforms	macosx
 maintainers     michaelld openmaintainer
+conflicts           py27-pyqt4
 description	PyQt4 is a set of Python bindings for the Qt4 toolkit
 long_description \
 		PyQt4 is a set of Python bindings for the Qt4 toolkit. The \

Modified: trunk/dports/python/py27-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py27-pyqt4/Portfile	2010-12-21 19:14:04 UTC (rev 74553)
+++ trunk/dports/python/py27-pyqt4/Portfile	2010-12-21 19:20:35 UTC (rev 74554)
@@ -9,6 +9,7 @@
 categories	python devel
 platforms	macosx
 maintainers     michaelld openmaintainer
+conflicts           py26-pyqt4
 description	PyQt4 is a set of Python bindings for the Qt4 toolkit
 long_description \
 		PyQt4 is a set of Python bindings for the Qt4 toolkit. The \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101221/9c2374ed/attachment.html>