[arch-commits] Commit in pacman/trunk (5 files)

2011-10-13 Thread Dan McGee
Date: Thursday, October 13, 2011 @ 13:40:33
  Author: dan
Revision: 140412

Initial stab at 4.0 update

Modified:
  pacman/trunk/PKGBUILD
  pacman/trunk/makepkg.conf
  pacman/trunk/pacman.conf
  pacman/trunk/pacman.conf.x86_64
Deleted:
  pacman/trunk/0001-makepkg-fix-removing-symbolic-link.patch

---+
 0001-makepkg-fix-removing-symbolic-link.patch |   32 
 PKGBUILD  |   24 --
 makepkg.conf  |   25 --
 pacman.conf   |   21 ---
 pacman.conf.x86_64|   21 ---
 5 files changed, 61 insertions(+), 62 deletions(-)

Deleted: 0001-makepkg-fix-removing-symbolic-link.patch
===
--- 0001-makepkg-fix-removing-symbolic-link.patch   2011-10-13 03:56:02 UTC 
(rev 140411)
+++ 0001-makepkg-fix-removing-symbolic-link.patch   2011-10-13 17:40:33 UTC 
(rev 140412)
@@ -1,32 +0,0 @@
-From c493eef643ecb3a54c79083c51a8975f816ed9de Mon Sep 17 00:00:00 2001
-From: Allan McRae al...@archlinux.org
-Date: Tue, 28 Jun 2011 22:47:35 +1000
-Subject: [PATCH] makepkg: fix removing symbolic link
-
-The path was not being stripped from $file before prefixing with
-$srcdir resulting in the attempted removal of a very weird
-filename.
-
-Signed-off-by: Allan McRae al...@archlinux.org
-Signed-off-by: Dan McGee d...@archlinux.org
-(cherry picked from commit e92905a2c8c14c7855e2841f44d3c139aa40844c)

- scripts/makepkg.sh.in |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
-index 3ace945..b0b0882 100644
 a/scripts/makepkg.sh.in
-+++ b/scripts/makepkg.sh.in
-@@ -509,7 +509,7 @@ download_sources() {
-   local file=$(get_filepath $netfile || true)
-   if [[ -n $file ]]; then
-   msg2 $(gettext Found %s) ${file##*/}
--  rm -f $srcdir/$file
-+  rm -f $srcdir/${file##*/}
-   ln -s $file $srcdir/
-   continue
-   fi
--- 
-1.7.6
-

Modified: PKGBUILD
===
--- PKGBUILD2011-10-13 03:56:02 UTC (rev 140411)
+++ PKGBUILD2011-10-13 17:40:33 UTC (rev 140412)
@@ -1,15 +1,17 @@
 # $Id$
 # Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner d...@archlinux.org
 
 pkgname=pacman
-pkgver=3.5.4
-pkgrel=4
+pkgver=4.0.0
+pkgrel=1
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
 license=('GPL')
 groups=('base')
-depends=('bash' 'glibc=2.14' 'libarchive=2.8.4' 'libfetch=2.28' 
'pacman-mirrorlist')
+depends=('bash' 'glibc=2.14' 'libarchive=2.8.4' 'curl'
+ 'gpgme' 'pacman-mirrorlist')
 optdepends=('fakeroot: for makepkg usage as normal user'
 'curl: for rankmirrors usage')
 backup=(etc/pacman.conf etc/makepkg.conf)
@@ -18,13 +20,11 @@
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
 pacman.conf
 pacman.conf.x86_64
-makepkg.conf
-0001-makepkg-fix-removing-symbolic-link.patch)
-md5sums=('2dd3a85d55ee3dd89abd349aa837447c'
- 'e99eb721b6b704f68c5f47468507c102'
- 'f8b939d9b2beb79a0436961a2d707d7c'
- 'c034b061c86b3f26a9646cf8efc7ff11'
- '749a4ddc6d8418d8d031f1c9b4e09d6f')
+makepkg.conf)
+md5sums=('8c97f4804d2a0847956c45888b0ea517'
+ 'ae4abf6df12483d26b39529ab27c0837'
+ '99d8fae7a3c761e3ebad800f6a216e83'
+ 'db051afbd12993b7743ccd4d58668499')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
@@ -32,10 +32,8 @@
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  patch -Np1  $srcdir/0001-makepkg-fix-removing-symbolic-link.patch
-
   ./configure --prefix=/usr --sysconfdir=/etc \
---localstatedir=/var --enable-doc
+--localstatedir=/var --enable-doc --enable-debug
   make
 }
 

Modified: makepkg.conf
===
--- makepkg.conf2011-10-13 03:56:02 UTC (rev 140411)
+++ makepkg.conf2011-10-13 17:40:33 UTC (rev 140412)
@@ -8,16 +8,16 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
-  'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u'
-  'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate 
-O %o %u'
+DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o 
%u'
+  'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
+  'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
   'rsync::/usr/bin/rsync -z %u %o'
   

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

2011-10-13 Thread Dan McGee
Date: Thursday, October 13, 2011 @ 13:52:30
  Author: dan
Revision: 140413

upgpkg: pacman 4.0.0-1

4.0.0-1 initial [testing] release

Modified:
  pacman/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-13 17:40:33 UTC (rev 140412)
+++ PKGBUILD2011-10-13 17:52:30 UTC (rev 140413)
@@ -10,7 +10,7 @@
 url=http://www.archlinux.org/pacman/;
 license=('GPL')
 groups=('base')
-depends=('bash' 'glibc=2.14' 'libarchive=2.8.4' 'curl'
+depends=('bash' 'glibc=2.14' 'libarchive=2.8.4' 'curl=7.19.4'
  'gpgme' 'pacman-mirrorlist')
 optdepends=('fakeroot: for makepkg usage as normal user'
 'curl: for rankmirrors usage')
@@ -33,7 +33,7 @@
   cd $srcdir/$pkgname-$pkgver
 
   ./configure --prefix=/usr --sysconfdir=/etc \
---localstatedir=/var --enable-doc --enable-debug
+--localstatedir=/var --enable-doc
   make
 }
 



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

2011-10-13 Thread Dan McGee
Date: Thursday, October 13, 2011 @ 13:54:15
  Author: dan
Revision: 140414

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

Added:
  pacman/repos/testing-i686/
  pacman/repos/testing-i686/PKGBUILD
(from rev 140413, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/makepkg.conf
(from rev 140413, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman.conf
(from rev 140413, pacman/trunk/pacman.conf)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 140413, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-i686/pacman.install
(from rev 140413, pacman/trunk/pacman.install)
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 140413, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 140413, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman.conf
(from rev 140413, pacman/trunk/pacman.conf)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 140413, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/pacman.install
(from rev 140413, pacman/trunk/pacman.install)

---+
 testing-i686/PKGBUILD |   74 ++
 testing-i686/makepkg.conf |  121 
 testing-i686/pacman.conf  |   93 +++
 testing-i686/pacman.conf.x86_64   |  102 ++
 testing-i686/pacman.install   |   62 ++
 testing-x86_64/PKGBUILD   |   74 ++
 testing-x86_64/makepkg.conf   |  121 
 testing-x86_64/pacman.conf|   93 +++
 testing-x86_64/pacman.conf.x86_64 |  102 ++
 testing-x86_64/pacman.install |   62 ++
 10 files changed, 904 insertions(+)

Copied: pacman/repos/testing-i686/PKGBUILD (from rev 140413, 
pacman/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-10-13 17:54:15 UTC (rev 140414)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner d...@archlinux.org
+
+pkgname=pacman
+pkgver=4.0.0
+pkgrel=1
+pkgdesc=A library-based package manager with dependency support
+arch=('i686' 'x86_64')
+url=http://www.archlinux.org/pacman/;
+license=('GPL')
+groups=('base')
+depends=('bash' 'glibc=2.14' 'libarchive=2.8.4' 'curl=7.19.4'
+ 'gpgme' 'pacman-mirrorlist')
+optdepends=('fakeroot: for makepkg usage as normal user'
+'curl: for rankmirrors usage')
+backup=(etc/pacman.conf etc/makepkg.conf)
+install=pacman.install
+options=(!libtool)
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
+pacman.conf
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('8c97f4804d2a0847956c45888b0ea517'
+ 'ae4abf6df12483d26b39529ab27c0837'
+ '99d8fae7a3c761e3ebad800f6a216e83'
+ 'db051afbd12993b7743ccd4d58668499')
+
+# keep an upgrade path for older installations
+PKGEXT='.pkg.tar.gz'
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+--localstatedir=/var --enable-doc
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # install Arch specific stuff
+  mkdir -p $pkgdir/etc
+  case $CARCH in
+i686)
+  install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
+  mycarch=i686
+  mychost=i686-pc-linux-gnu
+  myflags=-march=i686 
+  ;;
+x86_64)
+  install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
+  mycarch=x86_64
+  mychost=x86_64-unknown-linux-gnu
+  myflags=-march=x86-64 
+  ;;
+  esac
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+  # set things correctly in the default conf file
+  sed -i $pkgdir/etc/makepkg.conf \
+-e s|@CARCH[@]|$mycarch|g \
+-e s|@CHOST[@]|$mychost|g \
+-e s|@CARCHFLAGS[@]|$myflags|g
+
+  # install completion files
+  mkdir -p $pkgdir/etc/bash_completion.d/
+  install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman
+  mkdir -p $pkgdir/usr/share/zsh/site-functions/
+  install -m644 contrib/zsh_completion 
$pkgdir/usr/share/zsh/site-functions/_pacman
+}
+
+# vim: set ts=2 sw=2 et:

Copied: pacman/repos/testing-i686/makepkg.conf (from rev 140413, 
pacman/trunk/makepkg.conf)
===
--- testing-i686/makepkg.conf   (rev 0)
+++ testing-i686/makepkg.conf   2011-10-13 17:54:15 UTC (rev 140414)
@@ -0,0 +1,121 @@
+#
+# /etc/makepkg.conf
+#
+
+#
+# SOURCE ACQUISITION
+#
+#
+#-- The download utilities that makepkg should use to acquire 

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

2011-10-13 Thread Dan McGee
Date: Thursday, October 13, 2011 @ 14:11:31
  Author: dan
Revision: 140415

upgpkg: pacman 4.0.0-2

4.0.0-2 add install message for pacman-key init

Modified:
  pacman/trunk/PKGBUILD
  pacman/trunk/pacman.install

+
 PKGBUILD   |2 +-
 pacman.install |   11 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-13 17:54:15 UTC (rev 140414)
+++ PKGBUILD2011-10-13 18:11:31 UTC (rev 140415)
@@ -4,7 +4,7 @@
 
 pkgname=pacman
 pkgver=4.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;

Modified: pacman.install
===
--- pacman.install  2011-10-13 17:54:15 UTC (rev 140414)
+++ pacman.install  2011-10-13 18:11:31 UTC (rev 140415)
@@ -9,8 +9,19 @@
 if [ $(vercmp $2 3.5.0) -lt 0 ]; then
 _warnupgrade
 fi
+_check_pubring
 }
 
+post_install() {
+_check_pubring
+}
+
+_check_pubring() {
+if [ ! -f etc/pacman.d/gnupg/pubring.gpg ]; then
+echo   Run \`pacman-key --init\` to set up your pacman keyring.
+fi
+}
+
 _warnupgrade() {
 echo  The pacman database format has changed as of pacman 3.5.0.
 echo  You will need to run \`pacman-db-upgrade\` as root.



[arch-commits] Commit in pacman/repos (20 files)

2011-10-13 Thread Dan McGee
Date: Thursday, October 13, 2011 @ 14:13:21
  Author: dan
Revision: 140416

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

Added:
  pacman/repos/testing-i686/PKGBUILD
(from rev 140415, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/makepkg.conf
(from rev 140415, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman.conf
(from rev 140415, pacman/trunk/pacman.conf)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 140415, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-i686/pacman.install
(from rev 140415, pacman/trunk/pacman.install)
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 140415, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 140415, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman.conf
(from rev 140415, pacman/trunk/pacman.conf)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 140415, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/pacman.install
(from rev 140415, pacman/trunk/pacman.install)
Deleted:
  pacman/repos/testing-i686/PKGBUILD
  pacman/repos/testing-i686/makepkg.conf
  pacman/repos/testing-i686/pacman.conf
  pacman/repos/testing-i686/pacman.conf.x86_64
  pacman/repos/testing-i686/pacman.install
  pacman/repos/testing-x86_64/PKGBUILD
  pacman/repos/testing-x86_64/makepkg.conf
  pacman/repos/testing-x86_64/pacman.conf
  pacman/repos/testing-x86_64/pacman.conf.x86_64
  pacman/repos/testing-x86_64/pacman.install

---+
 testing-i686/PKGBUILD |  148 +++---
 testing-i686/makepkg.conf |  242 ++--
 testing-i686/pacman.conf  |  186 +--
 testing-i686/pacman.conf.x86_64   |  204 +++---
 testing-i686/pacman.install   |  135 ++--
 testing-x86_64/PKGBUILD   |  148 +++---
 testing-x86_64/makepkg.conf   |  242 ++--
 testing-x86_64/pacman.conf|  186 +--
 testing-x86_64/pacman.conf.x86_64 |  204 +++---
 testing-x86_64/pacman.install |  135 ++--
 10 files changed, 926 insertions(+), 904 deletions(-)

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


[arch-commits] Commit in jack/trunk (5 files)

2011-10-13 Thread Ray Rashif
Date: Thursday, October 13, 2011 @ 15:41:56
  Author: schiv
Revision: 140417

upgpkg: jack 0.121.3-2

implement FS#26343; remove changelog

Added:
  jack/trunk/40-hpet-permissions.rules
  jack/trunk/99-realtime.conf
  jack/trunk/jack.install
Modified:
  jack/trunk/PKGBUILD
Deleted:
  jack/trunk/jack.changelog

---+
 40-hpet-permissions.rules |2 +
 99-realtime.conf  |2 +
 PKGBUILD  |   18 +++---
 jack.changelog|   21 
 jack.install  |   56 
 5 files changed, 74 insertions(+), 25 deletions(-)

Added: 40-hpet-permissions.rules
===
--- 40-hpet-permissions.rules   (rev 0)
+++ 40-hpet-permissions.rules   2011-10-13 19:41:56 UTC (rev 140417)
@@ -0,0 +1,2 @@
+KERNEL==rtc0, GROUP=realtime
+KERNEL==hpet, GROUP=realtime

Added: 99-realtime.conf
===
--- 99-realtime.conf(rev 0)
+++ 99-realtime.conf2011-10-13 19:41:56 UTC (rev 140417)
@@ -0,0 +1,2 @@
+@realtime  - rtprio99
+@realtime  - memlock   unlimited

Modified: PKGBUILD
===
--- PKGBUILD2011-10-13 18:13:21 UTC (rev 140416)
+++ PKGBUILD2011-10-13 19:41:56 UTC (rev 140417)
@@ -6,7 +6,7 @@
 pkgname=jack
 _longname=jack-audio-connection-kit
 pkgver=0.121.3
-pkgrel=1
+pkgrel=2
 pkgdesc=A low-latency audio server
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
@@ -15,13 +15,15 @@
 optdepends=('libffado: FireWire support'
 'celt: NetJACK driver')
 url=http://jackaudio.org/;
+backup=(etc/security/limits.d/99-realtime.conf)
 options=('!libtool')
 provides=($_longname=$pkgver)
 conflicts=($_longname)
 replaces=($_longname)
-changelog=$pkgname.changelog
-source=(http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz;)
-md5sums=('35f470f7422c37b33eb965033f7a42e8')
+install=$pkgname.install
+source=(http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz;
+99-realtime.conf
+40-hpet-permissions.rules)
 
 build() {
   cd $srcdir/$_longname-$pkgver
@@ -35,6 +37,14 @@
   cd $srcdir/$_longname-$pkgver
 
   make DESTDIR=$pkgdir install
+
+  # configure realtime access/scheduling
+  # see https://bugs.archlinux.org/task/26343
+  install -Dm644 $srcdir/99-realtime.conf \
+$pkgdir/etc/security/limits.d/99-realtime.conf
+
+  install -Dm644 $srcdir/40-hpet-permissions.rules \
+$srcdir/lib/udev/rules.d/40-hpet-permissions.rules
 }
 
 # vim:set ts=2 sw=2 et:

Deleted: jack.changelog
===
--- jack.changelog  2011-10-13 18:13:21 UTC (rev 140416)
+++ jack.changelog  2011-10-13 19:41:56 UTC (rev 140417)
@@ -1,21 +0,0 @@
-29 Jul 2011 (GMT+8) Ray Rashif sc...@archlinux.org
-
-   * 0.121.2-2:
-   Added celt support with celt-0.7 from community
-   Will not bring celt to extra as it's very unstable
-
-8 Aug 2010 (GMT+8) Ray Rashif sc...@archlinux.org
-
-   * 0.118.0-4 :
-   Built against libffado
-   - for FireWire support (see FS#19626)
-   Removed init scripts (no longer in tarball; unsupported).
-
-   * PKGBUILD :
-   URL updated.
-   Licenses now GPL, LGPL according to 2-or-later convention
-   - removed custom installation (both are common)
-
-   * jack.changelog :
-   Added this changelog.
-   Only important changes will be logged.

Added: jack.install
===
--- jack.install(rev 0)
+++ jack.install2011-10-13 19:41:56 UTC (rev 140417)
@@ -0,0 +1,56 @@
+_addgroup() {
+  # _addgroup $GROUPNAME $GID
+  [ ${#@} -ne 2 ]  return 1
+
+  echo -nChecking if '$1' group exists...
+  if ! getent group $1  /dev/null; then
+echo no
+echoAdd '$1' group
+echo -n  checking if GID is in use...
+   # no other package or user is supposed to use this gid
+   # delete the group and re-add it at the end without static gid
+   if getent group $2  /dev/null; then
+  echo yes
+   firstgroup=$(getent group $2 | sed 's/:.*//')
+  firstusers=$(getent group $2 | sed 's/.*://')
+  echo  delete group '$firstgroup'
+   groupdel $firstgroup
+else
+  echo no
+   fi
+
+echo  add our group with proper GID
+   groupadd -g $2 $1
+
+   if [ -n $firstgroup ]; then
+  echo  restore group '$firstgroup' with dynamic GID
+  groupadd $firstgroup
+  [ -n $firstusers ]  gpasswd -M $firstusers $firstgroup
+fi
+  else
+echo yes (all good)
+  fi
+}
+
+post_install() {
+  _addgroup realtime 112
+  echo
+  echo   * You must be part of the 'realtime' group to 

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

2011-10-13 Thread Jan Steffens
Date: Thursday, October 13, 2011 @ 16:04:31
  Author: heftig
Revision: 140418

0.12.5, for staging.

Modified:
  tracker/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-13 19:41:56 UTC (rev 140417)
+++ PKGBUILD2011-10-13 20:04:31 UTC (rev 140418)
@@ -5,7 +5,7 @@
 
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
-pkgver=0.12.4
+pkgver=0.12.5
 _tver=${pkgver%.*}
 pkgrel=1
 pkgdesc=All-in-one indexer, search tool and metadata database
@@ -19,7 +19,7 @@
 url=http://www.gnome.org;
 options=('!libtool' '!emptydirs')
 
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('14c1e2c02f96e1160cfe557e0669558524902042ae04b06e343f879419cb6d82')
+sha256sums=('5fddbda9df10fada07f335751370e46b5e2b5ef971d4da8efd47ea795d7b5c5b')
 
 build() {
   cd $srcdir/$pkgbase-$pkgver



[arch-commits] Commit in tracker/repos (8 files)

2011-10-13 Thread Jan Steffens
Date: Thursday, October 13, 2011 @ 16:07:47
  Author: heftig
Revision: 140419

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

Added:
  tracker/repos/staging-i686/PKGBUILD
(from rev 140418, tracker/trunk/PKGBUILD)
  tracker/repos/staging-i686/tracker.install
(from rev 140418, tracker/trunk/tracker.install)
  tracker/repos/staging-x86_64/PKGBUILD
(from rev 140418, tracker/trunk/PKGBUILD)
  tracker/repos/staging-x86_64/tracker.install
(from rev 140418, tracker/trunk/tracker.install)
Deleted:
  tracker/repos/staging-i686/PKGBUILD
  tracker/repos/staging-i686/tracker.install
  tracker/repos/staging-x86_64/PKGBUILD
  tracker/repos/staging-x86_64/tracker.install

+
 staging-i686/PKGBUILD  |  164 +++
 staging-i686/tracker.install   |   26 +++---
 staging-x86_64/PKGBUILD|  164 +++
 staging-x86_64/tracker.install |   26 +++---
 4 files changed, 190 insertions(+), 190 deletions(-)

Deleted: staging-i686/PKGBUILD
===
--- staging-i686/PKGBUILD   2011-10-13 20:04:31 UTC (rev 140418)
+++ staging-i686/PKGBUILD   2011-10-13 20:07:47 UTC (rev 140419)
@@ -1,82 +0,0 @@
-# $Id$
-# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
-# Contributor: Sergej Pupykin pupykin.s+a...@gmail.com
-# Contributor: Alexander Fehr pizzapunk gmail com
-
-pkgbase=tracker
-pkgname=(tracker libtracker-sparql)
-pkgver=0.12.4
-_tver=${pkgver%.*}
-pkgrel=1
-pkgdesc=All-in-one indexer, search tool and metadata database
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
- 'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
- 'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection'
- 'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser'
- 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala')
-url=http://www.gnome.org;
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('14c1e2c02f96e1160cfe557e0669558524902042ae04b06e343f879419cb6d82')
-
-build() {
-  cd $srcdir/$pkgbase-$pkgver
-
-  ./configure \
---prefix=/usr \
---sysconfdir=/etc \
---localstatedir=/var \
---libexecdir=/usr/lib/tracker \
---disable-unit-tests \
---enable-libflac \
---enable-libvorbis
-
-  make
-}
-
-package_tracker() {
-  depends=(libtracker-sparql=$pkgver-$pkgrel 'libgee' 'libgnome-keyring'
-   'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca'
-   'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
-  optdepends=('giflib: extractor for GIF data'
-  'gstreamer0.10-base: video extractor'
-  'totem-plparser: playlist support'
-  'nautilus: nautilus-extension'
-  'libvorbis: Vorbis metadata extractor'
-  'flac: FLAC metadata extractor'
-  'taglib: writeback for audio files'
-  'gnome-panel: tracker-search-bar')
-  groups=('gnome-extra')
-  install=tracker.install
-
-  cd $srcdir/$pkgbase-$pkgver
-  make DESTDIR=$pkgdir install
-
-### Split libtracker-sparql
-
-  mkdir -p $srcdir/sparql/usr/{include,lib}/tracker-$_tver
-  mkdir -p $srcdir/sparql/usr/lib/{girepository-1.0,pkgconfig}
-  mkdir -p $srcdir/sparql/usr/share/{gir-1.0,vala/vapi}
-
-  mv $pkgdir/usr/lib/libtracker-sparql-* $srcdir/sparql/usr/lib
-
-  mv $pkgdir/usr/lib/tracker-$_tver/*.so* \
-$srcdir/sparql/usr/lib/tracker-$_tver
-
-  mv $pkgdir/usr/share/vala/vapi/tracker-sparql-* \
-$srcdir/sparql/usr/share/vala/vapi
-
-  mv {$pkgdir,$srcdir/sparql}/usr/include/tracker-$_tver/libtracker-sparql
-  mv 
{$pkgdir,$srcdir/sparql}/usr/lib/girepository-1.0/Tracker-$_tver.typelib
-  mv {$pkgdir,$srcdir/sparql}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc
-  mv {$pkgdir,$srcdir/sparql}/usr/share/gir-1.0/Tracker-$_tver.gir
-}
-
-package_libtracker-sparql() {
-  pkgdesc=$pkgdesc (SPARQL library)
-  depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
-
-  mv $srcdir/sparql/* $pkgdir
-}

Copied: tracker/repos/staging-i686/PKGBUILD (from rev 140418, 
tracker/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-10-13 20:07:47 UTC (rev 140419)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
+# Contributor: Sergej Pupykin pupykin.s+a...@gmail.com
+# Contributor: Alexander Fehr pizzapunk gmail com
+
+pkgbase=tracker
+pkgname=(tracker libtracker-sparql)
+pkgver=0.12.5
+_tver=${pkgver%.*}
+pkgrel=1
+pkgdesc=All-in-one indexer, search tool and metadata database
+arch=('i686' 'x86_64')
+license=('GPL')
+makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
+  

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

2011-10-13 Thread Ray Rashif
Date: Thursday, October 13, 2011 @ 16:32:40
  Author: schiv
Revision: 140420

reorganised post-install msgs  added missing md5s

Modified:
  jack/trunk/PKGBUILD
  jack/trunk/jack.install

--+
 PKGBUILD |3 +++
 jack.install |1 +
 2 files changed, 4 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-13 20:07:47 UTC (rev 140419)
+++ PKGBUILD2011-10-13 20:32:40 UTC (rev 140420)
@@ -24,6 +24,9 @@
 source=(http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz;
 99-realtime.conf
 40-hpet-permissions.rules)
+md5sums=('35f470f7422c37b33eb965033f7a42e8'
+ 'bb312fa74956066046d6a599ac623c98'
+ '6a1017041c024cea57da9bd726b664d7')
 
 build() {
   cd $srcdir/$_longname-$pkgver

Modified: jack.install
===
--- jack.install2011-10-13 20:07:47 UTC (rev 140419)
+++ jack.install2011-10-13 20:32:40 UTC (rev 140420)
@@ -44,6 +44,7 @@
 post_upgrade() {
   _addgroup realtime 112
   echo
+  echo   * You must be part of the 'realtime' group to use RT scheduling
   echo   * Configuring RT through limits.conf has been deprecated
   echo   * See /etc/security/limits.d/99-realtime.conf instead
 }



[arch-commits] Commit in jack/repos (10 files)

2011-10-13 Thread Ray Rashif
Date: Thursday, October 13, 2011 @ 16:39:26
  Author: schiv
Revision: 140421

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

Added:
  jack/repos/testing-i686/
  jack/repos/testing-i686/40-hpet-permissions.rules
(from rev 140420, jack/trunk/40-hpet-permissions.rules)
  jack/repos/testing-i686/99-realtime.conf
(from rev 140420, jack/trunk/99-realtime.conf)
  jack/repos/testing-i686/PKGBUILD
(from rev 140420, jack/trunk/PKGBUILD)
  jack/repos/testing-i686/jack.install
(from rev 140420, jack/trunk/jack.install)
  jack/repos/testing-x86_64/
  jack/repos/testing-x86_64/40-hpet-permissions.rules
(from rev 140420, jack/trunk/40-hpet-permissions.rules)
  jack/repos/testing-x86_64/99-realtime.conf
(from rev 140420, jack/trunk/99-realtime.conf)
  jack/repos/testing-x86_64/PKGBUILD
(from rev 140420, jack/trunk/PKGBUILD)
  jack/repos/testing-x86_64/jack.install
(from rev 140420, jack/trunk/jack.install)

--+
 testing-i686/40-hpet-permissions.rules   |2 +
 testing-i686/99-realtime.conf|2 +
 testing-i686/PKGBUILD|   53 ++
 testing-i686/jack.install|   57 +
 testing-x86_64/40-hpet-permissions.rules |2 +
 testing-x86_64/99-realtime.conf  |2 +
 testing-x86_64/PKGBUILD  |   53 ++
 testing-x86_64/jack.install  |   57 +
 8 files changed, 228 insertions(+)

Copied: jack/repos/testing-i686/40-hpet-permissions.rules (from rev 140420, 
jack/trunk/40-hpet-permissions.rules)
===
--- testing-i686/40-hpet-permissions.rules  (rev 0)
+++ testing-i686/40-hpet-permissions.rules  2011-10-13 20:39:26 UTC (rev 
140421)
@@ -0,0 +1,2 @@
+KERNEL==rtc0, GROUP=realtime
+KERNEL==hpet, GROUP=realtime

Copied: jack/repos/testing-i686/99-realtime.conf (from rev 140420, 
jack/trunk/99-realtime.conf)
===
--- testing-i686/99-realtime.conf   (rev 0)
+++ testing-i686/99-realtime.conf   2011-10-13 20:39:26 UTC (rev 140421)
@@ -0,0 +1,2 @@
+@realtime  - rtprio99
+@realtime  - memlock   unlimited

Copied: jack/repos/testing-i686/PKGBUILD (from rev 140420, jack/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-10-13 20:39:26 UTC (rev 140421)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: tobias tob...@archlinux.net
+# Contributor: Robert Emil Berge rob...@rebi.no
+
+pkgname=jack
+_longname=jack-audio-connection-kit
+pkgver=0.121.3
+pkgrel=2
+pkgdesc=A low-latency audio server
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL')
+depends=('libsamplerate' 'readline')
+makedepends=('doxygen' 'libffado' 'celt')
+optdepends=('libffado: FireWire support'
+'celt: NetJACK driver')
+url=http://jackaudio.org/;
+backup=(etc/security/limits.d/99-realtime.conf)
+options=('!libtool')
+provides=($_longname=$pkgver)
+conflicts=($_longname)
+replaces=($_longname)
+install=$pkgname.install
+source=(http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz;
+99-realtime.conf
+40-hpet-permissions.rules)
+md5sums=('35f470f7422c37b33eb965033f7a42e8'
+ 'bb312fa74956066046d6a599ac623c98'
+ '6a1017041c024cea57da9bd726b664d7')
+
+build() {
+  cd $srcdir/$_longname-$pkgver
+
+  ./configure --prefix=/usr \
+  --libdir=/usr/lib
+  make
+}
+
+package() {
+  cd $srcdir/$_longname-$pkgver
+
+  make DESTDIR=$pkgdir install
+
+  # configure realtime access/scheduling
+  # see https://bugs.archlinux.org/task/26343
+  install -Dm644 $srcdir/99-realtime.conf \
+$pkgdir/etc/security/limits.d/99-realtime.conf
+
+  install -Dm644 $srcdir/40-hpet-permissions.rules \
+$srcdir/lib/udev/rules.d/40-hpet-permissions.rules
+}
+
+# vim:set ts=2 sw=2 et:

Copied: jack/repos/testing-i686/jack.install (from rev 140420, 
jack/trunk/jack.install)
===
--- testing-i686/jack.install   (rev 0)
+++ testing-i686/jack.install   2011-10-13 20:39:26 UTC (rev 140421)
@@ -0,0 +1,57 @@
+_addgroup() {
+  # _addgroup $GROUPNAME $GID
+  [ ${#@} -ne 2 ]  return 1
+
+  echo -nChecking if '$1' group exists...
+  if ! getent group $1  /dev/null; then
+echo no
+echoAdd '$1' group
+echo -n  checking if GID is in use...
+   # no other package or user is supposed to use this gid
+   # delete the group and re-add it at the end without static gid
+   if getent group $2  /dev/null; then
+  echo yes
+   firstgroup=$(getent group $2 | sed 

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

2011-10-13 Thread Rémy Oudompheng
Date: Thursday, October 13, 2011 @ 17:05:15
  Author: remy
Revision: 140422

upgpkg: pyalpm 0.5-1

Compatibility with Pacman 4.

Modified:
  pyalpm/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-13 20:39:26 UTC (rev 140421)
+++ PKGBUILD2011-10-13 21:05:15 UTC (rev 140422)
@@ -1,15 +1,15 @@
 # Maintainer : Rémy Oudompheng r...@archlinux.org
 
 pkgname=pyalpm
-pkgver=0.4.3
+pkgver=0.5
 pkgrel=1
 pkgdesc=Libalpm bindings for Python 3
 arch=('i686' 'x86_64')
 url=http://projects.archlinux.org/users/remy/pyalpm.git/;
 license=('GPL')
-depends=('python=3.2' 'pacman3.6')
+depends=('python=3.2' 'pacman=4')
 source=(ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz;)
-md5sums=('396f9820eae9a40bd33d8bb366272c82')
+md5sums=('25b078e0c56d10cf64edd026be317760')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}



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

2011-10-13 Thread Rémy Oudompheng
Date: Thursday, October 13, 2011 @ 17:05:24
  Author: remy
Revision: 140423

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

Added:
  pyalpm/repos/testing-i686/
  pyalpm/repos/testing-i686/PKGBUILD
(from rev 140422, pyalpm/trunk/PKGBUILD)
  pyalpm/repos/testing-x86_64/
  pyalpm/repos/testing-x86_64/PKGBUILD
(from rev 140422, pyalpm/trunk/PKGBUILD)

-+
 testing-i686/PKGBUILD   |   23 +++
 testing-x86_64/PKGBUILD |   23 +++
 2 files changed, 46 insertions(+)

Copied: pyalpm/repos/testing-i686/PKGBUILD (from rev 140422, 
pyalpm/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-10-13 21:05:24 UTC (rev 140423)
@@ -0,0 +1,23 @@
+# Maintainer : Rémy Oudompheng r...@archlinux.org
+
+pkgname=pyalpm
+pkgver=0.5
+pkgrel=1
+pkgdesc=Libalpm bindings for Python 3
+arch=('i686' 'x86_64')
+url=http://projects.archlinux.org/users/remy/pyalpm.git/;
+license=('GPL')
+depends=('python=3.2' 'pacman=4')
+source=(ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz;)
+md5sums=('25b078e0c56d10cf64edd026be317760')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  python setup.py build
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  python setup.py install --root=${pkgdir}
+}
+

Copied: pyalpm/repos/testing-x86_64/PKGBUILD (from rev 140422, 
pyalpm/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2011-10-13 21:05:24 UTC (rev 140423)
@@ -0,0 +1,23 @@
+# Maintainer : Rémy Oudompheng r...@archlinux.org
+
+pkgname=pyalpm
+pkgver=0.5
+pkgrel=1
+pkgdesc=Libalpm bindings for Python 3
+arch=('i686' 'x86_64')
+url=http://projects.archlinux.org/users/remy/pyalpm.git/;
+license=('GPL')
+depends=('python=3.2' 'pacman=4')
+source=(ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz;)
+md5sums=('25b078e0c56d10cf64edd026be317760')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  python setup.py build
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  python setup.py install --root=${pkgdir}
+}
+



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

2011-10-13 Thread Rémy Oudompheng
Date: Thursday, October 13, 2011 @ 18:36:31
  Author: remy
Revision: 140424

upgpkg: namcap 3.2-1
Version bump.

Modified:
  namcap/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-13 21:05:24 UTC (rev 140423)
+++ PKGBUILD2011-10-13 22:36:31 UTC (rev 140424)
@@ -3,16 +3,16 @@
 # Contributor: Hugo Doria h...@archlinux.org
 
 pkgname=namcap
-pkgver=3.1
+pkgver=3.2
 pkgrel=1
 pkgdesc=A Pacman package analyzer
 arch=('any')
 url=http://projects.archlinux.org/namcap.git/;
 license=('GPL')
-depends=('python' 'pyalpm' 'licenses')
+depends=('python' 'pyalpm=0.5' 'licenses')
 makedepends=('python-distribute')
 source=(ftp://ftp.archlinux.org/other/$pkgname/${pkgname}-${pkgver}.tar.gz)
-md5sums=('fab0d4dc34aa4d9e10cbca7daf2c2c5d')
+md5sums=('5fc3139ddc38873e5b8b3b43606061a6')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}



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

2011-10-13 Thread Rémy Oudompheng
Date: Thursday, October 13, 2011 @ 18:36:36
  Author: remy
Revision: 140425

archrelease: copy trunk to testing-any

Added:
  namcap/repos/testing-any/
  namcap/repos/testing-any/PKGBUILD
(from rev 140424, namcap/trunk/PKGBUILD)

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

Copied: namcap/repos/testing-any/PKGBUILD (from rev 140424, 
namcap/trunk/PKGBUILD)
===
--- testing-any/PKGBUILD(rev 0)
+++ testing-any/PKGBUILD2011-10-13 22:36:36 UTC (rev 140425)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer : Rémy Oudompheng r...@archlinux.org
+# Contributor: Hugo Doria h...@archlinux.org
+
+pkgname=namcap
+pkgver=3.2
+pkgrel=1
+pkgdesc=A Pacman package analyzer
+arch=('any')
+url=http://projects.archlinux.org/namcap.git/;
+license=('GPL')
+depends=('python' 'pyalpm=0.5' 'licenses')
+makedepends=('python-distribute')
+source=(ftp://ftp.archlinux.org/other/$pkgname/${pkgname}-${pkgver}.tar.gz)
+md5sums=('5fc3139ddc38873e5b8b3b43606061a6')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  python setup.py build
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  env PARSE_PKGBUILD_PATH=${srcdir}/${pkgname}-${pkgver} \
+  PATH=${srcdir}/${pkgname}-${pkgver}:$PATH \
+  python setup.py test || true
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  python setup.py install --root=${pkgdir}
+}



[arch-commits] Commit in hplip/trunk (PKGBUILD hplip-cups-1.5.0-compatibility.patch)

2011-10-13 Thread Eric Bélanger
Date: Friday, October 14, 2011 @ 00:52:42
  Author: eric
Revision: 140426

upgpkg: hplip 3.11.10-1

Upstream update, Clean up depends and makedepends, Add python2 fix, Clean up 
PKGBUILD, Remove old patch

Modified:
  hplip/trunk/PKGBUILD
Deleted:
  hplip/trunk/hplip-cups-1.5.0-compatibility.patch

--+
 PKGBUILD |   43 -
 hplip-cups-1.5.0-compatibility.patch |   10 ---
 2 files changed, 16 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-13 22:36:36 UTC (rev 140425)
+++ PKGBUILD2011-10-14 04:52:42 UTC (rev 140426)
@@ -3,15 +3,15 @@
 # Contributor: Morgan LEFIEUX com...@archlinuxfr.org
 
 pkgname=hplip
-pkgver=3.11.7
-pkgrel=2
+pkgver=3.11.10
+pkgrel=1
 pkgdesc=Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet
 arch=('i686' 'x86_64')
 url=http://hplipopensource.com;
 license=('GPL')
-makedepends=('python2-qt' 'python2-gobject2' 'pkg-config' 'sane' 'rpcbind' 
'cups')
 depends=('python2' 'ghostscript=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-   'libcups=1.3.10-3' 'net-snmp=5.7.1' 'libusb-compat')
+'net-snmp=5.7.1')
+makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
 optdepends=('cups: for printing support'
 'dbus-python: for dbus support'
 'sane: for scanner support'
@@ -24,17 +24,20 @@
 replaces=('hpijs')
 options=('!libtool')
 install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
-hplip-cups-1.5.0-compatibility.patch)
-md5sums=('5cb89a00b0c680d8bf9bf4b4f1f863b1'
- 'f4422ee0dc842e1a53b75c24f468d65c'
- 'a767000ce920e9f7f6a5b0a8e4392ef9')
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('6143f30f3b6905ef22105176a3b80db0'
+ '396bbd8c5cc92aa8295e5bcb508692f3')
 
 build() {
  cd $srcdir/$pkgname-$pkgver
- patch -p1 -i $srcdir/hplip-cups-1.5.0-compatibility.patch
  export PYTHON=python2
  find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
+ # fix sysfs rules
+ sed -i -e s|SYSFS|ATTR|g \
+-e s|sysfs|attr|g \
+   data/rules/56-hpmud_support.rules
+
  ./configure --prefix=/usr \
  --enable-qt4 \
  --enable-foomatic-rip-hplip-install \
@@ -51,21 +54,7 @@
 
 package() {
  cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir/ install
-
- rm -rf $pkgdir/etc/sane.d
- # remove autostart of hp-daemon
- rm -r $pkgdir/etc/xdg
- # move udev rules to /lib/udev/rules.d
- mkdir -p $pkgdir/lib/udev/rules.d
- mv $pkgdir/etc/udev/rules.d/* $pkgdir/lib/udev/rules.d/
- rm -r $pkgdir/etc/udev
- # remove lp user, it's not used on archlinux
- sed -i 's|OWNER=lp, ||g' $pkgdir/lib/udev/rules.d/40-hplip.rules
- # fix sysfs rules
- sed -i -e s|SYSFS|ATTR|g \
--e s|sysfs|attr|g \
--e 's|bin/sh|/bin/sh|g' \
-   $pkgdir/lib/udev/rules.d/56-hpmud_support.rules
+ make rulesdir=/lib/udev/rules.d  DESTDIR=$pkgdir/ install
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf $pkgdir/etc/{sane.d,xdg}
 }
-

Deleted: hplip-cups-1.5.0-compatibility.patch
===
--- hplip-cups-1.5.0-compatibility.patch2011-10-13 22:36:36 UTC (rev 
140425)
+++ hplip-cups-1.5.0-compatibility.patch2011-10-14 04:52:42 UTC (rev 
140426)
@@ -1,10 +0,0 @@
 hplip-3.11.7~/prnt/hpps/hppsfilter.c   2011-07-24 18:58:05.0 
+
-+++ hplip-3.11.7/prnt/hpps/hppsfilter.c2011-08-09 20:51:54.150214165 
+
-@@ -38,6 +38,7 @@
- #include unistd.h
- #include fcntl.h
- #include cups/cups.h
-+#include cups/ppd.h
- #include sys/types.h
- #include sys/stat.h
- 



[arch-commits] Commit in hplip/repos (6 files)

2011-10-13 Thread Eric Bélanger
Date: Friday, October 14, 2011 @ 00:53:07
  Author: eric
Revision: 140427

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

Added:
  hplip/repos/testing-i686/
  hplip/repos/testing-i686/PKGBUILD
(from rev 140426, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/hplip.install
(from rev 140426, hplip/trunk/hplip.install)
  hplip/repos/testing-x86_64/
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 140426, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/hplip.install
(from rev 140426, hplip/trunk/hplip.install)

--+
 testing-i686/PKGBUILD|   60 +
 testing-i686/hplip.install   |   10 ++
 testing-x86_64/PKGBUILD  |   60 +
 testing-x86_64/hplip.install |   10 ++
 4 files changed, 140 insertions(+)

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 140426, 
hplip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-10-14 04:53:07 UTC (rev 140427)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer : Rémy Oudompheng r...@archlinux.org
+# Contributor: Morgan LEFIEUX com...@archlinuxfr.org
+
+pkgname=hplip
+pkgver=3.11.10
+pkgrel=1
+pkgdesc=Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet
+arch=('i686' 'x86_64')
+url=http://hplipopensource.com;
+license=('GPL')
+depends=('python2' 'ghostscript=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+'net-snmp=5.7.1')
+makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
+optdepends=('cups: for printing support'
+'dbus-python: for dbus support'
+'sane: for scanner support'
+'python-imaging: for commandline scanning support'
+'python-notify: for Desktop notification support'
+'rpcbind: for network support'
+'python2-qt: for running hp-toolbox'
+'python2-gobject2: for running hp-toolbox'
+'hplip-plugin: binary blobs for specific devices')
+replaces=('hpijs')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('6143f30f3b6905ef22105176a3b80db0'
+ '396bbd8c5cc92aa8295e5bcb508692f3')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ export PYTHON=python2
+ find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
+ # fix sysfs rules
+ sed -i -e s|SYSFS|ATTR|g \
+-e s|sysfs|attr|g \
+   data/rules/56-hpmud_support.rules
+
+ ./configure --prefix=/usr \
+ --enable-qt4 \
+ --enable-foomatic-rip-hplip-install \
+ --enable-foomatic-ppd-install \
+ --enable-hpcups-install \
+ --enable-cups-drv-install \
+ --enable-hpijs-install \
+ --enable-foomatic-drv-install \
+ --enable-pp-build \
+ --enable-udev-acl-rules
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make rulesdir=/lib/udev/rules.d  DESTDIR=$pkgdir/ install
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf $pkgdir/etc/{sane.d,xdg}
+}

Copied: hplip/repos/testing-i686/hplip.install (from rev 140426, 
hplip/trunk/hplip.install)
===
--- testing-i686/hplip.install  (rev 0)
+++ testing-i686/hplip.install  2011-10-14 04:53:07 UTC (rev 140427)
@@ -0,0 +1,10 @@
+post_install() {
+  cat  EOF
+
+NOTE
+
+# If you want to use this driver with sane:
+#  echo hpaio  /etc/sane.d/dll.conf
+
+EOF
+}

Copied: hplip/repos/testing-x86_64/PKGBUILD (from rev 140426, 
hplip/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2011-10-14 04:53:07 UTC (rev 140427)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer : Rémy Oudompheng r...@archlinux.org
+# Contributor: Morgan LEFIEUX com...@archlinuxfr.org
+
+pkgname=hplip
+pkgver=3.11.10
+pkgrel=1
+pkgdesc=Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet
+arch=('i686' 'x86_64')
+url=http://hplipopensource.com;
+license=('GPL')
+depends=('python2' 'ghostscript=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+'net-snmp=5.7.1')
+makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
+optdepends=('cups: for printing support'
+'dbus-python: for dbus support'
+'sane: for scanner support'
+'python-imaging: for commandline scanning support'
+'python-notify: for Desktop notification support'
+'rpcbind: for network support'
+'python2-qt: for running hp-toolbox'
+'python2-gobject2: for running hp-toolbox'
+'hplip-plugin: binary 

[arch-commits] Commit in hplip/repos (8 files)

2011-10-13 Thread Eric Bélanger
Date: Friday, October 14, 2011 @ 01:01:01
  Author: eric
Revision: 140428

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

Added:
  hplip/repos/testing-i686/PKGBUILD
(from rev 140427, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/hplip.install
(from rev 140427, hplip/trunk/hplip.install)
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 140427, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/hplip.install
(from rev 140427, hplip/trunk/hplip.install)
Deleted:
  hplip/repos/testing-i686/PKGBUILD
  hplip/repos/testing-i686/hplip.install
  hplip/repos/testing-x86_64/PKGBUILD
  hplip/repos/testing-x86_64/hplip.install

--+
 testing-i686/PKGBUILD|  120 -
 testing-i686/hplip.install   |   20 +++---
 testing-x86_64/PKGBUILD  |  120 -
 testing-x86_64/hplip.install |   20 +++---
 4 files changed, 140 insertions(+), 140 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2011-10-14 04:53:07 UTC (rev 140427)
+++ testing-i686/PKGBUILD   2011-10-14 05:01:01 UTC (rev 140428)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer : Rémy Oudompheng r...@archlinux.org
-# Contributor: Morgan LEFIEUX com...@archlinuxfr.org
-
-pkgname=hplip
-pkgver=3.11.10
-pkgrel=1
-pkgdesc=Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet
-arch=('i686' 'x86_64')
-url=http://hplipopensource.com;
-license=('GPL')
-depends=('python2' 'ghostscript=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-'net-snmp=5.7.1')
-makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
-optdepends=('cups: for printing support'
-'dbus-python: for dbus support'
-'sane: for scanner support'
-'python-imaging: for commandline scanning support'
-'python-notify: for Desktop notification support'
-'rpcbind: for network support'
-'python2-qt: for running hp-toolbox'
-'python2-gobject2: for running hp-toolbox'
-'hplip-plugin: binary blobs for specific devices')
-replaces=('hpijs')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('6143f30f3b6905ef22105176a3b80db0'
- '396bbd8c5cc92aa8295e5bcb508692f3')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- export PYTHON=python2
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
- # fix sysfs rules
- sed -i -e s|SYSFS|ATTR|g \
--e s|sysfs|attr|g \
-   data/rules/56-hpmud_support.rules
-
- ./configure --prefix=/usr \
- --enable-qt4 \
- --enable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build \
- --enable-udev-acl-rules
-
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make rulesdir=/lib/udev/rules.d  DESTDIR=$pkgdir/ install
- # remove config provided by sane and autostart of hp-daemon
- rm -rf $pkgdir/etc/{sane.d,xdg}
-}

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 140427, 
hplip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-10-14 05:01:01 UTC (rev 140428)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer : Rémy Oudompheng r...@archlinux.org
+# Contributor: Morgan LEFIEUX com...@archlinuxfr.org
+
+pkgname=hplip
+pkgver=3.11.10
+pkgrel=1
+pkgdesc=Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet
+arch=('i686' 'x86_64')
+url=http://hplipopensource.com;
+license=('GPL')
+depends=('python2' 'ghostscript=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+'net-snmp=5.7.1')
+makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
+optdepends=('cups: for printing support'
+'dbus-python: for dbus support'
+'sane: for scanner support'
+'python-imaging: for commandline scanning support'
+'python-notify: for Desktop notification support'
+'rpcbind: for network support'
+'python2-qt: for running hp-toolbox'
+'python2-gobject2: for running hp-toolbox'
+'hplip-plugin: binary blobs for specific devices')
+replaces=('hpijs')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('6143f30f3b6905ef22105176a3b80db0'
+ '396bbd8c5cc92aa8295e5bcb508692f3')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ export PYTHON=python2
+ find . -type f -exec sed -i