Sat Jun 25 23:07:08 UTC 2011

6 files changed, 39 insertions, 28 deletions

diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index cb05d8e31..49bc53644 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 49493 2011-06-17 22:21:07Z giovanni $
+# $Id: PKGBUILD 50108 2011-06-24 19:28:04Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.6
+pkgver=0.8.7
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
@@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug')
 install=calibre.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         desktop_integration.patch)
-md5sums=('859d856bdcbd12189ffb91c581928ed9'
+md5sums=('d7132ec75f5e742e04e196fc8e2c0884'
          '253ce4fe5d01f8ff76b63cd3825755ea')
 
 build() {
diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD
index 503cac629..c09ef110a 100644
--- a/community/cgit/PKGBUILD
+++ b/community/cgit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 43711 2011-03-29 10:19:12Z spupykin $
+# $Id: PKGBUILD 50113 2011-06-24 20:01:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Current Maintainer:  Patrick Palka <patrick@parcs.ath.cx>
 # Previous Maintainer:  Loui Chang <louipc.ist at gmail com>
@@ -6,8 +6,8 @@
 # Development: http://closure.ath.cx/aur-dev
 
 pkgname=cgit
-pkgver=0.9
-pkgrel=2
+pkgver=0.9.0.1
+pkgrel=1
 pkgdesc="A web interface for git written in plain C"
 arch=('i686' 'x86_64')
 url="http://hjemli.net/git/cgit"
@@ -16,11 +16,10 @@ depends=('openssl')
 makedepends=('git' 'zlib' 'curl' 'asciidoc')
 install=cgit.install
 source=("http://hjemli.net/git/cgit/snapshot/$pkgname-$pkgver.tar.bz2")
-md5sums=('b55f953c5c8a418bca72b3de3c297270')
+md5sums=('dddae5bcfc1eeb469fc2b95531a75c1c')
 
 build() {
   cd "$pkgname-$pkgver"
-
   make get-git
   make
   make doc-man
@@ -28,10 +27,7 @@ build() {
 
 package() {
   cd "$pkgname-$pkgver"
-
   make CGIT_SCRIPT_PATH=/srv/http/cgit DESTDIR="$pkgdir" install install-man
   install -vDm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
   install -vd "$pkgdir/var/cache/$pkgname"
 }
-
-md5sums=('b55f953c5c8a418bca72b3de3c297270')
diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD
index d243c8c33..fb8242bad 100644
--- a/community/fotoxx/PKGBUILD
+++ b/community/fotoxx/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 pkgname=fotoxx
-pkgver=11.06.1
+pkgver=11.06.2
 pkgrel=1
 pkgdesc="A program for improving image files made with a digital camera"
 url="http://kornelix.squarespace.com/fotoxx"
@@ -9,7 +9,7 @@ license=('GPL3')
 depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils' 'desktop-file-utils')
 optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning')
 source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz")
-md5sums=('d485750bd0d808e5df41bddeae8de00c')
+md5sums=('03fac30ee3239f379d5a9fcdc8ba3933')
 install=fotoxx.install
 
 build() {
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index 55008944c..7e222b301 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49923 2011-06-22 14:26:41Z giovanni $
+# $Id: PKGBUILD 50103 2011-06-24 19:11:00Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('i686' 'x86_64')
@@ -12,9 +12,9 @@ license=('BSD')
 depends=('udev')
 makedepends=('pkgconfig')
 options=('!libtool' '!docs')
-source=(https://alioth.debian.org/frs/download.php/3591/pcsc-lite-${pkgver}.tar.bz2
+source=(https://alioth.debian.org/frs/download.php/3598/pcsc-lite-${pkgver}.tar.bz2
         pcscd)
-md5sums=('0dfc1639e4020fb3c04ab37425abbb12'
+md5sums=('1caf0b8ca2ecbf82fe3b035b3fff22dd'
          '80d90388e4d2a551cb7aefe3bd5147bd')
 
 build() {
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 6e3619898..866bff343 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 49861 2011-06-21 12:55:45Z svenstaro $
+# $Id: PKGBUILD 50079 2011-06-24 08:49:19Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -11,34 +11,33 @@ pkgbase=qtcreator
 #pkgname=('qtcreator' 'qtcreator-todo-plugin' 'qtcreator-artisticstyle-plugin')
 pkgname=('qtcreator' 'qtcreator-todo-plugin')
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt.nokia.com/products/developer-tools'
 license=('LGPL')
 depends=('qt>=4.7.3')
-makedepends=('qt-private-headers>=4.7.3')
+makedepends=('qt-private-headers>=4.7.3' 'git')
 options=('docs')
 source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz"
 	    'http://download.berlios.de/astyleplugin/ArtisticStylePlugin-0.6-src.zip'
-	    "https://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin/archive-tarball/88f8fc50"
         'qtcreator.desktop')
 md5sums=('35d74837e48b12ee58379e1c029a9a6c'
          '4dab1bb07ba5c39ae4c975a333d32ec1'
-         '734a6f375e595de796f9802087845dfe'
          '2c3ffbd66845b37be9804f2966815a10')
 
 build() {
   cd ${srcdir}
-  mkdir build
-  cd build
+  [[ -d build ]] && rm -r build
+  mkdir build && cd build
 
   qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro
   make --quiet
   
   # Building TODO plugin
+  git clone git://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin.git $srcdir/qt-creator-todo-plugin
   msg "Starting TODO plugin build...."
-  cd $srcdir/qt-creator-todo-plugin-qt-creator-todo-plugin
+  cd $srcdir/qt-creator-todo-plugin
   sed -i "s|QTC_BUILD_DIR = .*|QTC_BUILD_DIR = ${srcdir}/build|g" todoplugin.pro
   sed -i "s|QTC_SOURCE_DIR = .*|QTC_SOURCE_DIR  = $srcdir/qt-creator-${pkgver}-src/|g" todoplugin.pro
   sed -i "s|\"2.1.81\"|\"${pkgver}\"|g" todo.pluginspec
@@ -66,12 +65,21 @@ package_qtcreator() {
 
   # qt already fixed this
   if [[ -f "$pkgdir/usr/bin/qmlpuppet" ]]; then
-      echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.2.1)"
+      echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.3.0)"
       return 1
   fi
   install -Dm755 bin/qmlpuppet "$pkgdir/usr/bin/qmlpuppet"
   # remove it soon
 
+  # qt already fixed this as well
+  if [[ -f "$pkgdir/usr/lib/qmldesigner/libqtquickplugin.so" ]]; then
+      echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.3.0)"
+      return 1
+  fi
+  mkdir "$pkgdir/usr/lib/qmldesigner"
+  cp lib/qmldesigner/*.so "$pkgdir/usr/lib/qmldesigner/"
+  # remove it soon
+
   install -Dm644 ${srcdir}/qtcreator.desktop \
     ${pkgdir}/usr/share/applications/qtcreator.desktop
   install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \
@@ -88,7 +96,7 @@ package_qtcreator-todo-plugin() {
   install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \
  o-plugin'
   
-  cd $srcdir/qt-creator-todo-plugin-qt-creator-todo-plugin
+  cd $srcdir/qt-creator-todo-plugin
   make INSTALL_ROOT=$pkgdir/usr/ install
 
   install -Dm644 LICENSE.BSD \
diff --git a/community/scrotwm/PKGBUILD b/community/scrotwm/PKGBUILD
index 3d1d7b6cc..cd6c2363a 100644
--- a/community/scrotwm/PKGBUILD
+++ b/community/scrotwm/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=scrotwm
 pkgver=0.9.32
-pkgrel=1
+pkgrel=2
 pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way."
 arch=('i686' 'x86_64')
 url="http://www.scrotwm.org"
@@ -45,4 +45,11 @@ package() {
 
   ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0"
   ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so"
+
+  # fix this for real in the makefile
+  mkdir -p "$pkgdir"/usr/share/man/{es,it,pt,ru}/man1/
+  mv "$pkgdir/usr/share/man/man1/scrotwm_es.1" "$pkgdir/usr/share/man/es/man1/"
+  mv "$pkgdir/usr/share/man/man1/scrotwm_it.1" "$pkgdir/usr/share/man/it/man1/"
+  mv "$pkgdir/usr/share/man/man1/scrotwm_pt.1" "$pkgdir/usr/share/man/pt/man1/"
+  mv "$pkgdir/usr/share/man/man1/scrotwm_ru.1" "$pkgdir/usr/share/man/ru/man1/"
 }