[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-05-07 Thread Andrea Scarpino 
Date: Saturday, May 7, 2011 @ 19:41:30
  Author: andrea
Revision: 123073

archrelease: remove extra-i686

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-05-07 Thread Andrea Scarpino 
Date: Saturday, May 7, 2011 @ 19:41:44
  Author: andrea
Revision: 123074

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-04-17 Thread Andrea Scarpino 
Date: Sunday, April 17, 2011 @ 07:43:08
  Author: andrea
Revision: 119951

archrelease: remove extra-i686

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-04-17 Thread Andrea Scarpino 
Date: Sunday, April 17, 2011 @ 07:43:22
  Author: andrea
Revision: 119952

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-03-31 Thread Andrea Scarpino 
Date: Thursday, March 31, 2011 @ 17:20:01
  Author: andrea
Revision: 117372

archrelease: remove extra-i686

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-03-31 Thread Andrea Scarpino 
Date: Thursday, March 31, 2011 @ 17:20:14
  Author: andrea
Revision: 117373

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-02-25 Thread Stéphane Gaudreault 
Date: Friday, February 25, 2011 @ 20:51:05
  Author: stephane
Revision: 111303

db-move: qscintilla removed by stephane for move to [extra] (i686)

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686 testing-i686)

2011-02-25 Thread Stéphane Gaudreault 
Date: Friday, February 25, 2011 @ 20:51:08
  Author: stephane
Revision: 111304

db-move: moved qscintilla from [testing] to [extra] (i686)

Added:
  qscintilla/repos/extra-i686/
Deleted:
  qscintilla/repos/testing-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-01-29 Thread Andrea Scarpino 
Date: Saturday, January 29, 2011 @ 07:31:11
  Author: andrea
Revision: 108084

archrelease: remove extra-i686

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-01-29 Thread Andrea Scarpino 
Date: Saturday, January 29, 2011 @ 07:31:25
  Author: andrea
Revision: 108085

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-01-22 Thread Andrea Scarpino 
Date: Saturday, January 22, 2011 @ 08:42:30
  Author: andrea
Revision: 107200

archrelease: remove extra-i686

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-01-22 Thread Andrea Scarpino 
Date: Saturday, January 22, 2011 @ 08:42:43
  Author: andrea
Revision: 107201

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-01-22 Thread Andrea Scarpino 
Date: Saturday, January 22, 2011 @ 10:12:54
  Author: andrea
Revision: 107205

archrelease: remove extra-i686

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-01-22 Thread Andrea Scarpino 
Date: Saturday, January 22, 2011 @ 10:13:09
  Author: andrea
Revision: 107206

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-01-19 Thread Andrea Scarpino 
Date: Wednesday, January 19, 2011 @ 12:24:35
  Author: andrea
Revision: 106882

archrelease: remove extra-i686

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-01-19 Thread Andrea Scarpino 
Date: Wednesday, January 19, 2011 @ 12:24:47
  Author: andrea
Revision: 106883

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-01-19 Thread Andrea Scarpino 
Date: Wednesday, January 19, 2011 @ 16:48:53
  Author: andrea
Revision: 106970

archrelease: remove extra-i686

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-01-19 Thread Andrea Scarpino 
Date: Wednesday, January 19, 2011 @ 16:49:06
  Author: andrea
Revision: 106971

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-01-10 Thread Andrea Scarpino 
Date: Monday, January 10, 2011 @ 21:24:46
  Author: andrea
Revision: 105740

archrelease: remove extra-i686

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-01-10 Thread Andrea Scarpino 
Date: Monday, January 10, 2011 @ 21:24:59
  Author: andrea
Revision: 105741

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-01-10 Thread Andrea Scarpino 
Date: Monday, January 10, 2011 @ 21:26:05
  Author: andrea
Revision: 105744

db-remove: qscintilla removed by andrea

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2011-01-10 Thread Andrea Scarpino 
Date: Monday, January 10, 2011 @ 21:29:37
  Author: andrea
Revision: 105746

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2010-12-24 Thread Andrea Scarpino 
Date: Friday, December 24, 2010 @ 11:07:54
  Author: andrea
Revision: 103970

archrelease: remove extra-i686

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2010-12-24 Thread Andrea Scarpino 
Date: Friday, December 24, 2010 @ 11:08:10
  Author: andrea
Revision: 103971

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2010-10-23 Thread Andrea Scarpino 
Date: Saturday, October 23, 2010 @ 20:37:50
  Author: andrea
Revision: 96677

archrelease: remove extra-i686

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2010-10-23 Thread Andrea Scarpino 
Date: Saturday, October 23, 2010 @ 20:38:12
  Author: andrea
Revision: 96678

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2010-10-18 Thread Allan McRae 
Date: Monday, October 18, 2010 @ 17:17:29
  Author: allan
Revision: 95975

db-move: qscintilla removed by allan for move to [extra] (i686)

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686 testing-i686)

2010-10-18 Thread Allan McRae 
Date: Monday, October 18, 2010 @ 17:17:34
  Author: allan
Revision: 95976

db-move: moved qscintilla from [testing] to [extra] (i686)

Added:
  qscintilla/repos/extra-i686/
Deleted:
  qscintilla/repos/testing-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2010-10-06 Thread Andrea Scarpino 
Date: Wednesday, October 6, 2010 @ 16:52:24
  Author: andrea
Revision: 94360

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2010-07-14 Thread Andrea Scarpino 
Date: Wednesday, July 14, 2010 @ 13:34:13
  Author: andrea
Revision: 85488

db-remove: qscintilla removed by andrea

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2010-07-14 Thread Andrea Scarpino 
Date: Wednesday, July 14, 2010 @ 13:36:50
  Author: andrea
Revision: 85494

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2010-07-13 Thread Andrea Scarpino 
Date: Tuesday, July 13, 2010 @ 15:27:55
  Author: andrea
Revision: 85460

archrelease: remove extra-i686

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2010-07-13 Thread Andrea Scarpino 
Date: Tuesday, July 13, 2010 @ 15:28:20
  Author: andrea
Revision: 85461

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2010-03-21 Thread Andrea Scarpino 
Date: Sunday, March 21, 2010 @ 17:40:37
  Author: andrea
Revision: 73032

archrelease: remove extra-i686

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2010-03-21 Thread Andrea Scarpino 
Date: Sunday, March 21, 2010 @ 17:40:57
  Author: andrea
Revision: 73033

archrelease: copy trunk to extra-i686

Added:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686)

2010-02-09 Thread Pierre Schmitz 
Date: Tuesday, February 9, 2010 @ 03:29:38
  Author: pierre
Revision: 67827

db-move: qscintilla removed by pierre for move to extra

Deleted:
  qscintilla/repos/extra-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686 testing-i686)

2010-02-09 Thread Pierre Schmitz 
Date: Tuesday, February 9, 2010 @ 03:29:39
  Author: pierre
Revision: 67828

db-move: moved qscintilla from [testing] to [extra] (i686)

Added:
  qscintilla/repos/extra-i686/
Deleted:
  qscintilla/repos/testing-i686/

[arch-commits] Commit in qscintilla/repos (extra-i686 extra-i686/PKGBUILD)

2010-02-09 Thread Andrea Scarpino 
Date: Tuesday, February 9, 2010 @ 23:31:07
  Author: andrea
Revision: 67967

Merged revisions 67966 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/qscintilla/trunk


  r67966 | andrea | 2010-02-10 05:30:30 +0100 (Wed, 10 Feb 2010) | 2 lines
  
  upgpkg: qscintilla 2.4.2-1
  upstream release


Modified:
  qscintilla/repos/extra-i686/  (properties)
  qscintilla/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |   41 ++---
 1 file changed, 18 insertions(+), 23 deletions(-)


Property changes on: qscintilla/repos/extra-i686
___
Modified: svnmerge-integrated
   - /qscintilla/trunk:1-66985
   + /qscintilla/trunk:1-67966

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-02-10 04:30:30 UTC (rev 67966)
+++ extra-i686/PKGBUILD 2010-02-10 04:31:07 UTC (rev 67967)
@@ -5,51 +5,46 @@
 # Contributor: DaNiMoTh jjdanimoth@gmail.com
 
 pkgname=qscintilla
-pkgver=2.4.1
+pkgver=2.4.2
 pkgrel=1
 license=('GPL')
 pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class
 arch=('i686' 'x86_64')
 url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
-depends=('qt=4.6.0')
+depends=('qt')
 provides=('qscintilla2')
 conflicts=('qscintilla2')
-replaces=('qscintilla2')
-source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-$pkgver.tar.gz)
-md5sums=('2815ea8b7f15d857d657743d023dcbc3')
-options=('force')
+creplaces=('qscintilla2')
+source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz;)
+md5sums=('316dc8b53ec02548cae1c0d5acfa8ace')
 
 build() {
 cd $srcdir/QScintilla-gpl-$pkgver/Qt4
-sed -i s|DESTDIR = .*|DESTDIR = $pkgdir/usr/lib|g qscintilla.pro
 sed -i s|header.path = .*|header.path = $pkgdir/usr/include|g 
qscintilla.pro
 sed -i s|trans.path = .*|trans.path = 
$pkgdir/usr/share/qt/translations|g qscintilla.pro
 sed -i s|qsci.path = .*|qsci.path = $pkgdir/usr/share/qt/translations|g 
qscintilla.pro
 
 qmake qscintilla.pro
 sed -i 's|$(MOVE) $(TARGET)|$(COPY) $(TARGET)|g' Makefile
-make || return 1
-make DESTDIR=$pkgdir install
+make DESTDIR=${pkgdir} || return 1
 
-cd ../designer-Qt4
-
 # Qt4 designer qscintilla2 plugin
-mkdir -p $pkgdir/usr/lib/qt/plugins/designer
-
+cd ../designer-Qt4
+install -d ${pkgdir}/usr/lib/qt/plugins/designer
 echo INCPATH += ../Qt4  designer.pro
 sed -i s|LIBS.*|LIBS += -L../Qt4 -lqscintilla2|g designer.pro
 qmake designer.pro
 make || return 1
-cp libqscintillaplugin.so $pkgdir/usr/lib/qt/plugins/designer/ || return 1
+}
 
-msg Installing the libs to the right place
+package() {
+  cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4
+  make DESTDIR=${pkgdir} install || return 1
+  cp libqscintilla2.so.5.2.0 ${pkgdir}/usr/lib/ || return 1
+  ln -s libqscintilla2.so.5.2.0 ${pkgdir}/usr/lib/libqscintilla2.so
+  ln -s libqscintilla2.so.5.2.0 ${pkgdir}/usr/lib/libqscintilla2.so.5
+  ln -s libqscintilla2.so.5.2.0 ${pkgdir}/usr/lib/libqscintilla2.so.5.2
 
-cd ../Qt4
-cp libqscintilla2.so.5.2.0 $pkgdir/usr/lib/ || return 1
-
-pushd $pkgdir/usr/lib/
-ln -s libqscintilla2.so.5.2.0 libqscintilla2.so
-ln -s libqscintilla2.so.5.2.0 libqscintilla2.so.5
-ln -s libqscintilla2.so.5.2.0 libqscintilla2.so.5.2
-popd
+  cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4
+  cp libqscintillaplugin.so ${pkgdir}/usr/lib/qt/plugins/designer/ || return 1
 }

[arch-commits] Commit in qscintilla/repos (extra-i686)

2010-01-30 Thread Jan de Groot 
Date: Saturday, January 30, 2010 @ 15:01:52
  Author: jgc
Revision: 65821

db-move: qscintilla removed by jgc for move to extra

Deleted:
  qscintilla/repos/extra-i686/