Date: Friday, January 2, 2015 @ 07:36:34 Author: arcanis Revision: 125151
upgpkg: qscintilla-qt5 2.8.4-2 remove conflict with qscintilla Added: qscintilla-qt5/trunk/ChangeLog Modified: qscintilla-qt5/trunk/PKGBUILD -----------+ ChangeLog | 5 +++++ PKGBUILD | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) Added: ChangeLog =================================================================== --- ChangeLog (rev 0) +++ ChangeLog 2015-01-02 06:36:34 UTC (rev 125151) @@ -0,0 +1,5 @@ +2.8.4-2: +remov conflict with qsctintilla + +2.8.4-1: +move to [community] Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-01-02 01:57:20 UTC (rev 125150) +++ PKGBUILD 2015-01-02 06:36:34 UTC (rev 125151) @@ -6,7 +6,7 @@ pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') pkgver=2.8.4 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" @@ -15,6 +15,7 @@ source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py.patch' 'libname.patch') +changelog=ChangeLog md5sums=('28aec903ff48ae541295a4fb9c96f8ea' 'ea1d11d0a87341d2e55ebef6beeb5663' '1ac0fea53f72b0146e0820912ae8c48c') @@ -51,7 +52,6 @@ package_qscintilla-qt5() { pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class" depends=('qt5-base') - conflicts=('qscintilla') cd "QScintilla-gpl-${pkgver}/Qt4Qt5" make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install