[arch-commits] Commit in xf86dgaproto/trunk (PKGBUILD)

2011-11-01 Thread Pierre Schmitz
Date: Tuesday, November 1, 2011 @ 05:52:15
  Author: pierre
Revision: 141645

upgpkg: xf86dgaproto :2.1-2

rebuild old package

Modified:
  xf86dgaproto/trunk/PKGBUILD

--+
 PKGBUILD |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 05:45:03 UTC (rev 141644)
+++ PKGBUILD2011-11-01 09:52:15 UTC (rev 141645)
@@ -4,20 +4,23 @@
 
 pkgname=xf86dgaproto
 pkgver=2.1
-pkgrel=1
+pkgrel=2
 pkgdesc=X11 Direct Graphics Access extension wire protocol
-arch=(any)
+arch=('any')
 url=http://xorg.freedesktop.org/;
 license=('custom')
-source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
+source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('a036dc2fcbf052ec10621fd48b68dbb1')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  ./configure --prefix=/usr
+  make
+}
 
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname} || return 1
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 }



[arch-commits] Commit in xf86dgaproto/repos/extra-any (PKGBUILD PKGBUILD)

2011-11-01 Thread Pierre Schmitz
Date: Tuesday, November 1, 2011 @ 05:52:46
  Author: pierre
Revision: 141646

archrelease: copy trunk to extra-any

Added:
  xf86dgaproto/repos/extra-any/PKGBUILD
(from rev 141645, xf86dgaproto/trunk/PKGBUILD)
Deleted:
  xf86dgaproto/repos/extra-any/PKGBUILD

--+
 PKGBUILD |   49 ++---
 1 file changed, 26 insertions(+), 23 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-11-01 09:52:15 UTC (rev 141645)
+++ PKGBUILD2011-11-01 09:52:46 UTC (rev 141646)
@@ -1,23 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Alexander Baldeck alexan...@archlinux.org
-
-pkgname=xf86dgaproto
-pkgver=2.1
-pkgrel=1
-pkgdesc=X11 Direct Graphics Access extension wire protocol
-arch=(any)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a036dc2fcbf052ec10621fd48b68dbb1')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname} || return 1
-}

Copied: xf86dgaproto/repos/extra-any/PKGBUILD (from rev 141645, 
xf86dgaproto/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-11-01 09:52:46 UTC (rev 141646)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Alexander Baldeck alexan...@archlinux.org
+
+pkgname=xf86dgaproto
+pkgver=2.1
+pkgrel=2
+pkgdesc=X11 Direct Graphics Access extension wire protocol
+arch=('any')
+url=http://xorg.freedesktop.org/;
+license=('custom')
+source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('a036dc2fcbf052ec10621fd48b68dbb1')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}



[arch-commits] Commit in xorg-fonts-alias/trunk (PKGBUILD)

2011-11-01 Thread Pierre Schmitz
Date: Tuesday, November 1, 2011 @ 05:56:52
  Author: pierre
Revision: 141647

rebuild old package

Modified:
  xorg-fonts-alias/trunk/PKGBUILD

--+
 PKGBUILD |   18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 09:52:46 UTC (rev 141646)
+++ PKGBUILD2011-11-01 09:56:52 UTC (rev 141647)
@@ -3,20 +3,24 @@
 
 pkgname=xorg-fonts-alias
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc=X.org font alias files
 arch=('any')
 url=http://xorg.freedesktop.org/;
 license=('custom')
-source=(${url}/releases/individual/font/font-alias-${pkgver}.tar.bz2 LICENSE)
+source=(${url}/releases/individual/font/font-alias-${pkgver}.tar.bz2
+'LICENSE')
 md5sums=('9d40dba6fb8cb58dacb433fc7bcaafca'
  'ff91ae6d96d76130482d04653e7a836a')
 
 build() {
   cd ${srcdir}/font-alias-${pkgver}
-  ./configure --prefix=/usr --with-fontrootdir=/usr/share/fonts || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/ 
|| return 1
+  ./configure --prefix=/usr --with-fontrootdir=/usr/share/fonts
+  make
 }
+
+package() {
+  cd ${srcdir}/font-alias-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 ${srcdir}/LICENSE 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}



[arch-commits] Commit in xorg-fonts-alias/repos/extra-any (4 files)

2011-11-01 Thread Pierre Schmitz
Date: Tuesday, November 1, 2011 @ 05:57:08
  Author: pierre
Revision: 141648

archrelease: copy trunk to extra-any

Added:
  xorg-fonts-alias/repos/extra-any/LICENSE
(from rev 141647, xorg-fonts-alias/trunk/LICENSE)
  xorg-fonts-alias/repos/extra-any/PKGBUILD
(from rev 141647, xorg-fonts-alias/trunk/PKGBUILD)
Deleted:
  xorg-fonts-alias/repos/extra-any/LICENSE
  xorg-fonts-alias/repos/extra-any/PKGBUILD

--+
 LICENSE  |   96 ++---
 PKGBUILD |   48 --
 2 files changed, 74 insertions(+), 70 deletions(-)

Deleted: LICENSE
===
--- LICENSE 2011-11-01 09:56:52 UTC (rev 141647)
+++ LICENSE 2011-11-01 09:57:08 UTC (rev 141648)
@@ -1,48 +0,0 @@
-Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-Software), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES
-OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from the XFree86 Project.
-
-
-
-  Copyright 2005 Red Hat, Inc.
-
-  Permission to use, copy, modify, distribute, and sell this software
-  and its documentation for any purpose is hereby granted without
-  fee, provided that the above copyright notice appear in all copies
-  and that both that copyright notice and this permission notice
-  appear in supporting documentation, and that the name of Red Hat
-  not be used in advertising or publicity pertaining to distribution
-  of the software without specific, written prior permission.  Red
-  Hat makes no representations about the suitability of this software
-  for any purpose.  It is provided as is without express or implied
-  warranty.
-
-  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

Copied: xorg-fonts-alias/repos/extra-any/LICENSE (from rev 141647, 
xorg-fonts-alias/trunk/LICENSE)
===
--- LICENSE (rev 0)
+++ LICENSE 2011-11-01 09:57:08 UTC (rev 141648)
@@ -0,0 +1,48 @@
+Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+Software), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+from the XFree86 Project.
+
+
+
+  Copyright 2005 Red Hat, Inc.
+
+  Permission to use, copy, modify, 

[arch-commits] Commit in ode/trunk (PKGBUILD)

2011-11-01 Thread Pierre Schmitz
Date: Tuesday, November 1, 2011 @ 06:05:48
  Author: pierre
Revision: 141649

rebuild old package

Modified:
  ode/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 09:57:08 UTC (rev 141648)
+++ PKGBUILD2011-11-01 10:05:48 UTC (rev 141649)
@@ -4,13 +4,13 @@
 
 pkgname=ode
 pkgver=0.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc=An open source, high performance library for simulating rigid body 
dynamics
 arch=('i686' 'x86_64')
 url=http://www.ode.org;
 license=('LGPL' 'BSD')
 depends=('gcc-libs' 'bash')
-source=(http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2)
+source=(http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2;)
 options=('!libtool')
 md5sums=('712579afabc2a15aa56e399f76171477')
 
@@ -18,9 +18,13 @@
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
   --enable-shared
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir}/ install
 
   install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/ou/LICENSE-BSD.TXT \
- ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-BSD.TXT
+${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-BSD.TXT
 }



[arch-commits] Commit in ode/repos (4 files)

2011-11-01 Thread Pierre Schmitz
Date: Tuesday, November 1, 2011 @ 06:06:18
  Author: pierre
Revision: 141650

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  ode/repos/extra-i686/PKGBUILD
(from rev 141649, ode/trunk/PKGBUILD)
  ode/repos/extra-x86_64/PKGBUILD
(from rev 141649, ode/trunk/PKGBUILD)
Deleted:
  ode/repos/extra-i686/PKGBUILD
  ode/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   56 +---
 extra-x86_64/PKGBUILD |   56 +---
 2 files changed, 60 insertions(+), 52 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-01 10:05:48 UTC (rev 141649)
+++ extra-i686/PKGBUILD 2011-11-01 10:06:18 UTC (rev 141650)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora giova...@archlinux.org
-# Contributor: Adam Griffiths adam_griffithsAATTdart.net.au
-
-pkgname=ode
-pkgver=0.11.1
-pkgrel=1
-pkgdesc=An open source, high performance library for simulating rigid body 
dynamics
-arch=('i686' 'x86_64')
-url=http://www.ode.org;
-license=('LGPL' 'BSD')
-depends=('gcc-libs' 'bash')
-source=(http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool')
-md5sums=('712579afabc2a15aa56e399f76171477')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-  --enable-shared
-  make || return 1
-  make DESTDIR=${pkgdir}/ install
-
-  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/ou/LICENSE-BSD.TXT \
- ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-BSD.TXT
-}

Copied: ode/repos/extra-i686/PKGBUILD (from rev 141649, ode/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-01 10:06:18 UTC (rev 141650)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Giovanni Scafora giova...@archlinux.org
+# Contributor: Adam Griffiths adam_griffithsAATTdart.net.au
+
+pkgname=ode
+pkgver=0.11.1
+pkgrel=2
+pkgdesc=An open source, high performance library for simulating rigid body 
dynamics
+arch=('i686' 'x86_64')
+url=http://www.ode.org;
+license=('LGPL' 'BSD')
+depends=('gcc-libs' 'bash')
+source=(http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2;)
+options=('!libtool')
+md5sums=('712579afabc2a15aa56e399f76171477')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+  --enable-shared
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir}/ install
+
+  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/ou/LICENSE-BSD.TXT \
+${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-BSD.TXT
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-11-01 10:05:48 UTC (rev 141649)
+++ extra-x86_64/PKGBUILD   2011-11-01 10:06:18 UTC (rev 141650)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora giova...@archlinux.org
-# Contributor: Adam Griffiths adam_griffithsAATTdart.net.au
-
-pkgname=ode
-pkgver=0.11.1
-pkgrel=1
-pkgdesc=An open source, high performance library for simulating rigid body 
dynamics
-arch=('i686' 'x86_64')
-url=http://www.ode.org;
-license=('LGPL' 'BSD')
-depends=('gcc-libs' 'bash')
-source=(http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool')
-md5sums=('712579afabc2a15aa56e399f76171477')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-  --enable-shared
-  make || return 1
-  make DESTDIR=${pkgdir}/ install
-
-  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/ou/LICENSE-BSD.TXT \
- ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-BSD.TXT
-}

Copied: ode/repos/extra-x86_64/PKGBUILD (from rev 141649, ode/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-11-01 10:06:18 UTC (rev 141650)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Giovanni Scafora giova...@archlinux.org
+# Contributor: Adam Griffiths adam_griffithsAATTdart.net.au
+
+pkgname=ode
+pkgver=0.11.1
+pkgrel=2
+pkgdesc=An open source, high performance library for simulating rigid body 
dynamics
+arch=('i686' 'x86_64')
+url=http://www.ode.org;
+license=('LGPL' 'BSD')
+depends=('gcc-libs' 'bash')
+source=(http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2;)
+options=('!libtool')
+md5sums=('712579afabc2a15aa56e399f76171477')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+  --enable-shared
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir}/ install
+
+  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/ou/LICENSE-BSD.TXT \
+

[arch-commits] Commit in linux-firmware/trunk (PKGBUILD)

2011-11-01 Thread Thomas Bächler
Date: Tuesday, November 1, 2011 @ 06:10:00
  Author: thomas
Revision: 141651

upgpkg: linux-firmware 2001-1: update from upstream git source

Modified:
  linux-firmware/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 10:06:18 UTC (rev 141650)
+++ PKGBUILD2011-11-01 10:10:00 UTC (rev 141651)
@@ -8,7 +8,7 @@
 #
 
 pkgname=linux-firmware
-pkgver=20110822
+pkgver=2001
 pkgrel=1
 pkgdesc=Firmware files for Linux
 arch=('any')
@@ -47,7 +47,7 @@
 
http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2a-ucode-17.168.5.3.tgz
 
http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2b-ucode-17.168.5.2.tgz
 )
-md5sums=('37c22c53f54e4bd315a94626ede22974'
+md5sums=('660c30aea4c8bdf4a1441dcf8530a9ed'
  '34feec4ec0eae3bb92c7c1ea2dfb4530'
  'cec71b615f3ca6d7823c032da0be1b61'
  '8098503cb2abcdeb3ddd2d8d6f60'



[arch-commits] Commit in linux-firmware/repos (testing-any testing-any/PKGBUILD)

2011-11-01 Thread Thomas Bächler
Date: Tuesday, November 1, 2011 @ 06:10:12
  Author: thomas
Revision: 141652

archrelease: copy trunk to testing-any

Added:
  linux-firmware/repos/testing-any/
  linux-firmware/repos/testing-any/PKGBUILD
(from rev 141651, linux-firmware/trunk/PKGBUILD)

--+
 PKGBUILD |   80 +
 1 file changed, 80 insertions(+)

Copied: linux-firmware/repos/testing-any/PKGBUILD (from rev 141651, 
linux-firmware/trunk/PKGBUILD)
===
--- testing-any/PKGBUILD(rev 0)
+++ testing-any/PKGBUILD2011-11-01 10:10:12 UTC (rev 141652)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Thomas Bächler tho...@archlinux.org
+
+#
+# Create a new tarball from the linux-firmware git tree with the following 
command:
+# git clone 
git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git
+# git archive --format=tar --prefix linux-firmware-$(date +%Y%m%d)/ master | 
xz -9  linux-firmware-$(date +%Y%m%d).tar.xz
+#
+
+pkgname=linux-firmware
+pkgver=2001
+pkgrel=1
+pkgdesc=Firmware files for Linux
+arch=('any')
+url=http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary;
+license=('GPL2' 'GPL3' 'custom')
+provides=('kernel26-firmware=2.6.34.99')
+conflicts=('linux-firmware-git'
+   'kernel26-firmware'
+   'ar9170-fw'
+   'iwlwifi-1000-ucode'
+   'iwlwifi-3945-ucode'
+   'iwlwifi-4965-ucode'
+   'iwlwifi-5000-ucode'
+   'iwlwifi-5150-ucode'
+   'iwlwifi-6000-ucode'
+   'rt2870usb-fw'
+   'rt2x00-rt61-fw'
+   'rt2x00-rt71w-fw')
+replaces=('kernel26-firmware'
+   'ar9170-fw'
+   'iwlwifi-1000-ucode'
+   'iwlwifi-3945-ucode'
+   'iwlwifi-4965-ucode'
+   'iwlwifi-5000-ucode'
+   'iwlwifi-5150-ucode'
+   'iwlwifi-6000-ucode'
+   'rt2870usb-fw'
+   'rt2x00-rt61-fw'
+   'rt2x00-rt71w-fw')
+options=(!strip)
+source=(ftp://ftp.archlinux.org/other/linux-firmware/$pkgname-$pkgver.tar.xz
+
http://www.kernel.org/pub/linux/kernel/people/mcgrof/firmware/ar9170/ar9170.fw
+
http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-5000-ucode-8.83.5.1-1.tgz
+
http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1000-ucode-39.31.5.1.tgz
+
http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000-ucode-9.221.4.1.tgz
+
http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2a-ucode-17.168.5.3.tgz
+
http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2b-ucode-17.168.5.2.tgz
+)
+md5sums=('660c30aea4c8bdf4a1441dcf8530a9ed'
+ '34feec4ec0eae3bb92c7c1ea2dfb4530'
+ 'cec71b615f3ca6d7823c032da0be1b61'
+ '8098503cb2abcdeb3ddd2d8d6f60'
+ 'c132a4c1946a9dbc0c36b41696e5c793'
+ 'fe99ef72d4c016c9b04506fa474c1acd'
+ 'd87411296b4eeda0c9138e9f8437')
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  install -d -m755 ${pkgdir}/lib/firmware
+  cp -a * ${pkgdir}/lib/firmware/
+  install -d -m755 ${pkgdir}/usr/share/licenses/linux-firmware/
+  rm -f ${pkgdir}/lib/firmware/GPL*
+  mv ${pkgdir}/lib/firmware/{LICEN*,WHENCE} 
${pkgdir}/usr/share/licenses/linux-firmware/
+
+  # Symlinks for Broadcom firmware
+  #ln -s bcm43xx-0-610-809-0.fw ${pkgdir}/lib/firmware/brcm/bcm43xx-0.fw
+  #ln -s bcm43xx_hdr-0-610-809-0.fw 
${pkgdir}/lib/firmware/brcm/bcm43xx_hdr-0.fw
+
+  # https://bugs.archlinux.org/task/20064
+  install -m644 ${srcdir}/ar9170.fw ${pkgdir}/lib/firmware/
+  # fix intel firmware files
+  install -m 644 ${srcdir}/iwlwifi-1000-ucode-39.31.5.1/iwlwifi-1000-5.ucode 
${pkgdir}/lib/firmware/
+  install -m 644 ${srcdir}/iwlwifi-5000-ucode-8.83.5.1/iwlwifi-5000-5.ucode 
${pkgdir}/lib/firmware/
+  install -m 644 ${srcdir}/iwlwifi-6000-ucode-9.221.4.1/iwlwifi-6000-4.ucode 
${pkgdir}/lib/firmware/
+  install -m 644 
${srcdir}/iwlwifi-6000g2a-ucode-17.168.5.3/iwlwifi-6000g2a-5.ucode 
${pkgdir}/lib/firmware/
+  install -m 644 
${srcdir}/iwlwifi-6000g2b-ucode-17.168.5.2/iwlwifi-6000g2b-5.ucode 
${pkgdir}/lib/firmware/
+}
+# vim:set ts=2 sw=2 et:



[arch-commits] Commit in libsexy/trunk (PKGBUILD)

2011-11-01 Thread Pierre Schmitz
Date: Tuesday, November 1, 2011 @ 06:10:56
  Author: pierre
Revision: 141653

rebuild old package

Modified:
  libsexy/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 10:10:12 UTC (rev 141652)
+++ PKGBUILD2011-11-01 10:10:56 UTC (rev 141653)
@@ -1,8 +1,9 @@
 # $Id$
 # Maintainer: Jan de Groot j...@archlinux.org
+
 pkgname=libsexy
 pkgver=0.1.11
-pkgrel=2
+pkgrel=3
 pkgdesc=Doing naughty things to good widgets.
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -10,13 +11,17 @@
 depends=('gtk2' 'libxml2')
 makedepends=('iso-codes' 'pkgconfig')
 options=('!libtool')
-source=(http://releases.chipx86.com/libsexy/libsexy/${pkgname}-${pkgver}.tar.gz)
+source=(http://releases.chipx86.com/libsexy/libsexy/${pkgname}-${pkgver}.tar.gz;)
 md5sums=('33c079a253270ec8bfb9508e4bb30754')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-static
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 
   rm -f ${pkgdir}/usr/lib/libsexy.a



[arch-commits] Commit in libsexy/repos (4 files)

2011-11-01 Thread Pierre Schmitz
Date: Tuesday, November 1, 2011 @ 06:11:25
  Author: pierre
Revision: 141654

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libsexy/repos/extra-i686/PKGBUILD
(from rev 141653, libsexy/trunk/PKGBUILD)
  libsexy/repos/extra-x86_64/PKGBUILD
(from rev 141653, libsexy/trunk/PKGBUILD)
Deleted:
  libsexy/repos/extra-i686/PKGBUILD
  libsexy/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   51 ++--
 extra-x86_64/PKGBUILD |   51 ++--
 2 files changed, 56 insertions(+), 46 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-01 10:10:56 UTC (rev 141653)
+++ extra-i686/PKGBUILD 2011-11-01 10:11:25 UTC (rev 141654)
@@ -1,23 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-pkgname=libsexy
-pkgver=0.1.11
-pkgrel=2
-pkgdesc=Doing naughty things to good widgets.
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://chipx86.com/wiki/Libsexy;
-depends=('gtk2' 'libxml2')
-makedepends=('iso-codes' 'pkgconfig')
-options=('!libtool')
-source=(http://releases.chipx86.com/libsexy/libsexy/${pkgname}-${pkgver}.tar.gz)
-md5sums=('33c079a253270ec8bfb9508e4bb30754')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make || return 1
-  make DESTDIR=${pkgdir} install
-
-  rm -f ${pkgdir}/usr/lib/libsexy.a
-}

Copied: libsexy/repos/extra-i686/PKGBUILD (from rev 141653, 
libsexy/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-01 10:11:25 UTC (rev 141654)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libsexy
+pkgver=0.1.11
+pkgrel=3
+pkgdesc=Doing naughty things to good widgets.
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://chipx86.com/wiki/Libsexy;
+depends=('gtk2' 'libxml2')
+makedepends=('iso-codes' 'pkgconfig')
+options=('!libtool')
+source=(http://releases.chipx86.com/libsexy/libsexy/${pkgname}-${pkgver}.tar.gz;)
+md5sums=('33c079a253270ec8bfb9508e4bb30754')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  rm -f ${pkgdir}/usr/lib/libsexy.a
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-11-01 10:10:56 UTC (rev 141653)
+++ extra-x86_64/PKGBUILD   2011-11-01 10:11:25 UTC (rev 141654)
@@ -1,23 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-pkgname=libsexy
-pkgver=0.1.11
-pkgrel=2
-pkgdesc=Doing naughty things to good widgets.
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://chipx86.com/wiki/Libsexy;
-depends=('gtk2' 'libxml2')
-makedepends=('iso-codes' 'pkgconfig')
-options=('!libtool')
-source=(http://releases.chipx86.com/libsexy/libsexy/${pkgname}-${pkgver}.tar.gz)
-md5sums=('33c079a253270ec8bfb9508e4bb30754')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make || return 1
-  make DESTDIR=${pkgdir} install
-
-  rm -f ${pkgdir}/usr/lib/libsexy.a
-}

Copied: libsexy/repos/extra-x86_64/PKGBUILD (from rev 141653, 
libsexy/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-11-01 10:11:25 UTC (rev 141654)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libsexy
+pkgver=0.1.11
+pkgrel=3
+pkgdesc=Doing naughty things to good widgets.
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://chipx86.com/wiki/Libsexy;
+depends=('gtk2' 'libxml2')
+makedepends=('iso-codes' 'pkgconfig')
+options=('!libtool')
+source=(http://releases.chipx86.com/libsexy/libsexy/${pkgname}-${pkgver}.tar.gz;)
+md5sums=('33c079a253270ec8bfb9508e4bb30754')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  rm -f ${pkgdir}/usr/lib/libsexy.a
+}



[arch-commits] Commit in libmpcdec/trunk (PKGBUILD)

2011-11-01 Thread Pierre Schmitz
Date: Tuesday, November 1, 2011 @ 06:25:50
  Author: pierre
Revision: 141655

rebuild old package

Modified:
  libmpcdec/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 10:11:25 UTC (rev 141654)
+++ PKGBUILD2011-11-01 10:25:50 UTC (rev 141655)
@@ -3,20 +3,24 @@
 
 pkgname=libmpcdec
 pkgver=1.2.6
-pkgrel=2
+pkgrel=3
 pkgdesc=Musepack decoding library
 arch=('i686' 'x86_64')
 url=http://musepack.net/;
 license=('custom')
 depends=('glibc')
 options=('!libtool')
-source=(http://files.musepack.net/source/${pkgname}-${pkgver}.tar.bz2)
+source=(http://files.musepack.net/source/${pkgname}-${pkgver}.tar.bz2;)
 md5sums=('7f7a060e83b4278acf4b77d7a7b9d2c0')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-static
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 }



[arch-commits] Commit in libmpcdec/repos (4 files)

2011-11-01 Thread Pierre Schmitz
Date: Tuesday, November 1, 2011 @ 06:26:35
  Author: pierre
Revision: 141656

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libmpcdec/repos/extra-i686/PKGBUILD
(from rev 141655, libmpcdec/trunk/PKGBUILD)
  libmpcdec/repos/extra-x86_64/PKGBUILD
(from rev 141655, libmpcdec/trunk/PKGBUILD)
Deleted:
  libmpcdec/repos/extra-i686/PKGBUILD
  libmpcdec/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   48 ++--
 extra-x86_64/PKGBUILD |   48 ++--
 2 files changed, 52 insertions(+), 44 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-01 10:25:50 UTC (rev 141655)
+++ extra-i686/PKGBUILD 2011-11-01 10:26:35 UTC (rev 141656)
@@ -1,22 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=libmpcdec
-pkgver=1.2.6
-pkgrel=2
-pkgdesc=Musepack decoding library
-arch=('i686' 'x86_64')
-url=http://musepack.net/;
-license=('custom')
-depends=('glibc')
-options=('!libtool')
-source=(http://files.musepack.net/source/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7f7a060e83b4278acf4b77d7a7b9d2c0')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}

Copied: libmpcdec/repos/extra-i686/PKGBUILD (from rev 141655, 
libmpcdec/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-01 10:26:35 UTC (rev 141656)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libmpcdec
+pkgver=1.2.6
+pkgrel=3
+pkgdesc=Musepack decoding library
+arch=('i686' 'x86_64')
+url=http://musepack.net/;
+license=('custom')
+depends=('glibc')
+options=('!libtool')
+source=(http://files.musepack.net/source/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('7f7a060e83b4278acf4b77d7a7b9d2c0')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-11-01 10:25:50 UTC (rev 141655)
+++ extra-x86_64/PKGBUILD   2011-11-01 10:26:35 UTC (rev 141656)
@@ -1,22 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=libmpcdec
-pkgver=1.2.6
-pkgrel=2
-pkgdesc=Musepack decoding library
-arch=('i686' 'x86_64')
-url=http://musepack.net/;
-license=('custom')
-depends=('glibc')
-options=('!libtool')
-source=(http://files.musepack.net/source/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7f7a060e83b4278acf4b77d7a7b9d2c0')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}

Copied: libmpcdec/repos/extra-x86_64/PKGBUILD (from rev 141655, 
libmpcdec/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-11-01 10:26:35 UTC (rev 141656)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libmpcdec
+pkgver=1.2.6
+pkgrel=3
+pkgdesc=Musepack decoding library
+arch=('i686' 'x86_64')
+url=http://musepack.net/;
+license=('custom')
+depends=('glibc')
+options=('!libtool')
+source=(http://files.musepack.net/source/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('7f7a060e83b4278acf4b77d7a7b9d2c0')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}



[arch-commits] Commit in linux/trunk (linux.install)

2011-11-01 Thread Thomas Bächler
Date: Tuesday, November 1, 2011 @ 08:46:39
  Author: thomas
Revision: 141657

linux: Tom think the instructions to recover might fail. Don't provide any.

Modified:
  linux/trunk/linux.install

---+
 linux.install |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: linux.install
===
--- linux.install   2011-11-01 10:26:35 UTC (rev 141656)
+++ linux.install   2011-11-01 12:46:39 UTC (rev 141657)
@@ -46,9 +46,8 @@
 
   if grep ^[^#]*[[:space:]]/boot etc/fstab 21 /dev/null; then
 if ! grep [[:space:]]/boot etc/mtab 21 /dev/null; then
-  echo WARNING: /boot appears to be a seperate partition but is not 
mounted
-  echo  This is most likely not what you want.  Please mount your 
/boot
-  echo  partition and reinstall the kernel unless you are sure 
this is OK
+  echo WARNING: /boot appears to be a seperate partition but is not 
mounted.
+  echo  You probably just broke your system. Congratulations.
 fi
   fi
 



[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD fix-powerprofiles.patch)

2011-11-01 Thread Andrea Scarpino
Date: Tuesday, November 1, 2011 @ 10:32:15
  Author: andrea
Revision: 141658

New tarball

Modified:
  kdebase-workspace/trunk/PKGBUILD
Deleted:
  kdebase-workspace/trunk/fix-powerprofiles.patch

-+
 PKGBUILD|   12 
 fix-powerprofiles.patch |   23 ---
 2 files changed, 4 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 12:46:39 UTC (rev 141657)
+++ PKGBUILD2011-11-01 14:32:15 UTC (rev 141658)
@@ -5,7 +5,7 @@
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.7.3
-pkgrel=2
+pkgrel=3
 pkgdesc=KDE Base Workspace
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -33,9 +33,8 @@
 options=('emptydirs')
 
source=(http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2;
 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-'fix-powerprofiles.patch')
-sha1sums=('3f65d3f075cb3d71d26e768d0d8e1c26b49b4774'
+'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+sha1sums=('f3ed24e3e70671033718a5139cb61d0d7e2e709e'
   '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
   '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
   'f7b38af38549242a240f1a90ab9964ca8a366129'
@@ -43,8 +42,7 @@
   '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
   'd7b5883f7e65c6839b1f65f94d58026673dd0226'
   'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3'
-  'd509dac592bd8b310df27991b208c95b6d907514'
-  '7c514a0727f904359d2ab12078e9868488ded3e6')
+  'd509dac592bd8b310df27991b208c95b6d907514')
 
 build() {
cd ${srcdir}/${_pkgname}-${pkgver}
@@ -53,8 +51,6 @@
patch -p0 -i ${srcdir}/fixpath.patch
patch -p0 -i ${srcdir}/terminate-server.patch
 
-patch -Rp1 -i ${srcdir}/fix-powerprofiles.patch
-
cd ${srcdir}
mkdir build
cd build

Deleted: fix-powerprofiles.patch
===
--- fix-powerprofiles.patch 2011-11-01 12:46:39 UTC (rev 141657)
+++ fix-powerprofiles.patch 2011-11-01 14:32:15 UTC (rev 141658)
@@ -1,23 +0,0 @@
-From: Dario Freddi d...@kde.org
-Date: Tue, 04 Oct 2011 14:09:09 +
-Subject: Use full config when reading settings
-X-Git-Url: 
http://quickgit.kde.org/?p=kde-workspace.gitamp;a=commitdiffamp;h=8d59876457387d1c72ca3626ae2d267adf100014

-Use full config when reading settings
-
-BUG: 267323

-
-
 a/powerdevil/daemon/powerdevilcore.cpp
-+++ b/powerdevil/daemon/powerdevilcore.cpp
-@@ -88,7 +88,7 @@ void Core::onBackendReady()
- {
- kDebug()  Backend is ready, KDE Power Management system initialized;
- 
--m_profilesConfig = KSharedConfig::openConfig(powerdevil2profilesrc, 
KConfig::SimpleConfig);
-+m_profilesConfig = KSharedConfig::openConfig(powerdevil2profilesrc, 
KConfig::FullConfig);
- 
- // Is it brand new?
- if (m_profilesConfig-groupList().isEmpty()) {
-



[arch-commits] Commit in tomcat6/trunk (PKGBUILD tomcat6.conf.d)

2011-11-01 Thread Guillaume Alaux
Date: Tuesday, November 1, 2011 @ 13:45:21
  Author: guillaume
Revision: 141659

upgpkg: tomcat6 6.0.33-4

Extract servlet.jar and jsp jars into their own packages and change conf for 
OpenJDK7

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/tomcat6.conf.d

+
 PKGBUILD   |   86 +--
 tomcat6.conf.d |2 -
 2 files changed, 66 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 14:32:15 UTC (rev 141658)
+++ PKGBUILD2011-11-01 17:45:21 UTC (rev 141659)
@@ -1,23 +1,12 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
+pkgbase=tomcat6
+pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
 pkgver=6.0.33
-pkgrel=3
-pkgdesc=Servlet-2.5/JSP-2.1 Container
+pkgrel=4
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/tomcat6/catalina.policy
-etc/tomcat6/catalina.properties
-etc/tomcat6/context.xml
-etc/tomcat6/logging.properties
-etc/tomcat6/server.xml
-etc/tomcat6/tomcat-users.xml
-etc/tomcat6/web.xml
-etc/conf.d/tomcat6)
-install=tomcat6.install
+makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon' 
'eclipse-ecj')
 
source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
 
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
 tomcat6.conf.d
@@ -27,10 +16,14 @@
 noextract=(dbcp-${pkgver}.jar)
 md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
  'a6ff671562c9ac91e8cc2812760df49d'
- 'b9f482437de11587d72b53ddaa2a'
+ '5a95b41d320aa455fe9cbf97a80b0953'
  '8f2ccc09837577394441d29a03b0e667'
  'afdb7edc5c7a7b5fa85ad110d021cad3')
 
+_servletver=2.5
+_jspver=2.1
+
+#FIXME ant target 'download' should not be called
 build() {
   cd ${srcdir}/apache-tomcat-${pkgver}-src
 
@@ -41,7 +34,47 @@
 -Djdt.jar=/usr/share/java/eclipse-ecj.jar
 }
 
-package() {
+package_java-servlet2.5-tomcat() {
+  pkgdesc=Servlet ${_servletver} java library implementation by Apache Tomcat
+  depends=('java-environment=5')
+
+  cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib
+
+  install -dm755 ${pkgdir}/usr/share/java/servlet${_servletver}-tomcat
+  install -m644 servlet-api.jar \
+
${pkgdir}/usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar
+#  ln -s servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
+#${pkgdir}/usr/share/java/servlet-api.jar
+}
+
+package_java-jsp2.1-tomcat() {
+  pkgdesc=JSP 2.1 java library implementation by Apache Tomcat
+  depends=('java-environment=5')
+
+  cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib
+
+  install -dm755 ${pkgdir}/usr/share/java/jsp${_jspver}-tomcat
+  for j in el-api jsp-api; do
+install -m644 ${j}.jar \
+  
${pkgdir}/usr/share/java/jsp${_jspver}-tomcat/${j}-${_jspver}.jar
+#ln -s jsp${_jspver}-tomcat/${j}-${_jspver}.jar 
${pkgdir}/usr/share/java/${j}.jar
+  done
+}
+
+package_tomcat6() {
+  pkgdesc=Servlet-2.5/JSP-2.1 Container
+  depends=('java-runtime=5' 'java-jsvc' 'java-servlet2.5-tomcat' 
'java-jsp2.1-tomcat' 'eclipse-ecj')
+  optdepends=('tomcat-native: to allow optimal performance in production 
environments')
+  backup=(etc/tomcat6/catalina.policy
+  etc/tomcat6/catalina.properties
+  etc/tomcat6/context.xml
+  etc/tomcat6/logging.properties
+  etc/tomcat6/server.xml
+  etc/tomcat6/tomcat-users.xml
+  etc/tomcat6/web.xml
+  etc/conf.d/tomcat6)
+  install=tomcat6.install
+
   cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
 
   # Tomcat general files
@@ -52,9 +85,21 @@
 
   # eclipse-ecj is packaged on its own
   rm lib/eclipse-ecj.jar
-  install lib/* ${pkgdir}/usr/share/java/${pkgname}
-  install ${srcdir}/dbcp-${pkgver}.jar \
-  ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
+  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
+
+  # Provided by previous packages
+  rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
+  ln -s 
/usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
+${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
+
+  for j in el-api jsp-api; do
+rm ${pkgdir}/usr/share/java/${pkgname}/${j}.jar
+ln -s /usr/share/java/jsp${_jspver}-tomcat/${j}-${_jspver}.jar \
+  ${pkgdir}/usr/share/java/${pkgname}/${j}.jar
+  done
+
+  install -m644 ${srcdir}/dbcp-${pkgver}.jar \
+${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
   ln -s 

[arch-commits] Commit in tomcat6/repos/extra-any (8 files)

2011-11-01 Thread Guillaume Alaux
Date: Tuesday, November 1, 2011 @ 13:46:21
  Author: guillaume
Revision: 141660

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
(from rev 141659, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/tomcat6
(from rev 141659, tomcat6/trunk/tomcat6)
  tomcat6/repos/extra-any/tomcat6.conf.d
(from rev 141659, tomcat6/trunk/tomcat6.conf.d)
  tomcat6/repos/extra-any/tomcat6.install
(from rev 141659, tomcat6/trunk/tomcat6.install)
Deleted:
  tomcat6/repos/extra-any/PKGBUILD
  tomcat6/repos/extra-any/tomcat6
  tomcat6/repos/extra-any/tomcat6.conf.d
  tomcat6/repos/extra-any/tomcat6.install

-+
 PKGBUILD|  218 --
 tomcat6 |  154 +++---
 tomcat6.conf.d  |   30 +++
 tomcat6.install |   54 ++---
 4 files changed, 250 insertions(+), 206 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-11-01 17:45:21 UTC (rev 141659)
+++ PKGBUILD2011-11-01 17:46:21 UTC (rev 141660)
@@ -1,87 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.33
-pkgrel=3
-pkgdesc=Servlet-2.5/JSP-2.1 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/tomcat6/catalina.policy
-etc/tomcat6/catalina.properties
-etc/tomcat6/context.xml
-etc/tomcat6/logging.properties
-etc/tomcat6/server.xml
-etc/tomcat6/tomcat-users.xml
-etc/tomcat6/web.xml
-etc/conf.d/tomcat6)
-install=tomcat6.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
-tomcat6.conf.d
-tomcat6
-tomcat6.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
- 'a6ff671562c9ac91e8cc2812760df49d'
- 'b9f482437de11587d72b53ddaa2a'
- '8f2ccc09837577394441d29a03b0e667'
- 'afdb7edc5c7a7b5fa85ad110d021cad3')
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-  ant download deploy\
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-
-  # eclipse-ecj is packaged on its own
-  rm lib/eclipse-ecj.jar
-  install lib/* ${pkgdir}/usr/share/java/${pkgname}
-  install ${srcdir}/dbcp-${pkgver}.jar \
-  ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
-  ln -s tomcat-dbcp-${pkgver}.jar \
-${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp.jar
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # 66=tomcat / 19=log
-  install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g 66 -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g66 -m775 ${pkgdir}/etc/${pkgname}/Catalina
-  ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
-  install -dm775 ${pkgdir}/var/lib/${pkgname}
-  cp -r webapps ${pkgdir}/var/lib/${pkgname}
-  chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
-  ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
-  ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
-  # Arch scripts
-  install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-

Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 141659, 
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-11-01 17:46:21 UTC (rev 141660)
@@ -0,0 +1,131 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgbase=tomcat6
+pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
+pkgver=6.0.33
+pkgrel=4
+arch=('any')

[arch-commits] Commit in tomcat7/trunk (PKGBUILD tomcat7.conf.d)

2011-11-01 Thread Guillaume Alaux
Date: Tuesday, November 1, 2011 @ 13:46:51
  Author: guillaume
Revision: 141661

upgpkg: tomcat7 7.0.22-2

Extract servlet.jar and jsp jars into their own packages and change conf for 
OpenJDK7

Modified:
  tomcat7/trunk/PKGBUILD
  tomcat7/trunk/tomcat7.conf.d

+
 PKGBUILD   |   93 ++-
 tomcat7.conf.d |2 -
 2 files changed, 73 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 17:46:21 UTC (rev 141660)
+++ PKGBUILD2011-11-01 17:46:51 UTC (rev 141661)
@@ -1,44 +1,85 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
+pkgbase=tomcat7
+pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
 pkgver=7.0.22
-pkgrel=1
-pkgdesc=Servlet-3.0/JSP-2.2 Container
+pkgrel=2
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/tomcat7/catalina.policy
-etc/tomcat7/catalina.properties
-etc/tomcat7/context.xml
-etc/tomcat7/logging.properties
-etc/tomcat7/server.xml
-etc/tomcat7/tomcat-users.xml
-etc/tomcat7/web.xml
-etc/conf.d/tomcat7)
-install=tomcat7.install
+# Does not build with JDK7. Same issue as with cassandra:
+# https://issues.apache.org/jira/browse/CASSANDRA-3275
+#makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon' 
'eclipse-ecj')
+makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon' 
'eclipse-ecj')
 
source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
+
http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.4-bin.tar.gz
 tomcat7.conf.d
 tomcat7
 tomcat7.install)
 
 md5sums=('878bc216d86ce803f3bbc65fd40eb96c'
- '0fa46eae1746d6cd564905bfb0072776'
+ 'bd272e9611b0d880fd02493377d4691b'
+ 'eea5573b0acd985bb8b630a20719db76'
  '361a41c02930a4e43245ab7379a617e9'
  '6c5b4ed6d71b227f305b751c349fa31b')
 
+_servletver=3.0
+_jspver=2.2
+
 build() {
   cd ${srcdir}/apache-tomcat-${pkgver}-src
 
   . /etc/profile.d/apache-ant.sh
-  ant \
+  ant deploy \
 -Dbase.path=${srcdir}/DOWN_LIBS \
 -Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
+-Djdt.jar=/usr/share/java/eclipse-ecj.jar \
+-Dtomcat-dbcp.jar=${srcdir}/commons-dbcp-1.4/commons-dbcp-1.4.jar \
+
-Dtomcat-dbcp-src.jar=${srcdir}/commons-dbcp-1.4/commons-dbcp-1.4-sources.jar
 }
 
-package() {
+#TODO add test ant test
+
+package_java-servlet3.0-tomcat() {
+  pkgdesc=Servlet 3.0 java library implementation by Apache Tomcat
+  depends=('java-environment=5')
+
+  cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib
+
+  install -dm755 ${pkgdir}/usr/share/java/servlet${_servletver}-tomcat
+  install -m644 servlet-api.jar \
+
${pkgdir}/usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar
+  ln -s servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
+${pkgdir}/usr/share/java/servlet-api.jar
+}
+
+package_java-jsp2.2-tomcat() {
+  pkgdesc=JSP 2.2 java library implementation by Apache Tomcat
+  depends=('java-environment=5')
+
+  cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib
+
+  install -dm755 ${pkgdir}/usr/share/java/jsp${_jspver}-tomcat
+  for j in el-api jsp-api; do
+install -m644 ${j}.jar \
+  
${pkgdir}/usr/share/java/jsp${_jspver}-tomcat/${j}-${_jspver}.jar
+ln -s jsp${_jspver}-tomcat/${j}-${_jspver}.jar 
${pkgdir}/usr/share/java/${j}.jar
+  done
+}
+
+package_tomcat7() {
+  pkgdesc=Servlet-3.0/JSP-2.2 Container
+  depends=('java-runtime=6' 'java-jsvc' 'java-servlet3.0-tomcat' 
'java-jsp2.2-tomcat' 'eclipse-ecj')
+  optdepends=('tomcat-native: to allow optimal performance in production 
environments')
+  backup=(etc/tomcat7/catalina.policy
+  etc/tomcat7/catalina.properties
+  etc/tomcat7/context.xml
+  etc/tomcat7/logging.properties
+  etc/tomcat7/server.xml
+  etc/tomcat7/tomcat-users.xml
+  etc/tomcat7/web.xml
+  etc/conf.d/tomcat7)
+  install=tomcat7.install
+
   cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
 
   # Tomcat general files
@@ -49,7 +90,18 @@
 
   # eclipse-ecj is packaged on its own
   rm lib/eclipse-ecj.jar
-  install lib/* ${pkgdir}/usr/share/java/${pkgname}
+  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
+
+  # Provided by previous packages
+  rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
+  ln -s 
/usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
+

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2011-11-01 Thread Guillaume Alaux
Date: Tuesday, November 1, 2011 @ 13:47:48
  Author: guillaume
Revision: 141662

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 141661, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/tomcat7
(from rev 141661, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 141661, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 141661, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  211 +-
 tomcat7 |  154 +++
 tomcat7.conf.d  |   30 +++
 tomcat7.install |   54 ++---
 4 files changed, 250 insertions(+), 199 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-11-01 17:46:51 UTC (rev 141661)
+++ PKGBUILD2011-11-01 17:47:48 UTC (rev 141662)
@@ -1,80 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.22
-pkgrel=1
-pkgdesc=Servlet-3.0/JSP-2.2 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/tomcat7/catalina.policy
-etc/tomcat7/catalina.properties
-etc/tomcat7/context.xml
-etc/tomcat7/logging.properties
-etc/tomcat7/server.xml
-etc/tomcat7/tomcat-users.xml
-etc/tomcat7/web.xml
-etc/conf.d/tomcat7)
-install=tomcat7.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-md5sums=('878bc216d86ce803f3bbc65fd40eb96c'
- '0fa46eae1746d6cd564905bfb0072776'
- '361a41c02930a4e43245ab7379a617e9'
- '6c5b4ed6d71b227f305b751c349fa31b')
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-  ant \
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-
-  # eclipse-ecj is packaged on its own
-  rm lib/eclipse-ecj.jar
-  install lib/* ${pkgdir}/usr/share/java/${pkgname}
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # 66=tomcat / 19=log
-  install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g 66 -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g66 -m775 ${pkgdir}/etc/${pkgname}/Catalina
-  ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
-  install -dm775 ${pkgdir}/var/lib/${pkgname}
-  cp -r webapps ${pkgdir}/var/lib/${pkgname}
-  chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
-  ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
-  ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
-  # Arch scripts
-  install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 141661, 
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-11-01 17:47:48 UTC (rev 141662)
@@ -0,0 +1,131 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgbase=tomcat7
+pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
+pkgver=7.0.22
+pkgrel=2
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+# Does not build with JDK7. Same issue as with cassandra:
+# https://issues.apache.org/jira/browse/CASSANDRA-3275
+#makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon' 
'eclipse-ecj')
+makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon' 
'eclipse-ecj')

[arch-commits] Commit in kdebase-workspace/repos (40 files)

2011-11-01 Thread Andrea Scarpino
Date: Tuesday, November 1, 2011 @ 16:17:45
  Author: andrea
Revision: 141663

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  kdebase-workspace/repos/staging-i686/PKGBUILD
(from rev 141662, kdebase-workspace/trunk/PKGBUILD)
  kdebase-workspace/repos/staging-i686/fixpath.patch
(from rev 141662, kdebase-workspace/trunk/fixpath.patch)
  kdebase-workspace/repos/staging-i686/kde-np.pam
(from rev 141662, kdebase-workspace/trunk/kde-np.pam)
  kdebase-workspace/repos/staging-i686/kde.pam
(from rev 141662, kdebase-workspace/trunk/kde.pam)
  kdebase-workspace/repos/staging-i686/kdebase-workspace.install
(from rev 141662, kdebase-workspace/trunk/kdebase-workspace.install)
  kdebase-workspace/repos/staging-i686/kdm
(from rev 141662, kdebase-workspace/trunk/kdm)
  kdebase-workspace/repos/staging-i686/kdm-xinitrd.patch
(from rev 141662, kdebase-workspace/trunk/kdm-xinitrd.patch)
  kdebase-workspace/repos/staging-i686/kdm-zsh-profile.patch
(from rev 141662, kdebase-workspace/trunk/kdm-zsh-profile.patch)
  kdebase-workspace/repos/staging-i686/kscreensaver.pam
(from rev 141662, kdebase-workspace/trunk/kscreensaver.pam)
  kdebase-workspace/repos/staging-i686/terminate-server.patch
(from rev 141662, kdebase-workspace/trunk/terminate-server.patch)
  kdebase-workspace/repos/staging-x86_64/PKGBUILD
(from rev 141662, kdebase-workspace/trunk/PKGBUILD)
  kdebase-workspace/repos/staging-x86_64/fixpath.patch
(from rev 141662, kdebase-workspace/trunk/fixpath.patch)
  kdebase-workspace/repos/staging-x86_64/kde-np.pam
(from rev 141662, kdebase-workspace/trunk/kde-np.pam)
  kdebase-workspace/repos/staging-x86_64/kde.pam
(from rev 141662, kdebase-workspace/trunk/kde.pam)
  kdebase-workspace/repos/staging-x86_64/kdebase-workspace.install
(from rev 141662, kdebase-workspace/trunk/kdebase-workspace.install)
  kdebase-workspace/repos/staging-x86_64/kdm
(from rev 141662, kdebase-workspace/trunk/kdm)
  kdebase-workspace/repos/staging-x86_64/kdm-xinitrd.patch
(from rev 141662, kdebase-workspace/trunk/kdm-xinitrd.patch)
  kdebase-workspace/repos/staging-x86_64/kdm-zsh-profile.patch
(from rev 141662, kdebase-workspace/trunk/kdm-zsh-profile.patch)
  kdebase-workspace/repos/staging-x86_64/kscreensaver.pam
(from rev 141662, kdebase-workspace/trunk/kscreensaver.pam)
  kdebase-workspace/repos/staging-x86_64/terminate-server.patch
(from rev 141662, kdebase-workspace/trunk/terminate-server.patch)
Deleted:
  kdebase-workspace/repos/staging-i686/PKGBUILD
  kdebase-workspace/repos/staging-i686/fixpath.patch
  kdebase-workspace/repos/staging-i686/kde-np.pam
  kdebase-workspace/repos/staging-i686/kde.pam
  kdebase-workspace/repos/staging-i686/kdebase-workspace.install
  kdebase-workspace/repos/staging-i686/kdm
  kdebase-workspace/repos/staging-i686/kdm-xinitrd.patch
  kdebase-workspace/repos/staging-i686/kdm-zsh-profile.patch
  kdebase-workspace/repos/staging-i686/kscreensaver.pam
  kdebase-workspace/repos/staging-i686/terminate-server.patch
  kdebase-workspace/repos/staging-x86_64/PKGBUILD
  kdebase-workspace/repos/staging-x86_64/fixpath.patch
  kdebase-workspace/repos/staging-x86_64/kde-np.pam
  kdebase-workspace/repos/staging-x86_64/kde.pam
  kdebase-workspace/repos/staging-x86_64/kdebase-workspace.install
  kdebase-workspace/repos/staging-x86_64/kdm
  kdebase-workspace/repos/staging-x86_64/kdm-xinitrd.patch
  kdebase-workspace/repos/staging-x86_64/kdm-zsh-profile.patch
  kdebase-workspace/repos/staging-x86_64/kscreensaver.pam
  kdebase-workspace/repos/staging-x86_64/terminate-server.patch

--+
 staging-i686/PKGBUILD|  170 ++---
 staging-i686/fixpath.patch   |   68 +--
 staging-i686/kde-np.pam  |   14 +-
 staging-i686/kde.pam |   14 +-
 staging-i686/kdebase-workspace.install   |   50 
 staging-i686/kdm |   72 ++--
 staging-i686/kdm-xinitrd.patch   |   36 +++---
 staging-i686/kdm-zsh-profile.patch   |   22 +--
 staging-i686/kscreensaver.pam|2 
 staging-i686/terminate-server.patch  |   22 +--
 staging-x86_64/PKGBUILD  |  170 ++---
 staging-x86_64/fixpath.patch |   68 +--
 staging-x86_64/kde-np.pam|   14 +-
 staging-x86_64/kde.pam   |   14 +-
 staging-x86_64/kdebase-workspace.install |   50 
 staging-x86_64/kdm   |   72 ++--
 staging-x86_64/kdm-xinitrd.patch |   36 +++---
 staging-x86_64/kdm-zsh-profile.patch |   22 +--
 staging-x86_64/kscreensaver.pam  |2 
 staging-x86_64/terminate-server.patch|   22 +--
 20 files changed, 466 insertions(+), 474 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 141662:141663 to see the changes.


[arch-commits] Commit in devtools/trunk (PKGBUILD)

2011-11-01 Thread Pierre Schmitz
Date: Tuesday, November 1, 2011 @ 16:41:05
  Author: pierre
Revision: 141664

upgpkg: devtools 2001-1

Modified:
  devtools/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 20:17:45 UTC (rev 141663)
+++ PKGBUILD2011-11-01 20:41:05 UTC (rev 141664)
@@ -2,15 +2,17 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=devtools
-pkgver=0.9.30
+pkgver=2001
 pkgrel=1
 pkgdesc='Tools for Arch Linux package maintainers'
 arch=('any')
 license=('GPL')
 url='http://projects.archlinux.org/devtools.git/'
 depends=('namcap' 'openssh' 'subversion' 'rsync')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('ee42bf1437367eaf018e8af303a5837c')
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz;
+
ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig;)
+md5sums=('4b9b8f3ed8126a2bd43afa58cee19bd9'
+ 'fa4c0e8da22c493098fc88288364d7d8')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}



[arch-commits] Commit in devtools/repos/testing-any (PKGBUILD PKGBUILD)

2011-11-01 Thread Pierre Schmitz
Date: Tuesday, November 1, 2011 @ 16:41:22
  Author: pierre
Revision: 141665

archrelease: copy trunk to testing-any

Added:
  devtools/repos/testing-any/PKGBUILD
(from rev 141664, devtools/trunk/PKGBUILD)
Deleted:
  devtools/repos/testing-any/PKGBUILD

--+
 PKGBUILD |   48 +---
 1 file changed, 25 insertions(+), 23 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-11-01 20:41:05 UTC (rev 141664)
+++ PKGBUILD2011-11-01 20:41:22 UTC (rev 141665)
@@ -1,23 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz pie...@archlinux.de
-
-pkgname=devtools
-pkgver=0.9.30
-pkgrel=1
-pkgdesc='Tools for Arch Linux package maintainers'
-arch=('any')
-license=('GPL')
-url='http://projects.archlinux.org/devtools.git/'
-depends=('namcap' 'openssh' 'subversion' 'rsync')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('ee42bf1437367eaf018e8af303a5837c')
-
-build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   make PREFIX=/usr
-}
-
-package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   make PREFIX=/usr DESTDIR=${pkgdir} install
-}

Copied: devtools/repos/testing-any/PKGBUILD (from rev 141664, 
devtools/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-11-01 20:41:22 UTC (rev 141665)
@@ -0,0 +1,25 @@
+# $Id$
+# Maintainer: Pierre Schmitz pie...@archlinux.de
+
+pkgname=devtools
+pkgver=2001
+pkgrel=1
+pkgdesc='Tools for Arch Linux package maintainers'
+arch=('any')
+license=('GPL')
+url='http://projects.archlinux.org/devtools.git/'
+depends=('namcap' 'openssh' 'subversion' 'rsync')
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz;
+
ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig;)
+md5sums=('4b9b8f3ed8126a2bd43afa58cee19bd9'
+ 'fa4c0e8da22c493098fc88288364d7d8')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make PREFIX=/usr
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make PREFIX=/usr DESTDIR=${pkgdir} install
+}



[arch-commits] Commit in python2-httplib2/trunk (PKGBUILD godaddy-certificate.patch)

2011-11-01 Thread Eric Bélanger
Date: Tuesday, November 1, 2011 @ 19:23:26
  Author: eric
Revision: 141666

Add godaddy certificate (close FS#26530)

Added:
  python2-httplib2/trunk/godaddy-certificate.patch
Modified:
  python2-httplib2/trunk/PKGBUILD

---+
 PKGBUILD  |   18 
 godaddy-certificate.patch |   91 
 2 files changed, 101 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 20:41:22 UTC (rev 141665)
+++ PKGBUILD2011-11-01 23:23:26 UTC (rev 141666)
@@ -8,7 +8,7 @@
 pkgname=(python-httplib2 python2-httplib2)
 _pkgbasename=httplib2
 pkgver=0.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc=A comprehensive HTTP client library, supporting many features
 url=http://code.google.com/p/httplib2/;
 license=('MIT')
@@ -17,28 +17,30 @@
 provides=('httplib2')
 replaces=('httplib2')
 source=(http://httplib2.googlecode.com/files/${_pkgbasename}-${pkgver}.tar.gz
-COPYING)
+COPYING godaddy-certificate.patch)
 md5sums=('03e798858cebbdde189b02ed97e85a45'
- 'd65321d20730e3d9291dd63b43fdcda9')
+ 'd65321d20730e3d9291dd63b43fdcda9'
+ '21417aa815bbc67c72e84eb15c08d5b7')
 
 build() {
   cd ${srcdir}
+  (cd ${_pkgbasename}-${pkgver} ; patch -p1 -i 
${srcdir}/godaddy-certificate.patch)
   cp -Rpv ${_pkgbasename}-${pkgver} ${pkgname[0]}-$pkgver
   cp -Rpv ${_pkgbasename}-${pkgver} ${pkgname[1]}-$pkgver
 }
 
 package_python-httplib2() {
   depends=('python')
+
   cd ${srcdir}/${pkgname}-${pkgver}
   python setup.py install --root=${pkgdir}
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 ${srcdir}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+  install -D -m644 ${srcdir}/COPYING 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
 package_python2-httplib2() {
-  depends=(python2)
+  depends=('python2')
+
   cd ${srcdir}/${pkgname}-${pkgver}
   python2 setup.py install --root=${pkgdir}
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 ${srcdir}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+  install -D -m644 ${srcdir}/COPYING 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

Added: godaddy-certificate.patch
===
--- godaddy-certificate.patch   (rev 0)
+++ godaddy-certificate.patch   2011-11-01 23:23:26 UTC (rev 141666)
@@ -0,0 +1,91 @@
+Description: Cherry-pick GoDaddy root certificate from upstream hg
+ Add GoDaddy root certificate to cacerts.txt 
+Author: Joe Gregorio jcgrego...@google.com
+
+--- python-httplib2-0.7.1.orig/python2/httplib2/cacerts.txt
 python-httplib2-0.7.1/python2/httplib2/cacerts.txt
+@@ -631,3 +631,84 @@ hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7
+ 95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
+ 2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
+ -END CERTIFICATE-
++
++Go Daddy Certification Authority Root Certificate Bundle
++
++
++-BEGIN CERTIFICATE-
++MIIE3jCCA8agAwIBAgICAwEwDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCVVMx
++ITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
++RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMTYw
++MTU0MzdaFw0yNjExMTYwMTU0MzdaMIHKMQswCQYDVQQGEwJVUzEQMA4GA1UECBMH
++QXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5j
++b20sIEluYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5j
++b20vcmVwb3NpdG9yeTEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlcnRpZmlj
++YXRpb24gQXV0aG9yaXR5MREwDwYDVQQFEwgwNzk2OTI4NzCCASIwDQYJKoZIhvcN
++AQEBBQADggEPADCCAQoCggEBAMQt1RWMnCZM7DI161+4WQFapmGBWTtwY6vj3D3H
++KrjJM9N55DrtPDAjhI6zMBS2sofDPZVUBJ7fmd0LJR4h3mUpfjWoqVTr9vcyOdQm
++VZWt7/v+WIbXnvQAjYwqDL1CBM6nPwT27oDyqu9SoWlm2r4arV3aLGbqGmu75RpR
++SgAvSMeYddi5Kcju+GZtCpyz8/x4fKL4o/K1w/O5epHBp+YlLpyo7RJlbmr2EkRT
++cDCVw5wrWCs9CHRK8r5RsL+H0EwnWGu1NcWdrxcx+AuP7q2BNgWJCJjPOq8lh8BJ
++6qf9Z/dFjpfMFDniNoW1fho3/Rb2cRGadDAW/hOUoz+EDU8CAwEAAaOCATIwggEu
++MB0GA1UdDgQWBBT9rGEyk2xF1uLuhV+auud2mWjM5zAfBgNVHSMEGDAWgBTSxLDS
++kdRMEXGzYcs9of7dqGrU4zASBgNVHRMBAf8ECDAGAQH/AgEAMDMGCCsGAQUFBwEB
++BCcwJTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuZ29kYWRkeS5jb20wRgYDVR0f
++BD8wPTA7oDmgN4Y1aHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNvbS9yZXBv
++c2l0b3J5L2dkcm9vdC5jcmwwSwYDVR0gBEQwQjBABgRVHSAAMDgwNgYIKwYBBQUH
++AgEWKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeTAO
++BgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBANKGwOy9+aG2Z+5mC6IG
++OgRQjhVyrEp0lVPLN8tESe8HkGsz2ZbwlFalEzAFPIUyIXvJxwqoJKSQ3kbTJSMU
++A2fCENZvD117esyfxVgqwcSeIaha86ykRvOe5GPLL5CkKSkB2XIsKd83ASe8T+5o
++0yGPwLPk9Qnt0hCqU7S+8MxZC9Y7lhyVJEnfzuz9p0iRFEUOOjZv2kWzRaJBydTX
++RE4+uXR21aITVSzGh6O1mawGhId/dQb8vxRMDsxuxN89txJx9OjxUUAiKEngHUuH
++qDTMBqLdElrRhjZkAzVvb3du6/KFUJheqwNTrZEjYx8WnM25sgVjOuH0aBsXBTWV
++U+4=
++-END CERTIFICATE-
++-BEGIN CERTIFICATE-

[arch-commits] Commit in python2-httplib2/repos/extra-any (5 files)

2011-11-01 Thread Eric Bélanger
Date: Tuesday, November 1, 2011 @ 19:23:54
  Author: eric
Revision: 141667

archrelease: copy trunk to extra-any

Added:
  python2-httplib2/repos/extra-any/COPYING
(from rev 141666, python2-httplib2/trunk/COPYING)
  python2-httplib2/repos/extra-any/PKGBUILD
(from rev 141666, python2-httplib2/trunk/PKGBUILD)
  python2-httplib2/repos/extra-any/godaddy-certificate.patch
(from rev 141666, python2-httplib2/trunk/godaddy-certificate.patch)
Deleted:
  python2-httplib2/repos/extra-any/COPYING
  python2-httplib2/repos/extra-any/PKGBUILD

---+
 COPYING   |   48 +++
 PKGBUILD  |   90 ++-
 godaddy-certificate.patch |   91 
 3 files changed, 161 insertions(+), 68 deletions(-)

Deleted: COPYING
===
--- COPYING 2011-11-01 23:23:26 UTC (rev 141666)
+++ COPYING 2011-11-01 23:23:54 UTC (rev 141667)
@@ -1,24 +0,0 @@
-Httplib2 Software License
-
-Copyright (c) 2006 by Joe Gregorio
-
-Permission is hereby granted, free of charge, to any person 
-obtaining a copy of this software and associated documentation 
-files (the Software), to deal in the Software without restriction, 
-including without limitation the rights to use, copy, modify, merge, 
-publish, distribute, sublicense, and/or sell copies of the Software, 
-and to permit persons to whom the Software is furnished to do so, 
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be 
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, 
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.
-

Copied: python2-httplib2/repos/extra-any/COPYING (from rev 141666, 
python2-httplib2/trunk/COPYING)
===
--- COPYING (rev 0)
+++ COPYING 2011-11-01 23:23:54 UTC (rev 141667)
@@ -0,0 +1,24 @@
+Httplib2 Software License
+
+Copyright (c) 2006 by Joe Gregorio
+
+Permission is hereby granted, free of charge, to any person 
+obtaining a copy of this software and associated documentation 
+files (the Software), to deal in the Software without restriction, 
+including without limitation the rights to use, copy, modify, merge, 
+publish, distribute, sublicense, and/or sell copies of the Software, 
+and to permit persons to whom the Software is furnished to do so, 
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be 
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, 
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+SOFTWARE.
+

Deleted: PKGBUILD
===
--- PKGBUILD2011-11-01 23:23:26 UTC (rev 141666)
+++ PKGBUILD2011-11-01 23:23:54 UTC (rev 141667)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Giorgio Lando patroc...@gmail.com
-# Contributor: Nicolas Quienot niQo@aur
-# Contributor: Jesse Young jesse.yo...@gmail.com
-
-pkgbase=python2-httplib2
-pkgname=(python-httplib2 python2-httplib2)
-_pkgbasename=httplib2
-pkgver=0.7.1
-pkgrel=1
-pkgdesc=A comprehensive HTTP client library, supporting many features
-url=http://code.google.com/p/httplib2/;
-license=('MIT')
-arch=('any')
-makedepends=('python' 'python2')
-provides=('httplib2')
-replaces=('httplib2')
-source=(http://httplib2.googlecode.com/files/${_pkgbasename}-${pkgver}.tar.gz
-COPYING)
-md5sums=('03e798858cebbdde189b02ed97e85a45'
- 'd65321d20730e3d9291dd63b43fdcda9')
-
-build() {
-  cd ${srcdir}
-  cp -Rpv ${_pkgbasename}-${pkgver} ${pkgname[0]}-$pkgver
-  cp -Rpv ${_pkgbasename}-${pkgver} ${pkgname[1]}-$pkgver
-}
-
-package_python-httplib2() {
-  depends=('python')
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python setup.py install --root=${pkgdir}
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 ${srcdir}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}
-
-package_python2-httplib2() {
-  depends=(python2)

[arch-commits] Commit in banshee/trunk (PKGBUILD)

2011-11-01 Thread Eric Bélanger
Date: Tuesday, November 1, 2011 @ 23:17:12
  Author: eric
Revision: 141668

Upstream update

Modified:
  banshee/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 23:23:54 UTC (rev 141667)
+++ PKGBUILD2011-11-02 03:17:12 UTC (rev 141668)
@@ -2,7 +2,7 @@
 # Contributor: György Balló ball...@freestart.hu
 
 pkgname=banshee
-pkgver=2.2.0
+pkgver=2.2.1
 pkgrel=1
 pkgdesc=Music management and playback for GNOME
 arch=('i686' 'x86_64')
@@ -19,8 +19,8 @@
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/2.2/$pkgname-$pkgver.tar.xz
 banshee-recent-gpod.patch)
-sha256sums=('85026f270777be15b778a8bf676d2c6e1a0d3d9758145515809bf209f7ab1815'
-'018eeb00d1b4e625d13f1184863e499be5b5dde050a7513e012d5898125073d9')
+sha256sums=('55c03ddf9732199b9f83d4ff375af99ae5a4eea46b8a198695427e5c48f1b9a5'
+'018eeb00d1b4e625d13f1184863e499be5b5dde050a7513e012d5898125073d9')
 
 build() {
   export MONO_SHARED_DIR=$srcdir/.wabi



[arch-commits] Commit in banshee/repos (12 files)

2011-11-01 Thread Eric Bélanger
Date: Tuesday, November 1, 2011 @ 23:17:44
  Author: eric
Revision: 141669

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  banshee/repos/extra-i686/PKGBUILD
(from rev 141668, banshee/trunk/PKGBUILD)
  banshee/repos/extra-i686/banshee-recent-gpod.patch
(from rev 141668, banshee/trunk/banshee-recent-gpod.patch)
  banshee/repos/extra-i686/banshee.install
(from rev 141668, banshee/trunk/banshee.install)
  banshee/repos/extra-x86_64/PKGBUILD
(from rev 141668, banshee/trunk/PKGBUILD)
  banshee/repos/extra-x86_64/banshee-recent-gpod.patch
(from rev 141668, banshee/trunk/banshee-recent-gpod.patch)
  banshee/repos/extra-x86_64/banshee.install
(from rev 141668, banshee/trunk/banshee.install)
Deleted:
  banshee/repos/extra-i686/PKGBUILD
  banshee/repos/extra-i686/banshee-recent-gpod.patch
  banshee/repos/extra-i686/banshee.install
  banshee/repos/extra-x86_64/PKGBUILD
  banshee/repos/extra-x86_64/banshee-recent-gpod.patch
  banshee/repos/extra-x86_64/banshee.install

+
 extra-i686/PKGBUILD|   98 +++
 extra-i686/banshee-recent-gpod.patch   |   48 +++
 extra-i686/banshee.install |   30 -
 extra-x86_64/PKGBUILD  |   98 +++
 extra-x86_64/banshee-recent-gpod.patch |   48 +++
 extra-x86_64/banshee.install   |   30 -
 6 files changed, 176 insertions(+), 176 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-02 03:17:12 UTC (rev 141668)
+++ extra-i686/PKGBUILD 2011-11-02 03:17:44 UTC (rev 141669)
@@ -1,49 +0,0 @@
-# $Id$
-# Contributor: György Balló ball...@freestart.hu
-
-pkgname=banshee
-pkgver=2.2.0
-pkgrel=1
-pkgdesc=Music management and playback for GNOME
-arch=('i686' 'x86_64')
-url=http://banshee.fm/;
-license=('MIT')
-depends=(libxxf86vm gstreamer0.10-base-plugins mono-addins notify-sharp-svn 
dbus-sharp-glib boo libwebkit libsoup-gnome gdata-sharp taglib-sharp 
gtk-sharp-beans 'gudev-sharp' 'gkeyfile-sharp' gconf-sharp libmtp libgpod 
mono-zeroconf desktop-file-utils hicolor-icon-theme xdg-utils media-player-info)
-makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
-'gstreamer0.10-ugly-plugins: Extra media codecs'
-'gstreamer0.10-bad-plugins: Extra media codecs'
-'gstreamer0.10-ffmpeg: Extra media codecs'
-'brasero: CD burning')
-options=('!libtool')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/2.2/$pkgname-$pkgver.tar.xz
-banshee-recent-gpod.patch)
-sha256sums=('85026f270777be15b778a8bf676d2c6e1a0d3d9758145515809bf209f7ab1815'
-'018eeb00d1b4e625d13f1184863e499be5b5dde050a7513e012d5898125073d9')
-
-build() {
-  export MONO_SHARED_DIR=$srcdir/.wabi
-  mkdir -p $MONO_SHARED_DIR
-
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/banshee-recent-gpod.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-  --disable-docs \
-  --disable-static \
-  --disable-scrollkeeper \
-  --disable-schemas-install \
-  --with-vendor-build-id=ArchLinux
-  make
-}
-
-package() {
-  export MONO_SHARED_DIR=$srcdir/.wabi
-  mkdir -p $MONO_SHARED_DIR
-
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-}

Copied: banshee/repos/extra-i686/PKGBUILD (from rev 141668, 
banshee/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-02 03:17:44 UTC (rev 141669)
@@ -0,0 +1,49 @@
+# $Id$
+# Contributor: György Balló ball...@freestart.hu
+
+pkgname=banshee
+pkgver=2.2.1
+pkgrel=1
+pkgdesc=Music management and playback for GNOME
+arch=('i686' 'x86_64')
+url=http://banshee.fm/;
+license=('MIT')
+depends=(libxxf86vm gstreamer0.10-base-plugins mono-addins notify-sharp-svn 
dbus-sharp-glib boo libwebkit libsoup-gnome gdata-sharp taglib-sharp 
gtk-sharp-beans 'gudev-sharp' 'gkeyfile-sharp' gconf-sharp libmtp libgpod 
mono-zeroconf desktop-file-utils hicolor-icon-theme xdg-utils media-player-info)
+makedepends=('intltool' 'gnome-doc-utils')
+optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
+'gstreamer0.10-ugly-plugins: Extra media codecs'
+'gstreamer0.10-bad-plugins: Extra media codecs'
+'gstreamer0.10-ffmpeg: Extra media codecs'
+'brasero: CD burning')
+options=('!libtool')
+install=$pkgname.install
+source=(http://download.gnome.org/sources/$pkgname/2.2/$pkgname-$pkgver.tar.xz
+banshee-recent-gpod.patch)
+sha256sums=('55c03ddf9732199b9f83d4ff375af99ae5a4eea46b8a198695427e5c48f1b9a5'
+

[arch-commits] Commit in xfce4-smartbookmark-plugin/trunk (2 files)

2011-11-01 Thread Eric Bélanger
Date: Wednesday, November 2, 2011 @ 01:08:27
  Author: eric
Revision: 141670

Upstream update, Remove xfce4-dev-tools makedepends, Remove old patch

Modified:
  xfce4-smartbookmark-plugin/trunk/PKGBUILD
Deleted:
  
xfce4-smartbookmark-plugin/trunk/0001-Fix-problems-with-plugin-and-4.8-panel.patch

---+
 0001-Fix-problems-with-plugin-and-4.8-panel.patch |   37 
 PKGBUILD  |   29 ++-
 2 files changed, 12 insertions(+), 54 deletions(-)

Deleted: 0001-Fix-problems-with-plugin-and-4.8-panel.patch
===
--- 0001-Fix-problems-with-plugin-and-4.8-panel.patch   2011-11-02 03:17:44 UTC 
(rev 141669)
+++ 0001-Fix-problems-with-plugin-and-4.8-panel.patch   2011-11-02 05:08:27 UTC 
(rev 141670)
@@ -1,37 +0,0 @@
-From b1922538b26f9929bcd43df8728bf33afe06fbef Mon Sep 17 00:00:00 2001
-From: Nick Schermer n...@xfce.org
-Date: Thu, 27 Jan 2011 22:29:16 +0100
-Subject: [PATCH] Fix problems with plugin and 4.8 panel.
-

- configure.ac|2 +-
- src/smartbookmark.desktop.in.in |2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1ba88d4..cb344f5 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -25,7 +25,7 @@ XDT_I18N([ca cs en_GB eu fr hu it pl pt_PT sq zh_TW])
- dnl Check for required packages
- XDT_CHECK_LIBX11_REQUIRE()
- XDT_CHECK_PACKAGE([GDK], [gdk-2.0], [2.0])
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfce4panel-1.0], [4.2])
-+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2])
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
- 
- XDT_FEATURE_DEBUG()
-diff --git a/src/smartbookmark.desktop.in.in b/src/smartbookmark.desktop.in.in
-index 83464ff..7bafece 100644
 a/src/smartbookmark.desktop.in.in
-+++ b/src/smartbookmark.desktop.in.in
-@@ -4,5 +4,5 @@ Encoding=UTF-8
- _Name=SmartBookmark
- _Comment=Query websites from the Xfce panel
- Icon=gtk-preferences
--X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libsmartbookmark.so
-+X-XFCE-Module=smartbookmark
- X-XFCE-Unique=false
--- 
-1.7.3.5
-

Modified: PKGBUILD
===
--- PKGBUILD2011-11-02 03:17:44 UTC (rev 141669)
+++ PKGBUILD2011-11-02 05:08:27 UTC (rev 141670)
@@ -3,29 +3,24 @@
 # Contributor: Tobias Kieslich tobias (at) archlinux.org
 
 pkgname=xfce4-smartbookmark-plugin
-pkgver=0.4.2
-pkgrel=9
-pkgdesc=plugin for the Xfce4 panel that let you quicksearch from selected 
websites
+pkgver=0.4.4
+pkgrel=1
+pkgdesc=Plugin for the Xfce4 panel that let you quicksearch from selected 
websites
 arch=('i686' 'x86_64')
 license=('GPL2')
 url=http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin;
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxfcegui4')
-makedepends=('intltool' 'libxt' 'xfce4-dev-tools')
+makedepends=('intltool' 'libxt')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.4/${pkgname}-${pkgver}.tar.gz
-   xfce4-smartbookmark-plugin-archlinux.patch
-   0001-Fix-problems-with-plugin-and-4.8-panel.patch)
-md5sums=('284e26595637dd2e900b75534372496b'
- '323ac898cfcfdb078f67f9ecd1905aec'
- '6dc220fc41cd21678aad62c80a4c622f')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2
+   xfce4-smartbookmark-plugin-archlinux.patch)
+md5sums=('273e38306a82f14e1b8c2c5db912f6c3'
+ '323ac898cfcfdb078f67f9ecd1905aec')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # fix panel4.8  http://bugzilla.xfce.org/show_bug.cgi
-  patch -Np1 -i ${srcdir}/0001-Fix-problems-with-plugin-and-4.8-panel.patch
-  patch -Np0 -i ${srcdir}/xfce4-smartbookmark-plugin-archlinux.patch
-  xdt-autogen
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p0 -i ${srcdir}/xfce4-smartbookmark-plugin-archlinux.patch
   ./configure --prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib \
@@ -36,6 +31,6 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
 }



[arch-commits] Commit in xfce4-smartbookmark-plugin/repos (10 files)

2011-11-01 Thread Eric Bélanger
Date: Wednesday, November 2, 2011 @ 01:08:45
  Author: eric
Revision: 141671

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xfce4-smartbookmark-plugin/repos/extra-i686/PKGBUILD
(from rev 141670, xfce4-smartbookmark-plugin/trunk/PKGBUILD)
  
xfce4-smartbookmark-plugin/repos/extra-i686/xfce4-smartbookmark-plugin-archlinux.patch
(from rev 141670, 
xfce4-smartbookmark-plugin/trunk/xfce4-smartbookmark-plugin-archlinux.patch)
  xfce4-smartbookmark-plugin/repos/extra-x86_64/PKGBUILD
(from rev 141670, xfce4-smartbookmark-plugin/trunk/PKGBUILD)
  
xfce4-smartbookmark-plugin/repos/extra-x86_64/xfce4-smartbookmark-plugin-archlinux.patch
(from rev 141670, 
xfce4-smartbookmark-plugin/trunk/xfce4-smartbookmark-plugin-archlinux.patch)
Deleted:
  
xfce4-smartbookmark-plugin/repos/extra-i686/0001-Fix-problems-with-plugin-and-4.8-panel.patch
  xfce4-smartbookmark-plugin/repos/extra-i686/PKGBUILD
  
xfce4-smartbookmark-plugin/repos/extra-i686/xfce4-smartbookmark-plugin-archlinux.patch
  
xfce4-smartbookmark-plugin/repos/extra-x86_64/0001-Fix-problems-with-plugin-and-4.8-panel.patch
  xfce4-smartbookmark-plugin/repos/extra-x86_64/PKGBUILD
  
xfce4-smartbookmark-plugin/repos/extra-x86_64/xfce4-smartbookmark-plugin-archlinux.patch

+
 extra-i686/0001-Fix-problems-with-plugin-and-4.8-panel.patch   |   37 
 extra-i686/PKGBUILD|   77 
--
 extra-i686/xfce4-smartbookmark-plugin-archlinux.patch  |   48 +++---
 extra-x86_64/0001-Fix-problems-with-plugin-and-4.8-panel.patch |   37 
 extra-x86_64/PKGBUILD  |   77 
--
 extra-x86_64/xfce4-smartbookmark-plugin-archlinux.patch|   48 +++---
 6 files changed, 120 insertions(+), 204 deletions(-)

Deleted: extra-i686/0001-Fix-problems-with-plugin-and-4.8-panel.patch
===
--- extra-i686/0001-Fix-problems-with-plugin-and-4.8-panel.patch
2011-11-02 05:08:27 UTC (rev 141670)
+++ extra-i686/0001-Fix-problems-with-plugin-and-4.8-panel.patch
2011-11-02 05:08:45 UTC (rev 141671)
@@ -1,37 +0,0 @@
-From b1922538b26f9929bcd43df8728bf33afe06fbef Mon Sep 17 00:00:00 2001
-From: Nick Schermer n...@xfce.org
-Date: Thu, 27 Jan 2011 22:29:16 +0100
-Subject: [PATCH] Fix problems with plugin and 4.8 panel.
-

- configure.ac|2 +-
- src/smartbookmark.desktop.in.in |2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1ba88d4..cb344f5 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -25,7 +25,7 @@ XDT_I18N([ca cs en_GB eu fr hu it pl pt_PT sq zh_TW])
- dnl Check for required packages
- XDT_CHECK_LIBX11_REQUIRE()
- XDT_CHECK_PACKAGE([GDK], [gdk-2.0], [2.0])
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfce4panel-1.0], [4.2])
-+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2])
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
- 
- XDT_FEATURE_DEBUG()
-diff --git a/src/smartbookmark.desktop.in.in b/src/smartbookmark.desktop.in.in
-index 83464ff..7bafece 100644
 a/src/smartbookmark.desktop.in.in
-+++ b/src/smartbookmark.desktop.in.in
-@@ -4,5 +4,5 @@ Encoding=UTF-8
- _Name=SmartBookmark
- _Comment=Query websites from the Xfce panel
- Icon=gtk-preferences
--X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libsmartbookmark.so
-+X-XFCE-Module=smartbookmark
- X-XFCE-Unique=false
--- 
-1.7.3.5
-

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-02 05:08:27 UTC (rev 141670)
+++ extra-i686/PKGBUILD 2011-11-02 05:08:45 UTC (rev 141671)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR andy...@archlinux.org
-# Contributor: Tobias Kieslich tobias (at) archlinux.org
-
-pkgname=xfce4-smartbookmark-plugin
-pkgver=0.4.2
-pkgrel=9
-pkgdesc=plugin for the Xfce4 panel that let you quicksearch from selected 
websites
-arch=('i686' 'x86_64')
-license=('GPL2')
-url=http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin;
-groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4')
-makedepends=('intltool' 'libxt' 'xfce4-dev-tools')
-options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.4/${pkgname}-${pkgver}.tar.gz
-   xfce4-smartbookmark-plugin-archlinux.patch
-   0001-Fix-problems-with-plugin-and-4.8-panel.patch)
-md5sums=('284e26595637dd2e900b75534372496b'
- '323ac898cfcfdb078f67f9ecd1905aec'
- '6dc220fc41cd21678aad62c80a4c622f')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # fix panel4.8  http://bugzilla.xfce.org/show_bug.cgi
-  patch -Np1 -i ${srcdir}/0001-Fix-problems-with-plugin-and-4.8-panel.patch
-  patch -Np0 -i ${srcdir}/xfce4-smartbookmark-plugin-archlinux.patch
-  xdt-autogen
-  ./configure --prefix=/usr \
-   --sysconfdir=/etc \
-   --libexecdir=/usr/lib \
-

[arch-commits] Commit in libmpdclient/trunk (PKGBUILD)

2011-11-01 Thread Gaetan Bisson
Date: Wednesday, November 2, 2011 @ 01:35:23
  Author: bisson
Revision: 141672

upstream update

Modified:
  libmpdclient/trunk/PKGBUILD   (contents, properties)

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-02 05:08:45 UTC (rev 141671)
+++ PKGBUILD2011-11-02 05:35:23 UTC (rev 141672)
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 50625 2009-08-30 03:02:23Z allan $
+# $Id$
 # Contributor: Andrea Scarpino and...@archlinux.org
 # Maintainer: Gaetan Bisson bis...@archlinux.org
 
 pkgname=libmpdclient
-pkgver=2.5
+pkgver=2.6
 pkgrel=1
 pkgdesc='Asynchronous API library for interfacing MPD in the C, C++  
Objective C languages'
+url='http://mpd.wikia.com/wiki/ClientLib:libmpdclient'
+license=('custom:BSD')
 arch=('i686' 'x86_64')
-url='http://mpd.wikia.com/wiki/ClientLib:libmpdclient'
-license=('custom')
 options=('!libtool')
 
source=(http://downloads.sourceforge.net/project/musicpd/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;)
-sha1sums=('a2e68352f2b7d55787d14a45ee0d902f2427b3dc')
+sha1sums=('39bdcf5399fb98e34b8b6110057b64f4d1945333')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -22,7 +22,7 @@
 package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
-   
+
cd ${pkgdir}
install -d usr/share/licenses/libmpdclient
ln -s ../../doc/libmpdclient/COPYING 
usr/share/licenses/libmpdclient/COPYING


Property changes on: libmpdclient/trunk/PKGBUILD
___
Added: svn:keywords
   + Id



[arch-commits] Commit in libmpdclient/repos (4 files)

2011-11-01 Thread Gaetan Bisson
Date: Wednesday, November 2, 2011 @ 01:35:47
  Author: bisson
Revision: 141673

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libmpdclient/repos/extra-i686/PKGBUILD
(from rev 141672, libmpdclient/trunk/PKGBUILD)
  libmpdclient/repos/extra-x86_64/PKGBUILD
(from rev 141672, libmpdclient/trunk/PKGBUILD)
Deleted:
  libmpdclient/repos/extra-i686/PKGBUILD
  libmpdclient/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   58 
 extra-x86_64/PKGBUILD |   58 
 2 files changed, 58 insertions(+), 58 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-02 05:35:23 UTC (rev 141672)
+++ extra-i686/PKGBUILD 2011-11-02 05:35:47 UTC (rev 141673)
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 50625 2009-08-30 03:02:23Z allan $
-# Contributor: Andrea Scarpino and...@archlinux.org
-# Maintainer: Gaetan Bisson bis...@archlinux.org
-
-pkgname=libmpdclient
-pkgver=2.5
-pkgrel=1
-pkgdesc='Asynchronous API library for interfacing MPD in the C, C++  
Objective C languages'
-arch=('i686' 'x86_64')
-url='http://mpd.wikia.com/wiki/ClientLib:libmpdclient'
-license=('custom')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/project/musicpd/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;)
-sha1sums=('a2e68352f2b7d55787d14a45ee0d902f2427b3dc')
-
-build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   ./configure --prefix=/usr --disable-static
-   make
-}
-
-package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   make DESTDIR=${pkgdir} install
-   
-   cd ${pkgdir}
-   install -d usr/share/licenses/libmpdclient
-   ln -s ../../doc/libmpdclient/COPYING 
usr/share/licenses/libmpdclient/COPYING
-}

Copied: libmpdclient/repos/extra-i686/PKGBUILD (from rev 141672, 
libmpdclient/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-02 05:35:47 UTC (rev 141673)
@@ -0,0 +1,29 @@
+# $Id$
+# Contributor: Andrea Scarpino and...@archlinux.org
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+
+pkgname=libmpdclient
+pkgver=2.6
+pkgrel=1
+pkgdesc='Asynchronous API library for interfacing MPD in the C, C++  
Objective C languages'
+url='http://mpd.wikia.com/wiki/ClientLib:libmpdclient'
+license=('custom:BSD')
+arch=('i686' 'x86_64')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/project/musicpd/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;)
+sha1sums=('39bdcf5399fb98e34b8b6110057b64f4d1945333')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure --prefix=/usr --disable-static
+   make
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+
+   cd ${pkgdir}
+   install -d usr/share/licenses/libmpdclient
+   ln -s ../../doc/libmpdclient/COPYING 
usr/share/licenses/libmpdclient/COPYING
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-11-02 05:35:23 UTC (rev 141672)
+++ extra-x86_64/PKGBUILD   2011-11-02 05:35:47 UTC (rev 141673)
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 50625 2009-08-30 03:02:23Z allan $
-# Contributor: Andrea Scarpino and...@archlinux.org
-# Maintainer: Gaetan Bisson bis...@archlinux.org
-
-pkgname=libmpdclient
-pkgver=2.5
-pkgrel=1
-pkgdesc='Asynchronous API library for interfacing MPD in the C, C++  
Objective C languages'
-arch=('i686' 'x86_64')
-url='http://mpd.wikia.com/wiki/ClientLib:libmpdclient'
-license=('custom')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/project/musicpd/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;)
-sha1sums=('a2e68352f2b7d55787d14a45ee0d902f2427b3dc')
-
-build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   ./configure --prefix=/usr --disable-static
-   make
-}
-
-package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   make DESTDIR=${pkgdir} install
-   
-   cd ${pkgdir}
-   install -d usr/share/licenses/libmpdclient
-   ln -s ../../doc/libmpdclient/COPYING 
usr/share/licenses/libmpdclient/COPYING
-}

Copied: libmpdclient/repos/extra-x86_64/PKGBUILD (from rev 141672, 
libmpdclient/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-11-02 05:35:47 UTC (rev 141673)
@@ -0,0 +1,29 @@
+# $Id$
+# Contributor: Andrea Scarpino and...@archlinux.org
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+
+pkgname=libmpdclient
+pkgver=2.6
+pkgrel=1
+pkgdesc='Asynchronous API library for interfacing MPD in the C, C++  
Objective C languages'
+url='http://mpd.wikia.com/wiki/ClientLib:libmpdclient'
+license=('custom:BSD')
+arch=('i686' 'x86_64')