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

2011-08-25 Thread Eric Bélanger
Date: Thursday, August 25, 2011 @ 02:35:29
  Author: eric
Revision: 136231

upgpkg: libffi 3.0.10-1

Upstream update, Remove texinfo depends, Remove obsolete force option, 
Clean up PKGBUILD

Modified:
  libffi/trunk/PKGBUILD
  libffi/trunk/libffi.install

+
 PKGBUILD   |   25 ++---
 libffi.install |4 +++-
 2 files changed, 17 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 03:21:05 UTC (rev 136230)
+++ PKGBUILD2011-08-25 06:35:29 UTC (rev 136231)
@@ -2,23 +2,26 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=libffi
-pkgver=3.0.9
+pkgver=3.0.10
 pkgrel=1
-pkgdesc=A portable, high level programming interface to various calling 
conventions.
+pkgdesc=A portable, high level programming interface to various calling 
conventions
 arch=('i686' 'x86_64')
+url=http://sourceware.org/libffi;
 license=('MIT')
-url=http://sourceware.org/libffi;
-depends=('glibc' 'texinfo')
-options=('!libtool' 'force')
+depends=('glibc')
+options=('!libtool')
 install=libffi.install
 source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
-md5sums=('1f300a7a7f975d4046f51c3022fa5ff1')
+md5sums=('79390673f5d07a8fb342bc09b5055b6f')
 
 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 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
+  ./configure --prefix=/usr
+  make
 }
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Modified: libffi.install
===
--- libffi.install  2011-08-25 03:21:05 UTC (rev 136230)
+++ libffi.install  2011-08-25 06:35:29 UTC (rev 136231)
@@ -1,7 +1,8 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(libffi.info.gz)
 
 post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
 install-info $infodir/$file $infodir/dir 2 /dev/null
   done
@@ -12,6 +13,7 @@
 }
 
 pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
 install-info --delete $infodir/$file $infodir/dir 2 /dev/null
   done



[arch-commits] Commit in libffi/repos/extra-i686 (4 files)

2011-08-25 Thread Eric Bélanger
Date: Thursday, August 25, 2011 @ 02:35:58
  Author: eric
Revision: 136232

archrelease: copy trunk to extra-i686

Added:
  libffi/repos/extra-i686/PKGBUILD
(from rev 136231, libffi/trunk/PKGBUILD)
  libffi/repos/extra-i686/libffi.install
(from rev 136231, libffi/trunk/libffi.install)
Deleted:
  libffi/repos/extra-i686/PKGBUILD
  libffi/repos/extra-i686/libffi.install

+
 PKGBUILD   |   51 +++
 libffi.install |   38 --
 2 files changed, 47 insertions(+), 42 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-25 06:35:29 UTC (rev 136231)
+++ PKGBUILD2011-08-25 06:35:58 UTC (rev 136232)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=libffi
-pkgver=3.0.9
-pkgrel=1
-pkgdesc=A portable, high level programming interface to various calling 
conventions.
-arch=('i686' 'x86_64')
-license=('MIT')
-url=http://sourceware.org/libffi;
-depends=('glibc' 'texinfo')
-options=('!libtool' 'force')
-install=libffi.install
-source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
-md5sums=('1f300a7a7f975d4046f51c3022fa5ff1')
-
-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 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-}

Copied: libffi/repos/extra-i686/PKGBUILD (from rev 136231, 
libffi/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-25 06:35:58 UTC (rev 136232)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libffi
+pkgver=3.0.10
+pkgrel=1
+pkgdesc=A portable, high level programming interface to various calling 
conventions
+arch=('i686' 'x86_64')
+url=http://sourceware.org/libffi;
+license=('MIT')
+depends=('glibc')
+options=('!libtool')
+install=libffi.install
+source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
+md5sums=('79390673f5d07a8fb342bc09b5055b6f')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Deleted: libffi.install
===
--- libffi.install  2011-08-25 06:35:29 UTC (rev 136231)
+++ libffi.install  2011-08-25 06:35:58 UTC (rev 136232)
@@ -1,18 +0,0 @@
-infodir=/usr/share/info
-filelist=(libffi.info.gz)
-
-post_install() {
-  for file in ${filelist[@]}; do
-install-info $infodir/$file $infodir/dir 2 /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-install-info --delete $infodir/$file $infodir/dir 2 /dev/null
-  done
-}

Copied: libffi/repos/extra-i686/libffi.install (from rev 136231, 
libffi/trunk/libffi.install)
===
--- libffi.install  (rev 0)
+++ libffi.install  2011-08-25 06:35:58 UTC (rev 136232)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(libffi.info.gz)
+
+post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in ${filelist[@]}; do
+install-info $infodir/$file $infodir/dir 2 /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in ${filelist[@]}; do
+install-info --delete $infodir/$file $infodir/dir 2 /dev/null
+  done
+}



[arch-commits] Commit in libffi/repos/extra-x86_64 (4 files)

2011-08-25 Thread Eric Bélanger
Date: Thursday, August 25, 2011 @ 02:36:16
  Author: eric
Revision: 136233

archrelease: copy trunk to extra-x86_64

Added:
  libffi/repos/extra-x86_64/PKGBUILD
(from rev 136232, libffi/trunk/PKGBUILD)
  libffi/repos/extra-x86_64/libffi.install
(from rev 136232, libffi/trunk/libffi.install)
Deleted:
  libffi/repos/extra-x86_64/PKGBUILD
  libffi/repos/extra-x86_64/libffi.install

+
 PKGBUILD   |   51 +++
 libffi.install |   38 --
 2 files changed, 47 insertions(+), 42 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-25 06:35:58 UTC (rev 136232)
+++ PKGBUILD2011-08-25 06:36:16 UTC (rev 136233)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=libffi
-pkgver=3.0.9
-pkgrel=1
-pkgdesc=A portable, high level programming interface to various calling 
conventions.
-arch=('i686' 'x86_64')
-license=('MIT')
-url=http://sourceware.org/libffi;
-depends=('glibc' 'texinfo')
-options=('!libtool' 'force')
-install=libffi.install
-source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
-md5sums=('1f300a7a7f975d4046f51c3022fa5ff1')
-
-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 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-}

Copied: libffi/repos/extra-x86_64/PKGBUILD (from rev 136232, 
libffi/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-25 06:36:16 UTC (rev 136233)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libffi
+pkgver=3.0.10
+pkgrel=1
+pkgdesc=A portable, high level programming interface to various calling 
conventions
+arch=('i686' 'x86_64')
+url=http://sourceware.org/libffi;
+license=('MIT')
+depends=('glibc')
+options=('!libtool')
+install=libffi.install
+source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
+md5sums=('79390673f5d07a8fb342bc09b5055b6f')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Deleted: libffi.install
===
--- libffi.install  2011-08-25 06:35:58 UTC (rev 136232)
+++ libffi.install  2011-08-25 06:36:16 UTC (rev 136233)
@@ -1,18 +0,0 @@
-infodir=/usr/share/info
-filelist=(libffi.info.gz)
-
-post_install() {
-  for file in ${filelist[@]}; do
-install-info $infodir/$file $infodir/dir 2 /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-install-info --delete $infodir/$file $infodir/dir 2 /dev/null
-  done
-}

Copied: libffi/repos/extra-x86_64/libffi.install (from rev 136232, 
libffi/trunk/libffi.install)
===
--- libffi.install  (rev 0)
+++ libffi.install  2011-08-25 06:36:16 UTC (rev 136233)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(libffi.info.gz)
+
+post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in ${filelist[@]}; do
+install-info $infodir/$file $infodir/dir 2 /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in ${filelist[@]}; do
+install-info --delete $infodir/$file $infodir/dir 2 /dev/null
+  done
+}



[arch-commits] Commit in thunar/trunk (PKGBUILD fix-samba.patch)

2011-08-25 Thread Tobias Powalowski
Date: Thursday, August 25, 2011 @ 02:44:39
  Author: tpowa
Revision: 136234

upgpkg: thunar 1.2.2-3

fix samba regression in network shares #25016

Added:
  thunar/trunk/fix-samba.patch
Modified:
  thunar/trunk/PKGBUILD

-+
 PKGBUILD|   13 +++--
 fix-samba.patch |   14 ++
 2 files changed, 21 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 06:36:16 UTC (rev 136233)
+++ PKGBUILD2011-08-25 06:44:39 UTC (rev 136234)
@@ -4,7 +4,7 @@
 
 pkgname=thunar
 pkgver=1.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc=modern file manager for Xfce
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
@@ -24,11 +24,13 @@
 backup=('etc/polkit-1/localauthority/50-local.d/org.freedesktop.udisks.pkla')
 
source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-${pkgver}.tar.bz2
org.freedesktop.udisks.pkla
-fix-gvfs.patch)
+fix-gvfs.patch
+   fix-samba.patch)
 
 build() {
   cd ${srcdir}/Thunar-${pkgver}
   patch -Np1 -i ../fix-gvfs.patch
+  patch -Np1 -i ../fix-samba.patch
   ./configure --prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib \
@@ -57,9 +59,8 @@
   install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d
   install -m644 ${srcdir}/org.freedesktop.udisks.pkla 
${pkgdir}/etc/polkit-1/localauthority/50-local.d/
 }
+
 md5sums=('a86df0212db71e61f459bda6bc7b7fb6'
  'a7ddb5eec02d9a8e91a2997862e73cd8'
- '376c81af1ce5cf8b872d62a878163091')
-md5sums=('a86df0212db71e61f459bda6bc7b7fb6'
- 'a7ddb5eec02d9a8e91a2997862e73cd8'
- '167c79462cddc5aaa1fcdc814041350b')
+ '167c79462cddc5aaa1fcdc814041350b'
+ 'c8063873958d89402046f29b78c1d8d4')

Added: fix-samba.patch
===
--- fix-samba.patch (rev 0)
+++ fix-samba.patch 2011-08-25 06:44:39 UTC (rev 136234)
@@ -0,0 +1,14 @@
+--- thunar-file-ORIGINAL.c 2011-05-27 00:11:27.0 +0200
 thunar-1.2.2/thunar/thunar-file.c  2011-08-22 08:00:24.095066077 +0200
+@@ -754,7 +754,10 @@ thunar_file_load (ThunarFile   *file,
+   target_uri = 
+ g_file_info_get_attribute_string (file-info,
+   
G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
+-  file-is_mounted = (target_uri != NULL);
++  file-is_mounted = (target_uri != NULL)
++  ? !g_file_info_get_attribute_boolean (file-info,
++  
G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT)
++: FALSE;
+ }
+ }
+   else



[arch-commits] Commit in thunar/repos/extra-i686 (9 files)

2011-08-25 Thread Tobias Powalowski
Date: Thursday, August 25, 2011 @ 02:47:12
  Author: tpowa
Revision: 136235

archrelease: copy trunk to extra-i686

Added:
  thunar/repos/extra-i686/PKGBUILD
(from rev 136234, thunar/trunk/PKGBUILD)
  thunar/repos/extra-i686/fix-gvfs.patch
(from rev 136234, thunar/trunk/fix-gvfs.patch)
  thunar/repos/extra-i686/fix-samba.patch
(from rev 136234, thunar/trunk/fix-samba.patch)
  thunar/repos/extra-i686/org.freedesktop.udisks.pkla
(from rev 136234, thunar/trunk/org.freedesktop.udisks.pkla)
  thunar/repos/extra-i686/thunar.install
(from rev 136234, thunar/trunk/thunar.install)
Deleted:
  thunar/repos/extra-i686/PKGBUILD
  thunar/repos/extra-i686/fix-gvfs.patch
  thunar/repos/extra-i686/org.freedesktop.udisks.pkla
  thunar/repos/extra-i686/thunar.install

-+
 PKGBUILD|  131 +-
 fix-gvfs.patch  |  296 +-
 fix-samba.patch |   14 +
 org.freedesktop.udisks.pkla |   14 -
 thunar.install  |   28 +--
 5 files changed, 249 insertions(+), 234 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-25 06:44:39 UTC (rev 136234)
+++ PKGBUILD2011-08-25 06:47:12 UTC (rev 136235)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: andyrtr andyrtr funnychar archlinux.org
-# Contributor: Andrew Simmons andrew.simm...@gmail.com
-
-pkgname=thunar
-pkgver=1.2.2
-pkgrel=2
-pkgdesc=modern file manager for Xfce
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url=http://thunar.xfce.org;
-groups=('xfce4')
-depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 
'libnotify=0.7.1' 'udev'
- 'gtk2' 'exo=0.6.0' 'libxfce4util=4.8.1' 'libxfce4ui' 'libpng')
-makedepends=('intltool' 'gtk-doc' 'xfce4-panel=4.8.0')
-optdepends=('gvfs: for trash support, mounting with udisk and remote 
filesystems'
-'xfce4-panel: for trash applet'
-'tumbler: for thumbnail previews'
-'thunar-volman: manages removable devices'
-'thunar-archive-plugin: create and deflate archives'
-'thunar-media-tags-plugin: view/edit id3/ogg tags')
-options=('!libtool')
-install=${pkgname}.install
-backup=('etc/polkit-1/localauthority/50-local.d/org.freedesktop.udisks.pkla')
-source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-${pkgver}.tar.bz2
-   org.freedesktop.udisks.pkla
-fix-gvfs.patch)
-
-build() {
-  cd ${srcdir}/Thunar-${pkgver}
-  patch -Np1 -i ../fix-gvfs.patch
-  ./configure --prefix=/usr \
-   --sysconfdir=/etc \
-   --libexecdir=/usr/lib \
-   --localstatedir=/var \
-   --disable-static \
-   --enable-gio-unix \
-   --enable-dbus \
-   --enable-startup-notification \
-   --enable-gudev \
-   --enable-notifications \
-   --enable-exif \
-   --enable-pcre \
-   --enable-gtk-doc \
-   --disable-debug
-  make
-}
-
-package() {
-  cd ${srcdir}/Thunar-${pkgver}
-  make DESTDIR=${pkgdir} install
-  sed -i 's:x-directory/gnome-default-handler;::' \
-${pkgdir}/usr/share/applications/Thunar-folder-handler.desktop
-
-  # install udisks permission file
-  install -dm700 ${pkgdir}/etc/polkit-1/localauthority
-  install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d
-  install -m644 ${srcdir}/org.freedesktop.udisks.pkla 
${pkgdir}/etc/polkit-1/localauthority/50-local.d/
-}
-md5sums=('a86df0212db71e61f459bda6bc7b7fb6'
- 'a7ddb5eec02d9a8e91a2997862e73cd8'
- '376c81af1ce5cf8b872d62a878163091')
-md5sums=('a86df0212db71e61f459bda6bc7b7fb6'
- 'a7ddb5eec02d9a8e91a2997862e73cd8'
- '167c79462cddc5aaa1fcdc814041350b')

Copied: thunar/repos/extra-i686/PKGBUILD (from rev 136234, 
thunar/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-25 06:47:12 UTC (rev 136235)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: andyrtr andyrtr funnychar archlinux.org
+# Contributor: Andrew Simmons andrew.simm...@gmail.com
+
+pkgname=thunar
+pkgver=1.2.2
+pkgrel=3
+pkgdesc=modern file manager for Xfce
+arch=('i686' 'x86_64')
+license=('GPL2' 'LGPL2.1')
+url=http://thunar.xfce.org;
+groups=('xfce4')
+depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 
'libnotify=0.7.1' 'udev'
+ 'gtk2' 'exo=0.6.0' 'libxfce4util=4.8.1' 'libxfce4ui' 'libpng')
+makedepends=('intltool' 'gtk-doc' 'xfce4-panel=4.8.0')
+optdepends=('gvfs: for trash support, mounting with udisk and remote 
filesystems'
+'xfce4-panel: for trash applet'
+'tumbler: for thumbnail previews'
+'thunar-volman: manages removable devices'
+'thunar-archive-plugin: create and deflate archives'
+'thunar-media-tags-plugin: view/edit id3/ogg tags')
+options=('!libtool')
+install=${pkgname}.install
+backup=('etc/polkit-1/localauthority/50-local.d/org.freedesktop.udisks.pkla')

[arch-commits] Commit in thunar/repos/extra-x86_64 (9 files)

2011-08-25 Thread Tobias Powalowski
Date: Thursday, August 25, 2011 @ 02:48:07
  Author: tpowa
Revision: 136236

archrelease: copy trunk to extra-x86_64

Added:
  thunar/repos/extra-x86_64/PKGBUILD
(from rev 136235, thunar/trunk/PKGBUILD)
  thunar/repos/extra-x86_64/fix-gvfs.patch
(from rev 136235, thunar/trunk/fix-gvfs.patch)
  thunar/repos/extra-x86_64/fix-samba.patch
(from rev 136235, thunar/trunk/fix-samba.patch)
  thunar/repos/extra-x86_64/org.freedesktop.udisks.pkla
(from rev 136235, thunar/trunk/org.freedesktop.udisks.pkla)
  thunar/repos/extra-x86_64/thunar.install
(from rev 136235, thunar/trunk/thunar.install)
Deleted:
  thunar/repos/extra-x86_64/PKGBUILD
  thunar/repos/extra-x86_64/fix-gvfs.patch
  thunar/repos/extra-x86_64/org.freedesktop.udisks.pkla
  thunar/repos/extra-x86_64/thunar.install

-+
 PKGBUILD|  131 +-
 fix-gvfs.patch  |  296 +-
 fix-samba.patch |   14 +
 org.freedesktop.udisks.pkla |   14 -
 thunar.install  |   28 +--
 5 files changed, 249 insertions(+), 234 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-25 06:47:12 UTC (rev 136235)
+++ PKGBUILD2011-08-25 06:48:07 UTC (rev 136236)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: andyrtr andyrtr funnychar archlinux.org
-# Contributor: Andrew Simmons andrew.simm...@gmail.com
-
-pkgname=thunar
-pkgver=1.2.2
-pkgrel=2
-pkgdesc=modern file manager for Xfce
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url=http://thunar.xfce.org;
-groups=('xfce4')
-depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 
'libnotify=0.7.1' 'udev'
- 'gtk2' 'exo=0.6.0' 'libxfce4util=4.8.1' 'libxfce4ui' 'libpng')
-makedepends=('intltool' 'gtk-doc' 'xfce4-panel=4.8.0')
-optdepends=('gvfs: for trash support, mounting with udisk and remote 
filesystems'
-'xfce4-panel: for trash applet'
-'tumbler: for thumbnail previews'
-'thunar-volman: manages removable devices'
-'thunar-archive-plugin: create and deflate archives'
-'thunar-media-tags-plugin: view/edit id3/ogg tags')
-options=('!libtool')
-install=${pkgname}.install
-backup=('etc/polkit-1/localauthority/50-local.d/org.freedesktop.udisks.pkla')
-source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-${pkgver}.tar.bz2
-   org.freedesktop.udisks.pkla
-fix-gvfs.patch)
-
-build() {
-  cd ${srcdir}/Thunar-${pkgver}
-  patch -Np1 -i ../fix-gvfs.patch
-  ./configure --prefix=/usr \
-   --sysconfdir=/etc \
-   --libexecdir=/usr/lib \
-   --localstatedir=/var \
-   --disable-static \
-   --enable-gio-unix \
-   --enable-dbus \
-   --enable-startup-notification \
-   --enable-gudev \
-   --enable-notifications \
-   --enable-exif \
-   --enable-pcre \
-   --enable-gtk-doc \
-   --disable-debug
-  make
-}
-
-package() {
-  cd ${srcdir}/Thunar-${pkgver}
-  make DESTDIR=${pkgdir} install
-  sed -i 's:x-directory/gnome-default-handler;::' \
-${pkgdir}/usr/share/applications/Thunar-folder-handler.desktop
-
-  # install udisks permission file
-  install -dm700 ${pkgdir}/etc/polkit-1/localauthority
-  install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d
-  install -m644 ${srcdir}/org.freedesktop.udisks.pkla 
${pkgdir}/etc/polkit-1/localauthority/50-local.d/
-}
-md5sums=('a86df0212db71e61f459bda6bc7b7fb6'
- 'a7ddb5eec02d9a8e91a2997862e73cd8'
- '376c81af1ce5cf8b872d62a878163091')
-md5sums=('a86df0212db71e61f459bda6bc7b7fb6'
- 'a7ddb5eec02d9a8e91a2997862e73cd8'
- '167c79462cddc5aaa1fcdc814041350b')

Copied: thunar/repos/extra-x86_64/PKGBUILD (from rev 136235, 
thunar/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-25 06:48:07 UTC (rev 136236)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: andyrtr andyrtr funnychar archlinux.org
+# Contributor: Andrew Simmons andrew.simm...@gmail.com
+
+pkgname=thunar
+pkgver=1.2.2
+pkgrel=3
+pkgdesc=modern file manager for Xfce
+arch=('i686' 'x86_64')
+license=('GPL2' 'LGPL2.1')
+url=http://thunar.xfce.org;
+groups=('xfce4')
+depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 
'libnotify=0.7.1' 'udev'
+ 'gtk2' 'exo=0.6.0' 'libxfce4util=4.8.1' 'libxfce4ui' 'libpng')
+makedepends=('intltool' 'gtk-doc' 'xfce4-panel=4.8.0')
+optdepends=('gvfs: for trash support, mounting with udisk and remote 
filesystems'
+'xfce4-panel: for trash applet'
+'tumbler: for thumbnail previews'
+'thunar-volman: manages removable devices'
+'thunar-archive-plugin: create and deflate archives'
+'thunar-media-tags-plugin: view/edit id3/ogg tags')
+options=('!libtool')
+install=${pkgname}.install

[arch-commits] Commit in xf86-video-vesa/trunk (PKGBUILD git-fixes.patch)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 03:26:28
  Author: jgc
Revision: 136237

upgpkg: xf86-video-vesa 2.3.0-6

Rebuild for xserver 1.11RC, add latest fixes from git

Added:
  xf86-video-vesa/trunk/git-fixes.patch
Modified:
  xf86-video-vesa/trunk/PKGBUILD

-+
 PKGBUILD|   14 +
 git-fixes.patch |  444 ++
 2 files changed, 453 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 06:48:07 UTC (rev 136236)
+++ PKGBUILD2011-08-25 07:26:28 UTC (rev 136237)
@@ -3,21 +3,25 @@
 
 pkgname=xf86-video-vesa
 pkgver=2.3.0
-pkgrel=5
+pkgrel=6
 pkgdesc=X.org vesa video driver
 arch=(i686 x86_64)
 license=('custom')
 url=http://xorg.freedesktop.org/;
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server-devel')
-conflicts=('xorg-server1.10.0')
+makedepends=('pkgconfig' 'xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('4689b7c295d7a8d7326302dafecb812739617134')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('4689b7c295d7a8d7326302dafecb812739617134'
+  '1e54ae50daa796ab0c29c8088f25e522dc6faa4a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+  autoreconf -fi
   ./configure --prefix=/usr
   make
   make DESTDIR=${pkgdir} install

Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2011-08-25 07:26:28 UTC (rev 136237)
@@ -0,0 +1,444 @@
+diff --git a/COPYING b/COPYING
+index 22b4b13..f101fb8 100644
+--- a/COPYING
 b/COPYING
+@@ -1,4 +1,5 @@
+ Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
++Copyright 2008 Red Hat, Inc.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the Software),
+diff --git a/configure.ac b/configure.ac
+index ff4713d..2e4f542 100644
+--- a/configure.ac
 b/configure.ac
+@@ -20,45 +20,44 @@
+ #
+ # Process this file with autoconf to produce a configure script
+ 
+-AC_PREREQ(2.57)
++# Initialize Autoconf
++AC_PREREQ([2.60])
+ AC_INIT([xf86-video-vesa],
+-2.3.0,
++[2.3.0],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+-xf86-video-vesa)
+-
++[xf86-video-vesa])
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_AUX_DIR(.)
+ 
++# Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+-
+ AM_MAINTAINER_MODE
+ 
+-# Require xorg-macros: XORG_DEFAULT_OPTIONS
++# Require X.Org macros 1.8 or later for MAN_SUBSTS set by 
XORG_MANPAGE_SECTIONS
+ m4_ifndef([XORG_MACROS_VERSION],
+-  [m4_fatal([must install xorg-macros 1.3 or later before running 
autoconf/autogen])])
+-XORG_MACROS_VERSION(1.3)
++  [m4_fatal([must install xorg-macros 1.8 or later before running 
autoconf/autogen])])
++XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+-# Checks for programs.
++# Initialize libtool
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
+ 
+ AH_TOP([#include xorg-server.h])
+ 
++# Define a configure option for an alternate module directory
+ AC_ARG_WITH(xorg-module-dir, [  --with-xorg-module-dir=DIR ],
+  [ moduledir=$withval ],
+  [ moduledir=$libdir/xorg/modules ])
+ AC_SUBST(moduledir)
+ 
+-
+-# Checks for extensions
++# Store the list of server defined optional extensions in REQUIRED_MODULES
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ 
+-# Checks for pkg-config packages
++# Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(XORG, xorg-server = 1.0.99.901 xproto fontsproto 
$REQUIRED_MODULES)
+ PKG_CHECK_MODULES(XEXT, [xextproto = 7.0.99.1],
+   HAVE_XEXTPROTO_71=yes; AC_DEFINE(HAVE_XEXTPROTO_71, 1, 
[xextproto 7.1 available]),
+@@ -93,21 +92,14 @@ if test x$XSERVER_LIBPCIACCESS = xyes; then
+ fi
+ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test x$XSERVER_LIBPCIACCESS = xyes)
+ 
+-CFLAGS=$CFLAGS $XORG_CFLAGS ' -I$(top_srcdir)/src'
+-INCLUDES=$XORG_INCS '-I$(top_srcdir)/src'
+-AC_SUBST([CFLAGS])
+-AC_SUBST([INCLUDES])
+-
+ # Checks for libraries.
+ 
+-# Checks for header files.
+-AC_HEADER_STDC
+-
+ DRIVER_NAME=vesa
+ AC_SUBST([DRIVER_NAME])
+ 
+-AC_OUTPUT([
+-  Makefile
+-  src/Makefile
+-  man/Makefile
++AC_CONFIG_FILES([
++Makefile
++src/Makefile
++man/Makefile
+ ])
++AC_OUTPUT
+diff --git a/man/Makefile.am b/man/Makefile.am
+index f0eb29b..b3688ce 100644
+--- 

[arch-commits] Commit in xf86-video-vesa/repos (staging-i686 staging-i686/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 03:26:41
  Author: jgc
Revision: 136238

archrelease: copy trunk to staging-i686

Added:
  xf86-video-vesa/repos/staging-i686/
  xf86-video-vesa/repos/staging-i686/PKGBUILD
(from rev 136237, xf86-video-vesa/trunk/PKGBUILD)

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

Copied: xf86-video-vesa/repos/staging-i686/PKGBUILD (from rev 136237, 
xf86-video-vesa/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 07:26:41 UTC (rev 136238)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-vesa
+pkgver=2.3.0
+pkgrel=6
+pkgdesc=X.org vesa video driver
+arch=(i686 x86_64)
+license=('custom')
+url=http://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('pkgconfig' 'xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('4689b7c295d7a8d7326302dafecb812739617134'
+  '1e54ae50daa796ab0c29c8088f25e522dc6faa4a')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+  autoreconf -fi
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-vesa/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 03:26:54
  Author: jgc
Revision: 136239

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-vesa/repos/staging-x86_64/
  xf86-video-vesa/repos/staging-x86_64/PKGBUILD
(from rev 136238, xf86-video-vesa/trunk/PKGBUILD)

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

Copied: xf86-video-vesa/repos/staging-x86_64/PKGBUILD (from rev 136238, 
xf86-video-vesa/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 07:26:54 UTC (rev 136239)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-vesa
+pkgver=2.3.0
+pkgrel=6
+pkgdesc=X.org vesa video driver
+arch=(i686 x86_64)
+license=('custom')
+url=http://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('pkgconfig' 'xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('4689b7c295d7a8d7326302dafecb812739617134'
+  '1e54ae50daa796ab0c29c8088f25e522dc6faa4a')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+  autoreconf -fi
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-cirrus/trunk (LICENSE PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 03:33:25
  Author: jgc
Revision: 136240

upgpkg: xf86-video-cirrus 1.3.2-7

Rebuild for xserver 1.11RC, use included license

Modified:
  xf86-video-cirrus/trunk/PKGBUILD
Deleted:
  xf86-video-cirrus/trunk/LICENSE

--+
 LICENSE  |   22 --
 PKGBUILD |   14 ++
 2 files changed, 6 insertions(+), 30 deletions(-)

Deleted: LICENSE
===
--- LICENSE 2011-08-25 07:26:54 UTC (rev 136239)
+++ LICENSE 2011-08-25 07:33:25 UTC (rev 136240)
@@ -1,22 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-Copyright 2000 by Egbert Eich
-
-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 Alan Hourihane not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Alan Hourihane makes no representations
-about the suitability of this software for any purpose.  It is provided
-as is without express or implied warranty.
-
-EGBERT EICH DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ALAN HOURIHANE 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.

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 07:26:54 UTC (rev 136239)
+++ PKGBUILD2011-08-25 07:33:25 UTC (rev 136240)
@@ -3,20 +3,18 @@
 
 pkgname=xf86-video-cirrus
 pkgver=1.3.2
-pkgrel=6
+pkgrel=7
 pkgdesc=X.org Cirrus Logic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel')
-conflicts=('xorg-server1.10.0')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-LICENSE)
-md5sums=('8195d03ed0be0975c03441e66a9f53b3'
- 'b9b570ac5c03f1fbe3e0cee5fe884b82')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('8195d03ed0be0975c03441e66a9f53b3')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -24,5 +22,5 @@
   make
   make DESTDIR=${pkgdir} install
   install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
 }



[arch-commits] Commit in xf86-video-cirrus/repos (staging-i686 staging-i686/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 03:33:38
  Author: jgc
Revision: 136241

archrelease: copy trunk to staging-i686

Added:
  xf86-video-cirrus/repos/staging-i686/
  xf86-video-cirrus/repos/staging-i686/PKGBUILD
(from rev 136240, xf86-video-cirrus/trunk/PKGBUILD)

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

Copied: xf86-video-cirrus/repos/staging-i686/PKGBUILD (from rev 136240, 
xf86-video-cirrus/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 07:33:38 UTC (rev 136241)
@@ -0,0 +1,26 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-cirrus
+pkgver=1.3.2
+pkgrel=7
+pkgdesc=X.org Cirrus Logic video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('8195d03ed0be0975c03441e66a9f53b3')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-cirrus/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 03:33:51
  Author: jgc
Revision: 136242

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-cirrus/repos/staging-x86_64/
  xf86-video-cirrus/repos/staging-x86_64/PKGBUILD
(from rev 136241, xf86-video-cirrus/trunk/PKGBUILD)

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

Copied: xf86-video-cirrus/repos/staging-x86_64/PKGBUILD (from rev 136241, 
xf86-video-cirrus/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 07:33:51 UTC (rev 136242)
@@ -0,0 +1,26 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-cirrus
+pkgver=1.3.2
+pkgrel=7
+pkgdesc=X.org Cirrus Logic video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('8195d03ed0be0975c03441e66a9f53b3')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



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

2011-08-25 Thread Tobias Powalowski
Date: Thursday, August 25, 2011 @ 03:40:56
  Author: tpowa
Revision: 136243

upgpkg: samba 3.6.0-2

removed fam depend added gamin, changed to dynamically linking #24678

Modified:
  samba/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 07:33:51 UTC (rev 136242)
+++ PKGBUILD2011-08-25 07:40:56 UTC (rev 136243)
@@ -8,11 +8,12 @@
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.6.0
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url=http://www.samba.org;
 license=('GPL3')
-makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'fam' 
'gnutls=2.4.1' 'talloc' 'tdb')
+makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam'
+'gamin' 'gnutls=2.4.1' 'talloc' 'tdb' 'python2')
 options=(!makeflags)
 source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
 samba samba.logrotate
@@ -24,27 +25,28 @@
 
 build() {
   cd ${srcdir}/${pkgbase}-${_realver}/source3
-  ./configure --prefix=/usr \
+  sed -i s/env python/env python2/g ../buildtools/bin/waf 
+  ./autogen-waf.sh
+  ../buildtools/bin/waf configure --prefix=/usr \
   --libdir=/usr/lib/ \
+  --with-modulesdir=/usr/lib/samba \
+  --with-swatdir=/usr/share/samba/swat \
   --localstatedir=/var \
   --with-configdir=/etc/samba \
   --with-lockdir=/var/cache/samba \
   --with-piddir=/var/run/samba \
-  --with-fhs \
   --with-pam \
   --with-pam_smbpass \
   --with-pammodulesdir=/lib/security \
   --with-ads \
   --with-acl-support \
-  --with-cifsmount \
-  --with-libsmbclient \
   --with-syslog \
-  --enable-external-libtalloc \
-  --disable-dnssd \
   --disable-avahi \
-  --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \
-  --enable-external-libtdb
-  make
+  
--with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
+  --disable-rpath \
+  --disable-rpath-private-install \
+  --disable-rpath-install
+  ../buildtools/bin/waf build ${MAKEFLAGS} 
 }
 
 package_smbclient () {
@@ -53,9 +55,23 @@
   cd ${srcdir}/${pkgbase}-${_realver}/source3
   mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
   install -m755 
bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup}
 ${pkgdir}/usr/bin/
-  for i in libnetapi* libwbclient* libsmbclient*;do
-  cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
+  for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so 
libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so 
libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so 
libtdb-wrap.so libaddns.so libcliauth.so; do
+install -m644 -D bin/shared/private/$i ${pkgdir}/usr/lib/samba/$i
   done
+  for i in libsmbconf libnetapi libwbclient libsmbclient; do
+install -m644 -D bin/shared/$i.so.0  ${pkgdir}/usr/lib/$i.so.0
+ln -sf /usr/lib/$i.so.0  ${pkgdir}/usr/lib/$i.so
+  done
+  mkdir ${pkgdir}/usr/lib/libsmb
+  cp  ${pkgdir}/usr/lib/libsmbclient.so.0 ${pkgdir}/usr/lib/libsmb
+  ln -sf /usr/lib/libsmb/libsmbclient.so.0  
${pkgdir}/usr/lib/libsmb/libsmbclient.so
+  for i in libndr-krb5pac libndr-standard libndr; do
+install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0.0.1
+ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so.0
+ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so
+  done
+  install -m644 -D bin/shared/private/libtevent.so.0 
${pkgdir}/usr/lib/samba/libtevent.so.0.9.11
+  ln -sf /usr/lib/samba/libtevent.so.0.9.11  
${pkgdir}/usr/lib/samba/libtevent.so.0
   install -m755 script/smbtar ${pkgdir}/usr/bin/
   mkdir -p ${pkgdir}/usr/lib/cups/backend
   ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
@@ -77,37 +93,37 @@
 etc/samba/smb.conf
 etc/xinetd.d/swat
 etc/conf.d/samba)
-depends=('db' 'popt' 'libcups' 'acl' 'libldap' smbclient=$pkgver 'libcap' 
'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
+depends=('db' 'popt' 'libcups' 'acl' 'libldap' smbclient=$pkgver 'libcap' 
'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
+optdepends=('python2: for python bindings')
   cd ${srcdir}/samba-${_realver}/source3
   mkdir -p ${pkgdir}/etc/samba/private
   chmod 700 ${pkgdir}/etc/samba/private
   make DESTDIR=${pkgdir} install
   chmod 644 ${pkgdir}/usr/include/*.h
   rm -rf ${pkgdir}/usr/var
-  (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///'  installbin.sh)
-  install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba
-  install -D -m644 

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

2011-08-25 Thread Tobias Powalowski
Date: Thursday, August 25, 2011 @ 03:44:47
  Author: tpowa
Revision: 136244

archrelease: copy trunk to testing-i686

Added:
  samba/repos/testing-i686/
  samba/repos/testing-i686/PKGBUILD
(from rev 136243, samba/trunk/PKGBUILD)
  samba/repos/testing-i686/fix-ipv6-mount.patch
(from rev 136243, samba/trunk/fix-ipv6-mount.patch)
  samba/repos/testing-i686/samba
(from rev 136243, samba/trunk/samba)
  samba/repos/testing-i686/samba.conf.d
(from rev 136243, samba/trunk/samba.conf.d)
  samba/repos/testing-i686/samba.logrotate
(from rev 136243, samba/trunk/samba.logrotate)
  samba/repos/testing-i686/samba.pam
(from rev 136243, samba/trunk/samba.pam)
  samba/repos/testing-i686/swat.xinetd
(from rev 136243, samba/trunk/swat.xinetd)

--+
 PKGBUILD |  155 +
 fix-ipv6-mount.patch |   11 +++
 samba|   57 ++
 samba.conf.d |7 ++
 samba.logrotate  |9 ++
 samba.pam|3 
 swat.xinetd  |   10 +++
 7 files changed, 252 insertions(+)

Copied: samba/repos/testing-i686/PKGBUILD (from rev 136243, 
samba/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-08-25 07:44:47 UTC (rev 136244)
@@ -0,0 +1,155 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+pkgbase=samba
+pkgname=('smbclient' 'samba')
+pkgver=3.6.0
+# We use the 'A' to fake out pacman's version comparators.  Samba chooses
+# to append 'a','b',etc to their subsequent releases, which pamcan
+# misconstrues as alpha, beta, etc.  Bad samba!
+_realver=3.6.0
+pkgrel=2
+arch=(i686 x86_64)
+url=http://www.samba.org;
+license=('GPL3')
+makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam'
+'gamin' 'gnutls=2.4.1' 'talloc' 'tdb' 'python2')
+options=(!makeflags)
+source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
+samba samba.logrotate
+swat.xinetd
+samba.pam
+samba.conf.d
+fix-ipv6-mount.patch)
+### UNINSTALL dmapi package before building!!!
+
+build() {
+  cd ${srcdir}/${pkgbase}-${_realver}/source3
+  sed -i s/env python/env python2/g ../buildtools/bin/waf 
+  ./autogen-waf.sh
+  ../buildtools/bin/waf configure --prefix=/usr \
+  --libdir=/usr/lib/ \
+  --with-modulesdir=/usr/lib/samba \
+  --with-swatdir=/usr/share/samba/swat \
+  --localstatedir=/var \
+  --with-configdir=/etc/samba \
+  --with-lockdir=/var/cache/samba \
+  --with-piddir=/var/run/samba \
+  --with-pam \
+  --with-pam_smbpass \
+  --with-pammodulesdir=/lib/security \
+  --with-ads \
+  --with-acl-support \
+  --with-syslog \
+  --disable-avahi \
+  
--with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
+  --disable-rpath \
+  --disable-rpath-private-install \
+  --disable-rpath-install
+  ../buildtools/bin/waf build ${MAKEFLAGS} 
+}
+
+package_smbclient () {
+pkgdesc=Tools to access a server's filespace and printers via SMB
+depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 
'e2fsprogs' 'tdb' 'talloc')
+  cd ${srcdir}/${pkgbase}-${_realver}/source3
+  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
+  install -m755 
bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup}
 ${pkgdir}/usr/bin/
+  for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so 
libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so 
libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so 
libtdb-wrap.so libaddns.so libcliauth.so; do
+install -m644 -D bin/shared/private/$i ${pkgdir}/usr/lib/samba/$i
+  done
+  for i in libsmbconf libnetapi libwbclient libsmbclient; do
+install -m644 -D bin/shared/$i.so.0  ${pkgdir}/usr/lib/$i.so.0
+ln -sf /usr/lib/$i.so.0  ${pkgdir}/usr/lib/$i.so
+  done
+  mkdir ${pkgdir}/usr/lib/libsmb
+  cp  ${pkgdir}/usr/lib/libsmbclient.so.0 ${pkgdir}/usr/lib/libsmb
+  ln -sf /usr/lib/libsmb/libsmbclient.so.0  
${pkgdir}/usr/lib/libsmb/libsmbclient.so
+  for i in libndr-krb5pac libndr-standard libndr; do
+install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0.0.1
+ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so.0
+ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so
+  done
+  install -m644 -D bin/shared/private/libtevent.so.0 
${pkgdir}/usr/lib/samba/libtevent.so.0.9.11
+  ln -sf /usr/lib/samba/libtevent.so.0.9.11  
${pkgdir}/usr/lib/samba/libtevent.so.0
+  install -m755 script/smbtar ${pkgdir}/usr/bin/
+  mkdir -p ${pkgdir}/usr/lib/cups/backend
+  ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
+ 

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

2011-08-25 Thread Tobias Powalowski
Date: Thursday, August 25, 2011 @ 03:46:01
  Author: tpowa
Revision: 136245

archrelease: copy trunk to testing-x86_64

Added:
  samba/repos/testing-x86_64/
  samba/repos/testing-x86_64/PKGBUILD
(from rev 136244, samba/trunk/PKGBUILD)
  samba/repos/testing-x86_64/fix-ipv6-mount.patch
(from rev 136244, samba/trunk/fix-ipv6-mount.patch)
  samba/repos/testing-x86_64/samba
(from rev 136244, samba/trunk/samba)
  samba/repos/testing-x86_64/samba.conf.d
(from rev 136244, samba/trunk/samba.conf.d)
  samba/repos/testing-x86_64/samba.logrotate
(from rev 136244, samba/trunk/samba.logrotate)
  samba/repos/testing-x86_64/samba.pam
(from rev 136244, samba/trunk/samba.pam)
  samba/repos/testing-x86_64/swat.xinetd
(from rev 136244, samba/trunk/swat.xinetd)

--+
 PKGBUILD |  155 +
 fix-ipv6-mount.patch |   11 +++
 samba|   57 ++
 samba.conf.d |7 ++
 samba.logrotate  |9 ++
 samba.pam|3 
 swat.xinetd  |   10 +++
 7 files changed, 252 insertions(+)

Copied: samba/repos/testing-x86_64/PKGBUILD (from rev 136244, 
samba/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2011-08-25 07:46:01 UTC (rev 136245)
@@ -0,0 +1,155 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+pkgbase=samba
+pkgname=('smbclient' 'samba')
+pkgver=3.6.0
+# We use the 'A' to fake out pacman's version comparators.  Samba chooses
+# to append 'a','b',etc to their subsequent releases, which pamcan
+# misconstrues as alpha, beta, etc.  Bad samba!
+_realver=3.6.0
+pkgrel=2
+arch=(i686 x86_64)
+url=http://www.samba.org;
+license=('GPL3')
+makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam'
+'gamin' 'gnutls=2.4.1' 'talloc' 'tdb' 'python2')
+options=(!makeflags)
+source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
+samba samba.logrotate
+swat.xinetd
+samba.pam
+samba.conf.d
+fix-ipv6-mount.patch)
+### UNINSTALL dmapi package before building!!!
+
+build() {
+  cd ${srcdir}/${pkgbase}-${_realver}/source3
+  sed -i s/env python/env python2/g ../buildtools/bin/waf 
+  ./autogen-waf.sh
+  ../buildtools/bin/waf configure --prefix=/usr \
+  --libdir=/usr/lib/ \
+  --with-modulesdir=/usr/lib/samba \
+  --with-swatdir=/usr/share/samba/swat \
+  --localstatedir=/var \
+  --with-configdir=/etc/samba \
+  --with-lockdir=/var/cache/samba \
+  --with-piddir=/var/run/samba \
+  --with-pam \
+  --with-pam_smbpass \
+  --with-pammodulesdir=/lib/security \
+  --with-ads \
+  --with-acl-support \
+  --with-syslog \
+  --disable-avahi \
+  
--with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
+  --disable-rpath \
+  --disable-rpath-private-install \
+  --disable-rpath-install
+  ../buildtools/bin/waf build ${MAKEFLAGS} 
+}
+
+package_smbclient () {
+pkgdesc=Tools to access a server's filespace and printers via SMB
+depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 
'e2fsprogs' 'tdb' 'talloc')
+  cd ${srcdir}/${pkgbase}-${_realver}/source3
+  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
+  install -m755 
bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup}
 ${pkgdir}/usr/bin/
+  for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so 
libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so 
libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so 
libtdb-wrap.so libaddns.so libcliauth.so; do
+install -m644 -D bin/shared/private/$i ${pkgdir}/usr/lib/samba/$i
+  done
+  for i in libsmbconf libnetapi libwbclient libsmbclient; do
+install -m644 -D bin/shared/$i.so.0  ${pkgdir}/usr/lib/$i.so.0
+ln -sf /usr/lib/$i.so.0  ${pkgdir}/usr/lib/$i.so
+  done
+  mkdir ${pkgdir}/usr/lib/libsmb
+  cp  ${pkgdir}/usr/lib/libsmbclient.so.0 ${pkgdir}/usr/lib/libsmb
+  ln -sf /usr/lib/libsmb/libsmbclient.so.0  
${pkgdir}/usr/lib/libsmb/libsmbclient.so
+  for i in libndr-krb5pac libndr-standard libndr; do
+install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0.0.1
+ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so.0
+ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so
+  done
+  install -m644 -D bin/shared/private/libtevent.so.0 
${pkgdir}/usr/lib/samba/libtevent.so.0.9.11
+  ln -sf /usr/lib/samba/libtevent.so.0.9.11  
${pkgdir}/usr/lib/samba/libtevent.so.0
+  install -m755 script/smbtar ${pkgdir}/usr/bin/
+  mkdir -p ${pkgdir}/usr/lib/cups/backend
+  ln -sf /usr/bin/smbspool 

[arch-commits] Commit in xf86-video-savage/trunk (PKGBUILD git-fixes.patch)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 03:57:28
  Author: jgc
Revision: 136246

upgpkg: xf86-video-savage 2.3.2-3

Rebuild for xserver 1.11RC, add fixes from git, add glproto makedepend

Added:
  xf86-video-savage/trunk/git-fixes.patch
Modified:
  xf86-video-savage/trunk/PKGBUILD

-+
 PKGBUILD|   11 
 git-fixes.patch | 1076 ++
 2 files changed, 1083 insertions(+), 4 deletions(-)

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


[arch-commits] Commit in xf86-video-savage/repos (staging-i686 staging-i686/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 03:57:41
  Author: jgc
Revision: 136247

archrelease: copy trunk to staging-i686

Added:
  xf86-video-savage/repos/staging-i686/
  xf86-video-savage/repos/staging-i686/PKGBUILD
(from rev 136246, xf86-video-savage/trunk/PKGBUILD)

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

Copied: xf86-video-savage/repos/staging-i686/PKGBUILD (from rev 136246, 
xf86-video-savage/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 07:57:41 UTC (rev 136247)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-savage
+pkgver=2.3.2
+pkgrel=3
+pkgdesc=X.org savage video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc' 'savage-dri')
+makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
+conflicts=('xorg-server1.10.0')
+options=(!libtool !makeflags)
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('d675693d0b29cb24f624ef57c1fe2f271f6bf6c3'
+  '0ee1dd57cd48dad4d46ebcfe914b88027e44c3f1')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+  ./configure --prefix=/usr --enable-dri
+  make
+  make DESTDIR=${pkgdir} install
+
+  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-savage/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 03:57:54
  Author: jgc
Revision: 136248

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-savage/repos/staging-x86_64/
  xf86-video-savage/repos/staging-x86_64/PKGBUILD
(from rev 136247, xf86-video-savage/trunk/PKGBUILD)

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

Copied: xf86-video-savage/repos/staging-x86_64/PKGBUILD (from rev 136247, 
xf86-video-savage/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 07:57:54 UTC (rev 136248)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-savage
+pkgver=2.3.2
+pkgrel=3
+pkgdesc=X.org savage video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc' 'savage-dri')
+makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
+conflicts=('xorg-server1.10.0')
+options=(!libtool !makeflags)
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('d675693d0b29cb24f624ef57c1fe2f271f6bf6c3'
+  '0ee1dd57cd48dad4d46ebcfe914b88027e44c3f1')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+  ./configure --prefix=/usr --enable-dri
+  make
+  make DESTDIR=${pkgdir} install
+
+  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-dummy/trunk (PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 04:16:17
  Author: jgc
Revision: 136249

upgpkg: xf86-video-dummy 0.3.4-5

Rebuild for xserver 1.11RC

Modified:
  xf86-video-dummy/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 07:57:54 UTC (rev 136248)
+++ PKGBUILD2011-08-25 08:16:17 UTC (rev 136249)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-dummy
 pkgver=0.3.4
-pkgrel=4
+pkgrel=5
 pkgdesc=X.org dummy video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'xf86dgaproto')
-conflicts=('xorg-server1.10.0')
+makedepends=('xorg-server-devel=1.10.99.902' 'xf86dgaproto')
+conflicts=('xorg-server1.10.99.902')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)



[arch-commits] Commit in xf86-video-dummy/repos (staging-i686 staging-i686/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 04:16:30
  Author: jgc
Revision: 136250

archrelease: copy trunk to staging-i686

Added:
  xf86-video-dummy/repos/staging-i686/
  xf86-video-dummy/repos/staging-i686/PKGBUILD
(from rev 136249, xf86-video-dummy/trunk/PKGBUILD)

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

Copied: xf86-video-dummy/repos/staging-i686/PKGBUILD (from rev 136249, 
xf86-video-dummy/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 08:16:30 UTC (rev 136250)
@@ -0,0 +1,26 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-dummy
+pkgver=0.3.4
+pkgrel=5
+pkgdesc=X.org dummy video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902' 'xf86dgaproto')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('876ed7165ea2821bbddd73232a1ce0b79c1f14ff')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-dummy/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 04:16:43
  Author: jgc
Revision: 136251

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-dummy/repos/staging-x86_64/
  xf86-video-dummy/repos/staging-x86_64/PKGBUILD
(from rev 136250, xf86-video-dummy/trunk/PKGBUILD)

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

Copied: xf86-video-dummy/repos/staging-x86_64/PKGBUILD (from rev 136250, 
xf86-video-dummy/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 08:16:43 UTC (rev 136251)
@@ -0,0 +1,26 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-dummy
+pkgver=0.3.4
+pkgrel=5
+pkgdesc=X.org dummy video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902' 'xf86dgaproto')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('876ed7165ea2821bbddd73232a1ce0b79c1f14ff')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-siliconmotion/trunk (PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 04:23:24
  Author: jgc
Revision: 136252

upgpkg: xf86-video-siliconmotion 1.7.5-3

Rebuild for xserver 1.11RC

Modified:
  xf86-video-siliconmotion/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 08:16:43 UTC (rev 136251)
+++ PKGBUILD2011-08-25 08:23:24 UTC (rev 136252)
@@ -4,14 +4,14 @@
 
 pkgname=xf86-video-siliconmotion
 pkgver=1.7.5
-pkgrel=2
+pkgrel=3
 pkgdesc=X.org siliconmotion video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel')
-conflicts=('xorg-server1.10.0')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)



[arch-commits] Commit in xf86-video-siliconmotion/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 04:23:36
  Author: jgc
Revision: 136253

archrelease: copy trunk to staging-i686

Added:
  xf86-video-siliconmotion/repos/staging-i686/
  xf86-video-siliconmotion/repos/staging-i686/PKGBUILD
(from rev 136252, xf86-video-siliconmotion/trunk/PKGBUILD)

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

Copied: xf86-video-siliconmotion/repos/staging-i686/PKGBUILD (from rev 136252, 
xf86-video-siliconmotion/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 08:23:36 UTC (rev 136253)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Alexander Baldeck alexan...@archlinux.org
+
+pkgname=xf86-video-siliconmotion
+pkgver=1.7.5
+pkgrel=3
+pkgdesc=X.org siliconmotion video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('946acae0822d51da57abe8b7ed049691bd731589')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-siliconmotion/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 04:23:49
  Author: jgc
Revision: 136254

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-siliconmotion/repos/staging-x86_64/
  xf86-video-siliconmotion/repos/staging-x86_64/PKGBUILD
(from rev 136253, xf86-video-siliconmotion/trunk/PKGBUILD)

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

Copied: xf86-video-siliconmotion/repos/staging-x86_64/PKGBUILD (from rev 
136253, xf86-video-siliconmotion/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 08:23:49 UTC (rev 136254)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Alexander Baldeck alexan...@archlinux.org
+
+pkgname=xf86-video-siliconmotion
+pkgver=1.7.5
+pkgrel=3
+pkgdesc=X.org siliconmotion video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('946acae0822d51da57abe8b7ed049691bd731589')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-fbdev/trunk (PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 04:30:25
  Author: jgc
Revision: 136255

upgpkg: xf86-video-fbdev 0.4.2-5

Rebuild for xserver 1.11RC

Modified:
  xf86-video-fbdev/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 08:23:49 UTC (rev 136254)
+++ PKGBUILD2011-08-25 08:30:25 UTC (rev 136255)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-fbdev
 pkgver=0.4.2
-pkgrel=4
+pkgrel=5
 pkgdesc=X.org framebuffer video driver
 arch=(i686 x86_64)
 license=('custom')
 url=http://xorg.freedesktop.org/;
 depends=('glibc')
-makedepends=('xorg-server-devel')
-conflicts=('xorg-server1.10.0')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)



[arch-commits] Commit in xf86-video-fbdev/repos (staging-i686 staging-i686/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 04:30:38
  Author: jgc
Revision: 136256

archrelease: copy trunk to staging-i686

Added:
  xf86-video-fbdev/repos/staging-i686/
  xf86-video-fbdev/repos/staging-i686/PKGBUILD
(from rev 136255, xf86-video-fbdev/trunk/PKGBUILD)

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

Copied: xf86-video-fbdev/repos/staging-i686/PKGBUILD (from rev 136255, 
xf86-video-fbdev/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 08:30:38 UTC (rev 136256)
@@ -0,0 +1,26 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-fbdev
+pkgver=0.4.2
+pkgrel=5
+pkgdesc=X.org framebuffer video driver
+arch=(i686 x86_64)
+license=('custom')
+url=http://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('c8562f997d56c9fec50df6ca9892f39f43ff4c2c')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-fbdev/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 04:30:51
  Author: jgc
Revision: 136257

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-fbdev/repos/staging-x86_64/
  xf86-video-fbdev/repos/staging-x86_64/PKGBUILD
(from rev 136256, xf86-video-fbdev/trunk/PKGBUILD)

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

Copied: xf86-video-fbdev/repos/staging-x86_64/PKGBUILD (from rev 136256, 
xf86-video-fbdev/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 08:30:51 UTC (rev 136257)
@@ -0,0 +1,26 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-fbdev
+pkgver=0.4.2
+pkgrel=5
+pkgdesc=X.org framebuffer video driver
+arch=(i686 x86_64)
+license=('custom')
+url=http://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('c8562f997d56c9fec50df6ca9892f39f43ff4c2c')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-glint/trunk (PKGBUILD git-fixes.patch)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 04:50:39
  Author: jgc
Revision: 136258

upgpkg: xf86-video-glint 1.2.5-3

Rebuild for xserver 1.11RC, add latest fixes from git

Added:
  xf86-video-glint/trunk/git-fixes.patch
Modified:
  xf86-video-glint/trunk/PKGBUILD

-+
 PKGBUILD|   16 
 git-fixes.patch | 3927 ++
 2 files changed, 3937 insertions(+), 6 deletions(-)

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


[arch-commits] Commit in xf86-video-glint/repos (staging-i686 staging-i686/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 04:50:52
  Author: jgc
Revision: 136259

archrelease: copy trunk to staging-i686

Added:
  xf86-video-glint/repos/staging-i686/
  xf86-video-glint/repos/staging-i686/PKGBUILD
(from rev 136258, xf86-video-glint/trunk/PKGBUILD)

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

Copied: xf86-video-glint/repos/staging-i686/PKGBUILD (from rev 136258, 
xf86-video-glint/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 08:50:52 UTC (rev 136259)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-glint
+pkgver=1.2.5
+pkgrel=3
+pkgdesc=X.org GLINT/Permedia video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902' 'xf86dgaproto')
+conflicts=('xorg-server1.10.99.902')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('28d54093c6485bf0055fa16be3d116f9107aaea7'
+  'cc3a7b76e33755e8c9889ae1182ec468956dbc9c')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+  autoreconf -fi
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-glint/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 04:51:06
  Author: jgc
Revision: 136260

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-glint/repos/staging-x86_64/
  xf86-video-glint/repos/staging-x86_64/PKGBUILD
(from rev 136259, xf86-video-glint/trunk/PKGBUILD)

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

Copied: xf86-video-glint/repos/staging-x86_64/PKGBUILD (from rev 136259, 
xf86-video-glint/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 08:51:06 UTC (rev 136260)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-glint
+pkgver=1.2.5
+pkgrel=3
+pkgdesc=X.org GLINT/Permedia video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902' 'xf86dgaproto')
+conflicts=('xorg-server1.10.99.902')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('28d54093c6485bf0055fa16be3d116f9107aaea7'
+  'cc3a7b76e33755e8c9889ae1182ec468956dbc9c')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+  autoreconf -fi
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD gpsd-2.96.patch gpsd3.patch)

2011-08-25 Thread Andrea Scarpino
Date: Thursday, August 25, 2011 @ 04:57:13
  Author: andrea
Revision: 136261

upgpkg: kdeedu-marble 4.7.0-3

Update patch for gpsd 3.0

Added:
  kdeedu-marble/trunk/gpsd3.patch
Modified:
  kdeedu-marble/trunk/PKGBUILD
Deleted:
  kdeedu-marble/trunk/gpsd-2.96.patch

-+
 PKGBUILD|8 
 gpsd-2.96.patch |   41 -
 gpsd3.patch |   42 ++
 3 files changed, 46 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 08:51:06 UTC (rev 136260)
+++ PKGBUILD2011-08-25 08:57:13 UTC (rev 136261)
@@ -3,7 +3,7 @@
 
 pkgname=kdeedu-marble
 pkgver=4.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc=Desktop Globe
 url=http://kde.org/applications/education/marble/;
 arch=('i686' 'x86_64')
@@ -14,13 +14,13 @@
 optdepends=('gpsd: gps support')
 install=${pkgname}.install
 source=(http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2;
-'gpsd-2.96.patch')
+'gpsd3.patch')
 sha1sums=('bbe08a57a33e06fceea3a51aed1406bc71ee02a9'
-  'f44dfd3bb384e631d59b93d7dda3413795da8183')
+  '3916dd6307109d70d0dd538de913c91eede81d78')
 
 build() {
   cd ${srcdir}/marble-${pkgver}
-  patch -p1 -i ${srcdir}/gpsd-2.96.patch
+  patch -p1 -i ${srcdir}/gpsd3.patch
 
   cd ${srcdir}
   mkdir build

Deleted: gpsd-2.96.patch
===
--- gpsd-2.96.patch 2011-08-25 08:51:06 UTC (rev 136260)
+++ gpsd-2.96.patch 2011-08-25 08:57:13 UTC (rev 136261)
@@ -1,41 +0,0 @@
 marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-+++ marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-@@ -18,6 +18,9 @@ using namespace Marble;
- 
- GpsdConnection::GpsdConnection( QObject* parent )
- : QObject( parent ),
-+#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
-+  m_gpsd(localhost, DEFAULT_GPSD_PORT),
-+#endif
-   m_timer( 0 )
- {
- connect( m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
-@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject*
- void GpsdConnection::initialize()
- {
- m_timer.stop();
-+#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
-+gps_data_t* data;
-+#else
- gps_data_t* data = m_gpsd.open();
-+#endif
- if ( data ) {
- m_status = PositionProviderStatusAcquiring;
- emit statusChanged( m_status );
-@@ -73,8 +80,16 @@ void GpsdConnection::initialize()
- void GpsdConnection::update()
- {
- #if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 3 )  
defined( PACKET_SET )
-+#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
-+if ( m_gpsd.waiting(0) ) {
-+#else
- if ( m_gpsd.waiting() ) {
-+#endif
-+#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
-+gps_data_t* data = m_gpsd.read();
-+#else
- gps_data_t* data = m_gpsd.poll();
-+#endif
- if ( data  data-set  PACKET_SET ) {
- emit gpsdInfo( *data );
- }

Added: gpsd3.patch
===
--- gpsd3.patch (rev 0)
+++ gpsd3.patch 2011-08-25 08:57:13 UTC (rev 136261)
@@ -0,0 +1,42 @@
+diff -up 
marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig 
marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+--- marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig 
2011-05-20 15:34:41.0 -0500
 marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp  
2011-08-24 13:38:37.050200241 -0500
+@@ -20,6 +20,9 @@ using namespace Marble;
+ 
+ GpsdConnection::GpsdConnection( QObject* parent )
+ : QObject( parent ),
++#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
++  m_gpsd(localhost, DEFAULT_GPSD_PORT),
++#endif
+   m_timer( 0 )
+ {
+ m_oldLocale = setlocale( LC_NUMERIC, NULL );
+@@ -35,7 +38,11 @@ GpsdConnection::~GpsdConnection()
+ void GpsdConnection::initialize()
+ {
+ m_timer.stop();
++#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
++gps_data_t* data;
++#else
+ gps_data_t* data = m_gpsd.open();
++#endif
+ if ( data ) {
+ m_status = PositionProviderStatusAcquiring;
+ emit statusChanged( m_status );
+@@ -82,8 +89,16 @@ void GpsdConnection::initialize()
+ void GpsdConnection::update()
+ {
+ #if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 3 )  
defined( PACKET_SET )
++#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
++if ( m_gpsd.waiting(0) ) {
++#else
+ if ( m_gpsd.waiting() ) {
++#endif
++#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
++gps_data_t* data = m_gpsd.read();
++#else
+ gps_data_t* data = m_gpsd.poll();
++#endif
+ if ( data  data-set  

[arch-commits] Commit in kdeedu-marble/repos/extra-i686 (5 files)

2011-08-25 Thread Andrea Scarpino
Date: Thursday, August 25, 2011 @ 04:58:15
  Author: andrea
Revision: 136262

archrelease: copy trunk to extra-i686

Added:
  kdeedu-marble/repos/extra-i686/PKGBUILD
(from rev 136261, kdeedu-marble/trunk/PKGBUILD)
  kdeedu-marble/repos/extra-i686/kdeedu-marble.install
(from rev 136261, kdeedu-marble/trunk/kdeedu-marble.install)
Deleted:
  kdeedu-marble/repos/extra-i686/PKGBUILD
  kdeedu-marble/repos/extra-i686/gpsd-2.96.patch
  kdeedu-marble/repos/extra-i686/kdeedu-marble.install

---+
 PKGBUILD  |   74 
 gpsd-2.96.patch   |   41 --
 kdeedu-marble.install |   24 +++
 3 files changed, 49 insertions(+), 90 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-25 08:57:13 UTC (rev 136261)
+++ PKGBUILD2011-08-25 08:58:15 UTC (rev 136262)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-
-pkgname=kdeedu-marble
-pkgver=4.7.0
-pkgrel=2
-pkgdesc=Desktop Globe
-url=http://kde.org/applications/education/marble/;
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'gpsd')
-optdepends=('gpsd: gps support')
-install=${pkgname}.install
-source=(http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2;
-'gpsd-2.96.patch')
-sha1sums=('bbe08a57a33e06fceea3a51aed1406bc71ee02a9'
-  'f44dfd3bb384e631d59b93d7dda3413795da8183')
-
-build() {
-  cd ${srcdir}/marble-${pkgver}
-  patch -p1 -i ${srcdir}/gpsd-2.96.patch
-
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../marble-${pkgver} \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-}

Copied: kdeedu-marble/repos/extra-i686/PKGBUILD (from rev 136261, 
kdeedu-marble/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-25 08:58:15 UTC (rev 136262)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=kdeedu-marble
+pkgver=4.7.0
+pkgrel=3
+pkgdesc=Desktop Globe
+url=http://kde.org/applications/education/marble/;
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4' 'gpsd')
+optdepends=('gpsd: gps support')
+install=${pkgname}.install
+source=(http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2;
+'gpsd3.patch')
+sha1sums=('bbe08a57a33e06fceea3a51aed1406bc71ee02a9'
+  '3916dd6307109d70d0dd538de913c91eede81d78')
+
+build() {
+  cd ${srcdir}/marble-${pkgver}
+  patch -p1 -i ${srcdir}/gpsd3.patch
+
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../marble-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+}

Deleted: gpsd-2.96.patch
===
--- gpsd-2.96.patch 2011-08-25 08:57:13 UTC (rev 136261)
+++ gpsd-2.96.patch 2011-08-25 08:58:15 UTC (rev 136262)
@@ -1,41 +0,0 @@
 marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-+++ marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-@@ -18,6 +18,9 @@ using namespace Marble;
- 
- GpsdConnection::GpsdConnection( QObject* parent )
- : QObject( parent ),
-+#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
-+  m_gpsd(localhost, DEFAULT_GPSD_PORT),
-+#endif
-   m_timer( 0 )
- {
- connect( m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
-@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject*
- void GpsdConnection::initialize()
- {
- m_timer.stop();
-+#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
-+gps_data_t* data;
-+#else
- gps_data_t* data = m_gpsd.open();
-+#endif
- if ( data ) {
- m_status = PositionProviderStatusAcquiring;
- emit statusChanged( m_status );
-@@ -73,8 +80,16 @@ void GpsdConnection::initialize()
- void GpsdConnection::update()
- {
- #if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 3 )  
defined( PACKET_SET )
-+#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
-+if ( m_gpsd.waiting(0) ) {
-+#else
- if ( m_gpsd.waiting() ) {
-+#endif
-+#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
-+gps_data_t* data = m_gpsd.read();
-+#else
- gps_data_t* data = m_gpsd.poll();
-+#endif
- if ( data  data-set  PACKET_SET ) {
- emit gpsdInfo( *data );
- }

Deleted: kdeedu-marble.install
===
--- kdeedu-marble.install   2011-08-25 08:57:13 UTC (rev 136261)

[arch-commits] Commit in kdeedu-marble/repos/extra-x86_64 (5 files)

2011-08-25 Thread Andrea Scarpino
Date: Thursday, August 25, 2011 @ 04:59:05
  Author: andrea
Revision: 136263

archrelease: copy trunk to extra-x86_64

Added:
  kdeedu-marble/repos/extra-x86_64/PKGBUILD
(from rev 136262, kdeedu-marble/trunk/PKGBUILD)
  kdeedu-marble/repos/extra-x86_64/kdeedu-marble.install
(from rev 136262, kdeedu-marble/trunk/kdeedu-marble.install)
Deleted:
  kdeedu-marble/repos/extra-x86_64/PKGBUILD
  kdeedu-marble/repos/extra-x86_64/gpsd-2.96.patch
  kdeedu-marble/repos/extra-x86_64/kdeedu-marble.install

---+
 PKGBUILD  |   74 
 gpsd-2.96.patch   |   41 --
 kdeedu-marble.install |   24 +++
 3 files changed, 49 insertions(+), 90 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-25 08:58:15 UTC (rev 136262)
+++ PKGBUILD2011-08-25 08:59:05 UTC (rev 136263)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-
-pkgname=kdeedu-marble
-pkgver=4.7.0
-pkgrel=2
-pkgdesc=Desktop Globe
-url=http://kde.org/applications/education/marble/;
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'gpsd')
-optdepends=('gpsd: gps support')
-install=${pkgname}.install
-source=(http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2;
-'gpsd-2.96.patch')
-sha1sums=('bbe08a57a33e06fceea3a51aed1406bc71ee02a9'
-  'f44dfd3bb384e631d59b93d7dda3413795da8183')
-
-build() {
-  cd ${srcdir}/marble-${pkgver}
-  patch -p1 -i ${srcdir}/gpsd-2.96.patch
-
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../marble-${pkgver} \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-}

Copied: kdeedu-marble/repos/extra-x86_64/PKGBUILD (from rev 136262, 
kdeedu-marble/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-25 08:59:05 UTC (rev 136263)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=kdeedu-marble
+pkgver=4.7.0
+pkgrel=3
+pkgdesc=Desktop Globe
+url=http://kde.org/applications/education/marble/;
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4' 'gpsd')
+optdepends=('gpsd: gps support')
+install=${pkgname}.install
+source=(http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2;
+'gpsd3.patch')
+sha1sums=('bbe08a57a33e06fceea3a51aed1406bc71ee02a9'
+  '3916dd6307109d70d0dd538de913c91eede81d78')
+
+build() {
+  cd ${srcdir}/marble-${pkgver}
+  patch -p1 -i ${srcdir}/gpsd3.patch
+
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../marble-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+}

Deleted: gpsd-2.96.patch
===
--- gpsd-2.96.patch 2011-08-25 08:58:15 UTC (rev 136262)
+++ gpsd-2.96.patch 2011-08-25 08:59:05 UTC (rev 136263)
@@ -1,41 +0,0 @@
 marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-+++ marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-@@ -18,6 +18,9 @@ using namespace Marble;
- 
- GpsdConnection::GpsdConnection( QObject* parent )
- : QObject( parent ),
-+#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
-+  m_gpsd(localhost, DEFAULT_GPSD_PORT),
-+#endif
-   m_timer( 0 )
- {
- connect( m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
-@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject*
- void GpsdConnection::initialize()
- {
- m_timer.stop();
-+#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
-+gps_data_t* data;
-+#else
- gps_data_t* data = m_gpsd.open();
-+#endif
- if ( data ) {
- m_status = PositionProviderStatusAcquiring;
- emit statusChanged( m_status );
-@@ -73,8 +80,16 @@ void GpsdConnection::initialize()
- void GpsdConnection::update()
- {
- #if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 3 )  
defined( PACKET_SET )
-+#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
-+if ( m_gpsd.waiting(0) ) {
-+#else
- if ( m_gpsd.waiting() ) {
-+#endif
-+#if defined( GPSD_API_MAJOR_VERSION )  ( GPSD_API_MAJOR_VERSION = 5 )
-+gps_data_t* data = m_gpsd.read();
-+#else
- gps_data_t* data = m_gpsd.poll();
-+#endif
- if ( data  data-set  PACKET_SET ) {
- emit gpsdInfo( *data );
- }

Deleted: kdeedu-marble.install
===
--- kdeedu-marble.install   2011-08-25 08:58:15 UTC 

[arch-commits] Commit in xf86-video-sisusb/trunk (PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:06:33
  Author: jgc
Revision: 136264

upgpkg: xf86-video-sisusb 0.9.4-5

Rebuild for xserver 1.11RC

Modified:
  xf86-video-sisusb/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 08:59:05 UTC (rev 136263)
+++ PKGBUILD2011-08-25 09:06:33 UTC (rev 136264)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-sisusb
 pkgver=0.9.4
-pkgrel=4
+pkgrel=5
 pkgdesc=X.org SiS USB video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel')
-conflicts=('xorg-server1.10.0')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)



[arch-commits] Commit in xf86-video-sisusb/repos (staging-i686 staging-i686/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:06:45
  Author: jgc
Revision: 136265

archrelease: copy trunk to staging-i686

Added:
  xf86-video-sisusb/repos/staging-i686/
  xf86-video-sisusb/repos/staging-i686/PKGBUILD
(from rev 136264, xf86-video-sisusb/trunk/PKGBUILD)

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

Copied: xf86-video-sisusb/repos/staging-i686/PKGBUILD (from rev 136264, 
xf86-video-sisusb/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 09:06:45 UTC (rev 136265)
@@ -0,0 +1,26 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-sisusb
+pkgver=0.9.4
+pkgrel=5
+pkgdesc=X.org SiS USB video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('600fd49dffe00121f9042555fea55948653d1a7e')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-sisusb/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:06:58
  Author: jgc
Revision: 136266

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-sisusb/repos/staging-x86_64/
  xf86-video-sisusb/repos/staging-x86_64/PKGBUILD
(from rev 136265, xf86-video-sisusb/trunk/PKGBUILD)

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

Copied: xf86-video-sisusb/repos/staging-x86_64/PKGBUILD (from rev 136265, 
xf86-video-sisusb/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 09:06:58 UTC (rev 136266)
@@ -0,0 +1,26 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-sisusb
+pkgver=0.9.4
+pkgrel=5
+pkgdesc=X.org SiS USB video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('600fd49dffe00121f9042555fea55948653d1a7e')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-i128/trunk (PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:19:27
  Author: jgc
Revision: 136267

upgpkg: xf86-video-i128 1.3.4-4

Rebuild for xserver 1.11RC

Modified:
  xf86-video-i128/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 09:06:58 UTC (rev 136266)
+++ PKGBUILD2011-08-25 09:19:27 UTC (rev 136267)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-i128
 pkgver=1.3.4
-pkgrel=3
+pkgrel=4
 pkgdesc=X.org Number 9 I128 video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel')
-conflicts=('xorg-server1.10.0')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)



[arch-commits] Commit in xf86-video-i128/repos (staging-i686 staging-i686/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:19:40
  Author: jgc
Revision: 136268

archrelease: copy trunk to staging-i686

Added:
  xf86-video-i128/repos/staging-i686/
  xf86-video-i128/repos/staging-i686/PKGBUILD
(from rev 136267, xf86-video-i128/trunk/PKGBUILD)

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

Copied: xf86-video-i128/repos/staging-i686/PKGBUILD (from rev 136267, 
xf86-video-i128/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 09:19:40 UTC (rev 136268)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-i128
+pkgver=1.3.4
+pkgrel=4
+pkgdesc=X.org Number 9 I128 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('d5f755dc964eaa067b4efcafafd00814a60df775')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-i128/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:19:54
  Author: jgc
Revision: 136269

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-i128/repos/staging-x86_64/
  xf86-video-i128/repos/staging-x86_64/PKGBUILD
(from rev 136268, xf86-video-i128/trunk/PKGBUILD)

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

Copied: xf86-video-i128/repos/staging-x86_64/PKGBUILD (from rev 136268, 
xf86-video-i128/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 09:19:54 UTC (rev 136269)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-i128
+pkgver=1.3.4
+pkgrel=4
+pkgdesc=X.org Number 9 I128 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('d5f755dc964eaa067b4efcafafd00814a60df775')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-tdfx/trunk (LICENSE PKGBUILD copyright.patch)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:25:14
  Author: jgc
Revision: 136270

upgpkg: xf86-video-tdfx 1.4.3-7

Rebuild for xserver 1.11RC, add glproto makedepend, replace LICENSE 
with upstream copyright

Added:
  xf86-video-tdfx/trunk/copyright.patch
Modified:
  xf86-video-tdfx/trunk/PKGBUILD
Deleted:
  xf86-video-tdfx/trunk/LICENSE

-+
 LICENSE |  160 --
 PKGBUILD|   13 ++--
 copyright.patch |   45 +++
 3 files changed, 52 insertions(+), 166 deletions(-)

Deleted: LICENSE
===
--- LICENSE 2011-08-25 09:19:54 UTC (rev 136269)
+++ LICENSE 2011-08-25 09:25:14 UTC (rev 136270)
@@ -1,160 +0,0 @@
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-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, sub license, 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 (including the
-next paragraph) 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 NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
-
-
-/*
- * Copyright 2000 VA Linux Systems Inc., Fremont, California.
- *
- * 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 (including the next
- * paragraph) 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
- * VA LINUX SYSTEMS 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.
- */
-
-
-/*
- * GLX Hardware Device Driver for Intel i810
- * Copyright (C) 1999 Keith Whitwell
- *
- * 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
- * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS 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.
- *
- *
- */
- 
-
-/*
- * GLX Hardware Device Driver for Intel tdfx
- * Copyright (C) 1999 Keith Whitwell
- *
- * 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
- * 

[arch-commits] Commit in xf86-video-tdfx/repos (staging-i686 staging-i686/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:25:27
  Author: jgc
Revision: 136271

archrelease: copy trunk to staging-i686

Added:
  xf86-video-tdfx/repos/staging-i686/
  xf86-video-tdfx/repos/staging-i686/PKGBUILD
(from rev 136270, xf86-video-tdfx/trunk/PKGBUILD)

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

Copied: xf86-video-tdfx/repos/staging-i686/PKGBUILD (from rev 136270, 
xf86-video-tdfx/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 09:25:27 UTC (rev 136271)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-tdfx
+pkgver=1.4.3
+pkgrel=7
+pkgdesc=X.org tdfx video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc' 'tdfx-dri')
+makedepends=('xorg-server-devel=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 
'glproto')
+conflicts=('xorg-server1.10.99.902')
+options=(!libtool)
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+copyright.patch)
+md5sums=('8161bbf2b100c21b609163f0010766b3'
+ 'a3be7ac534ceb846d3f155ddbe14378f')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/copyright.patch
+  ./configure --prefix=/usr --enable-dri
+  make
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-tdfx/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:25:40
  Author: jgc
Revision: 136272

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-tdfx/repos/staging-x86_64/
  xf86-video-tdfx/repos/staging-x86_64/PKGBUILD
(from rev 136271, xf86-video-tdfx/trunk/PKGBUILD)

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

Copied: xf86-video-tdfx/repos/staging-x86_64/PKGBUILD (from rev 136271, 
xf86-video-tdfx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 09:25:40 UTC (rev 136272)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-tdfx
+pkgver=1.4.3
+pkgrel=7
+pkgdesc=X.org tdfx video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc' 'tdfx-dri')
+makedepends=('xorg-server-devel=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 
'glproto')
+conflicts=('xorg-server1.10.99.902')
+options=(!libtool)
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+copyright.patch)
+md5sums=('8161bbf2b100c21b609163f0010766b3'
+ 'a3be7ac534ceb846d3f155ddbe14378f')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/copyright.patch
+  ./configure --prefix=/usr --enable-dri
+  make
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-i740/trunk (PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:31:28
  Author: jgc
Revision: 136273

upgpkg: xf86-video-i740 1.3.2-7

Rebuild for xserver 1.11RC

Modified:
  xf86-video-i740/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 09:25:40 UTC (rev 136272)
+++ PKGBUILD2011-08-25 09:31:28 UTC (rev 136273)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-i740
 pkgver=1.3.2
-pkgrel=6
+pkgrel=7
 pkgdesc=X.org Intel i740 video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel')
-conflicts=('xorg-server1.10.0')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)



[arch-commits] Commit in xf86-video-i740/repos (staging-i686 staging-i686/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:31:41
  Author: jgc
Revision: 136274

archrelease: copy trunk to staging-i686

Added:
  xf86-video-i740/repos/staging-i686/
  xf86-video-i740/repos/staging-i686/PKGBUILD
(from rev 136273, xf86-video-i740/trunk/PKGBUILD)

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

Copied: xf86-video-i740/repos/staging-i686/PKGBUILD (from rev 136273, 
xf86-video-i740/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 09:31:41 UTC (rev 136274)
@@ -0,0 +1,26 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-i740
+pkgver=1.3.2
+pkgrel=7
+pkgdesc=X.org Intel i740 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('aadd2168153f780c487778e5fdda5473ed4b243d')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-i740/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:31:54
  Author: jgc
Revision: 136275

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-i740/repos/staging-x86_64/
  xf86-video-i740/repos/staging-x86_64/PKGBUILD
(from rev 136274, xf86-video-i740/trunk/PKGBUILD)

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

Copied: xf86-video-i740/repos/staging-x86_64/PKGBUILD (from rev 136274, 
xf86-video-i740/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 09:31:54 UTC (rev 136275)
@@ -0,0 +1,26 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-i740
+pkgver=1.3.2
+pkgrel=7
+pkgdesc=X.org Intel i740 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('aadd2168153f780c487778e5fdda5473ed4b243d')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



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

2011-08-25 Thread Tobias Powalowski
Date: Thursday, August 25, 2011 @ 05:33:10
  Author: tpowa
Revision: 136276

upgpkg: samba 3.6.0-2

removed fam depend added gamin, changed to dynamically linking #24678

Modified:
  samba/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 09:31:54 UTC (rev 136275)
+++ PKGBUILD2011-08-25 09:33:10 UTC (rev 136276)
@@ -63,7 +63,7 @@
 ln -sf /usr/lib/$i.so.0  ${pkgdir}/usr/lib/$i.so
   done
   mkdir ${pkgdir}/usr/lib/libsmb
-  cp  ${pkgdir}/usr/lib/libsmbclient.so.0 ${pkgdir}/usr/lib/libsmb
+  ln -sf /usr/lib/libsmb/libsmbclient.so.0  
${pkgdir}/usr/lib/libsmb/libsmbclient.so.0
   ln -sf /usr/lib/libsmb/libsmbclient.so.0  
${pkgdir}/usr/lib/libsmb/libsmbclient.so
   for i in libndr-krb5pac libndr-standard libndr; do
 install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0.0.1



[arch-commits] Commit in xf86-video-trident/trunk (PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:34:07
  Author: jgc
Revision: 136277

upgpkg: xf86-video-trident 1.3.4-5

Rebuild for xserver 1.11RC

Modified:
  xf86-video-trident/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 09:33:10 UTC (rev 136276)
+++ PKGBUILD2011-08-25 09:34:07 UTC (rev 136277)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-trident
 pkgver=1.3.4
-pkgrel=4
+pkgrel=5
 pkgdesc=X.org Trident video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'xf86dgaproto')
-conflicts=('xorg-server1.10.0')
+makedepends=('xorg-server-devel=1.10.99.902' 'xf86dgaproto')
+conflicts=('xorg-server1.10.99.902')
 groups=('xorg-drivers' 'xorg')
 options=(!libtool)
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
@@ -23,5 +23,5 @@
   make DESTDIR=${pkgdir} install
 
   install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
 }



[arch-commits] Commit in xf86-video-trident/repos (staging-i686 staging-i686/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:34:20
  Author: jgc
Revision: 136278

archrelease: copy trunk to staging-i686

Added:
  xf86-video-trident/repos/staging-i686/
  xf86-video-trident/repos/staging-i686/PKGBUILD
(from rev 136277, xf86-video-trident/trunk/PKGBUILD)

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

Copied: xf86-video-trident/repos/staging-i686/PKGBUILD (from rev 136277, 
xf86-video-trident/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 09:34:20 UTC (rev 136278)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-trident
+pkgver=1.3.4
+pkgrel=5
+pkgdesc=X.org Trident video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902' 'xf86dgaproto')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('7c40f5c02bddf399862782b708941e79302318af')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-trident/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:34:33
  Author: jgc
Revision: 136279

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-trident/repos/staging-x86_64/
  xf86-video-trident/repos/staging-x86_64/PKGBUILD
(from rev 136278, xf86-video-trident/trunk/PKGBUILD)

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

Copied: xf86-video-trident/repos/staging-x86_64/PKGBUILD (from rev 136278, 
xf86-video-trident/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 09:34:33 UTC (rev 136279)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-trident
+pkgver=1.3.4
+pkgrel=5
+pkgdesc=X.org Trident video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902' 'xf86dgaproto')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('7c40f5c02bddf399862782b708941e79302318af')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in samba/repos/testing-i686 (14 files)

2011-08-25 Thread Tobias Powalowski
Date: Thursday, August 25, 2011 @ 05:36:40
  Author: tpowa
Revision: 136280

archrelease: copy trunk to testing-i686

Added:
  samba/repos/testing-i686/PKGBUILD
(from rev 136279, samba/trunk/PKGBUILD)
  samba/repos/testing-i686/fix-ipv6-mount.patch
(from rev 136279, samba/trunk/fix-ipv6-mount.patch)
  samba/repos/testing-i686/samba
(from rev 136279, samba/trunk/samba)
  samba/repos/testing-i686/samba.conf.d
(from rev 136279, samba/trunk/samba.conf.d)
  samba/repos/testing-i686/samba.logrotate
(from rev 136279, samba/trunk/samba.logrotate)
  samba/repos/testing-i686/samba.pam
(from rev 136279, samba/trunk/samba.pam)
  samba/repos/testing-i686/swat.xinetd
(from rev 136279, samba/trunk/swat.xinetd)
Deleted:
  samba/repos/testing-i686/PKGBUILD
  samba/repos/testing-i686/fix-ipv6-mount.patch
  samba/repos/testing-i686/samba
  samba/repos/testing-i686/samba.conf.d
  samba/repos/testing-i686/samba.logrotate
  samba/repos/testing-i686/samba.pam
  samba/repos/testing-i686/swat.xinetd

--+
 PKGBUILD |  310 -
 fix-ipv6-mount.patch |   22 +--
 samba|  114 +-
 samba.conf.d |   14 +-
 samba.logrotate  |   18 +-
 samba.pam|6 
 swat.xinetd  |   20 +--
 7 files changed, 252 insertions(+), 252 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-25 09:34:33 UTC (rev 136279)
+++ PKGBUILD2011-08-25 09:36:40 UTC (rev 136280)
@@ -1,155 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski tp...@archlinux.org
-# Contributor: judd jvi...@zeroflux.org
-pkgbase=samba
-pkgname=('smbclient' 'samba')
-pkgver=3.6.0
-# We use the 'A' to fake out pacman's version comparators.  Samba chooses
-# to append 'a','b',etc to their subsequent releases, which pamcan
-# misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.0
-pkgrel=2
-arch=(i686 x86_64)
-url=http://www.samba.org;
-license=('GPL3')
-makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam'
-'gamin' 'gnutls=2.4.1' 'talloc' 'tdb' 'python2')
-options=(!makeflags)
-source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
-samba samba.logrotate
-swat.xinetd
-samba.pam
-samba.conf.d
-fix-ipv6-mount.patch)
-### UNINSTALL dmapi package before building!!!
-
-build() {
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  sed -i s/env python/env python2/g ../buildtools/bin/waf 
-  ./autogen-waf.sh
-  ../buildtools/bin/waf configure --prefix=/usr \
-  --libdir=/usr/lib/ \
-  --with-modulesdir=/usr/lib/samba \
-  --with-swatdir=/usr/share/samba/swat \
-  --localstatedir=/var \
-  --with-configdir=/etc/samba \
-  --with-lockdir=/var/cache/samba \
-  --with-piddir=/var/run/samba \
-  --with-pam \
-  --with-pam_smbpass \
-  --with-pammodulesdir=/lib/security \
-  --with-ads \
-  --with-acl-support \
-  --with-syslog \
-  --disable-avahi \
-  
--with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
-  --disable-rpath \
-  --disable-rpath-private-install \
-  --disable-rpath-install
-  ../buildtools/bin/waf build ${MAKEFLAGS} 
-}
-
-package_smbclient () {
-pkgdesc=Tools to access a server's filespace and printers via SMB
-depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 
'e2fsprogs' 'tdb' 'talloc')
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
-  install -m755 
bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup}
 ${pkgdir}/usr/bin/
-  for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so 
libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so 
libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so 
libtdb-wrap.so libaddns.so libcliauth.so; do
-install -m644 -D bin/shared/private/$i ${pkgdir}/usr/lib/samba/$i
-  done
-  for i in libsmbconf libnetapi libwbclient libsmbclient; do
-install -m644 -D bin/shared/$i.so.0  ${pkgdir}/usr/lib/$i.so.0
-ln -sf /usr/lib/$i.so.0  ${pkgdir}/usr/lib/$i.so
-  done
-  mkdir ${pkgdir}/usr/lib/libsmb
-  cp  ${pkgdir}/usr/lib/libsmbclient.so.0 ${pkgdir}/usr/lib/libsmb
-  ln -sf /usr/lib/libsmb/libsmbclient.so.0  
${pkgdir}/usr/lib/libsmb/libsmbclient.so
-  for i in libndr-krb5pac libndr-standard libndr; do
-install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0.0.1
-ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so.0
-ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so
-  done
-  install -m644 -D bin/shared/private/libtevent.so.0 
${pkgdir}/usr/lib/samba/libtevent.so.0.9.11
-  ln -sf /usr/lib/samba/libtevent.so.0.9.11  

[arch-commits] Commit in xf86-video-tseng/trunk (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:40:13
  Author: jgc
Revision: 136281

upgpkg: xf86-video-tseng 1.2.4-5

Rebuild for xserver 1.11RC, add patch to fix a regression

Added:
  xf86-video-tseng/trunk/fix-regression-from-pciaccess-conversion.patch
Modified:
  xf86-video-tseng/trunk/PKGBUILD

+
 PKGBUILD   |   13 ++-
 fix-regression-from-pciaccess-conversion.patch |   27 +++
 2 files changed, 35 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 09:36:40 UTC (rev 136280)
+++ PKGBUILD2011-08-25 09:40:13 UTC (rev 136281)
@@ -3,21 +3,24 @@
 
 pkgname=xf86-video-tseng
 pkgver=1.2.4
-pkgrel=4
+pkgrel=5
 pkgdesc=X.org tseng video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel')
-conflicts=('xorg-server1.10.0')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('1b45f55657b2c92f30abb0769cae57fca98d93b7')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+fix-regression-from-pciaccess-conversion.patch)
+sha1sums=('1b45f55657b2c92f30abb0769cae57fca98d93b7'
+  'df7660ec18cce3e9f04a7c70f72c75daa947e4a9')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/fix-regression-from-pciaccess-conversion.patch
   ./configure --prefix=/usr
   make
   make DESTDIR=${pkgdir} install

Added: fix-regression-from-pciaccess-conversion.patch
===
--- fix-regression-from-pciaccess-conversion.patch  
(rev 0)
+++ fix-regression-from-pciaccess-conversion.patch  2011-08-25 09:40:13 UTC 
(rev 136281)
@@ -0,0 +1,27 @@
+From 542e65deaf834c3d58c44064206445e4d18f6daa Mon Sep 17 00:00:00 2001
+From: BALATON Zoltan bala...@eik.bme.hu
+Date: Sat, 11 Jun 2011 10:50:16 +
+Subject: Fix regression from pciaccess conversion (bug#32682)
+
+Due to a typo in TsengGetFbAddress it is unable to get framebuffer base
+address and thus fails to load with an error message saying No valid
+Framebuffer address in PCI config space although previously it does
+print the correct framebuffer address.
+
+Signed-off-by: Julien Cristau jcris...@debian.org
+---
+diff --git a/src/tseng_driver.c b/src/tseng_driver.c
+index 6992671..d36b62c 100644
+--- a/src/tseng_driver.c
 b/src/tseng_driver.c
+@@ -883,7 +883,7 @@ TsengGetFbAddress(ScrnInfoPtr pScrn)
+ PDEBUG(  TsengGetFbAddress\n);
+ 
+ /* base0 is the framebuffer and base1 is the PCI IO space. */
+-if (PCI_REGION_BASE(pTseng-PciInfo, 0, REGION_MEM)) {
++if (!PCI_REGION_BASE(pTseng-PciInfo, 0, REGION_MEM)) {
+ xf86DrvMsg(pScrn-scrnIndex, X_ERROR,
+No valid Framebuffer address in PCI config space;\n);
+ return FALSE;
+--
+cgit v0.9.0.2-2-gbebe



[arch-commits] Commit in xf86-video-tseng/repos (staging-i686 staging-i686/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:40:26
  Author: jgc
Revision: 136282

archrelease: copy trunk to staging-i686

Added:
  xf86-video-tseng/repos/staging-i686/
  xf86-video-tseng/repos/staging-i686/PKGBUILD
(from rev 136281, xf86-video-tseng/trunk/PKGBUILD)

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

Copied: xf86-video-tseng/repos/staging-i686/PKGBUILD (from rev 136281, 
xf86-video-tseng/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 09:40:26 UTC (rev 136282)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-tseng
+pkgver=1.2.4
+pkgrel=5
+pkgdesc=X.org tseng video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+fix-regression-from-pciaccess-conversion.patch)
+sha1sums=('1b45f55657b2c92f30abb0769cae57fca98d93b7'
+  'df7660ec18cce3e9f04a7c70f72c75daa947e4a9')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/fix-regression-from-pciaccess-conversion.patch
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-tseng/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:40:39
  Author: jgc
Revision: 136283

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-tseng/repos/staging-x86_64/
  xf86-video-tseng/repos/staging-x86_64/PKGBUILD
(from rev 136282, xf86-video-tseng/trunk/PKGBUILD)

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

Copied: xf86-video-tseng/repos/staging-x86_64/PKGBUILD (from rev 136282, 
xf86-video-tseng/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 09:40:39 UTC (rev 136283)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-tseng
+pkgver=1.2.4
+pkgrel=5
+pkgdesc=X.org tseng video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+fix-regression-from-pciaccess-conversion.patch)
+sha1sums=('1b45f55657b2c92f30abb0769cae57fca98d93b7'
+  'df7660ec18cce3e9f04a7c70f72c75daa947e4a9')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/fix-regression-from-pciaccess-conversion.patch
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in samba/repos/testing-x86_64 (14 files)

2011-08-25 Thread Tobias Powalowski
Date: Thursday, August 25, 2011 @ 05:45:31
  Author: tpowa
Revision: 136284

archrelease: copy trunk to testing-x86_64

Added:
  samba/repos/testing-x86_64/PKGBUILD
(from rev 136283, samba/trunk/PKGBUILD)
  samba/repos/testing-x86_64/fix-ipv6-mount.patch
(from rev 136283, samba/trunk/fix-ipv6-mount.patch)
  samba/repos/testing-x86_64/samba
(from rev 136283, samba/trunk/samba)
  samba/repos/testing-x86_64/samba.conf.d
(from rev 136283, samba/trunk/samba.conf.d)
  samba/repos/testing-x86_64/samba.logrotate
(from rev 136283, samba/trunk/samba.logrotate)
  samba/repos/testing-x86_64/samba.pam
(from rev 136283, samba/trunk/samba.pam)
  samba/repos/testing-x86_64/swat.xinetd
(from rev 136283, samba/trunk/swat.xinetd)
Deleted:
  samba/repos/testing-x86_64/PKGBUILD
  samba/repos/testing-x86_64/fix-ipv6-mount.patch
  samba/repos/testing-x86_64/samba
  samba/repos/testing-x86_64/samba.conf.d
  samba/repos/testing-x86_64/samba.logrotate
  samba/repos/testing-x86_64/samba.pam
  samba/repos/testing-x86_64/swat.xinetd

--+
 PKGBUILD |  310 -
 fix-ipv6-mount.patch |   22 +--
 samba|  114 +-
 samba.conf.d |   14 +-
 samba.logrotate  |   18 +-
 samba.pam|6 
 swat.xinetd  |   20 +--
 7 files changed, 252 insertions(+), 252 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-25 09:40:39 UTC (rev 136283)
+++ PKGBUILD2011-08-25 09:45:31 UTC (rev 136284)
@@ -1,155 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski tp...@archlinux.org
-# Contributor: judd jvi...@zeroflux.org
-pkgbase=samba
-pkgname=('smbclient' 'samba')
-pkgver=3.6.0
-# We use the 'A' to fake out pacman's version comparators.  Samba chooses
-# to append 'a','b',etc to their subsequent releases, which pamcan
-# misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.0
-pkgrel=2
-arch=(i686 x86_64)
-url=http://www.samba.org;
-license=('GPL3')
-makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam'
-'gamin' 'gnutls=2.4.1' 'talloc' 'tdb' 'python2')
-options=(!makeflags)
-source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
-samba samba.logrotate
-swat.xinetd
-samba.pam
-samba.conf.d
-fix-ipv6-mount.patch)
-### UNINSTALL dmapi package before building!!!
-
-build() {
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  sed -i s/env python/env python2/g ../buildtools/bin/waf 
-  ./autogen-waf.sh
-  ../buildtools/bin/waf configure --prefix=/usr \
-  --libdir=/usr/lib/ \
-  --with-modulesdir=/usr/lib/samba \
-  --with-swatdir=/usr/share/samba/swat \
-  --localstatedir=/var \
-  --with-configdir=/etc/samba \
-  --with-lockdir=/var/cache/samba \
-  --with-piddir=/var/run/samba \
-  --with-pam \
-  --with-pam_smbpass \
-  --with-pammodulesdir=/lib/security \
-  --with-ads \
-  --with-acl-support \
-  --with-syslog \
-  --disable-avahi \
-  
--with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
-  --disable-rpath \
-  --disable-rpath-private-install \
-  --disable-rpath-install
-  ../buildtools/bin/waf build ${MAKEFLAGS} 
-}
-
-package_smbclient () {
-pkgdesc=Tools to access a server's filespace and printers via SMB
-depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 
'e2fsprogs' 'tdb' 'talloc')
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
-  install -m755 
bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup}
 ${pkgdir}/usr/bin/
-  for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so 
libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so 
libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so 
libtdb-wrap.so libaddns.so libcliauth.so; do
-install -m644 -D bin/shared/private/$i ${pkgdir}/usr/lib/samba/$i
-  done
-  for i in libsmbconf libnetapi libwbclient libsmbclient; do
-install -m644 -D bin/shared/$i.so.0  ${pkgdir}/usr/lib/$i.so.0
-ln -sf /usr/lib/$i.so.0  ${pkgdir}/usr/lib/$i.so
-  done
-  mkdir ${pkgdir}/usr/lib/libsmb
-  cp  ${pkgdir}/usr/lib/libsmbclient.so.0 ${pkgdir}/usr/lib/libsmb
-  ln -sf /usr/lib/libsmb/libsmbclient.so.0  
${pkgdir}/usr/lib/libsmb/libsmbclient.so
-  for i in libndr-krb5pac libndr-standard libndr; do
-install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0.0.1
-ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so.0
-ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so
-  done
-  install -m644 -D bin/shared/private/libtevent.so.0 
${pkgdir}/usr/lib/samba/libtevent.so.0.9.11
-  ln -sf 

[arch-commits] Commit in xf86-video-mach64/trunk (PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:47:01
  Author: jgc
Revision: 136285

upgpkg: xf86-video-mach64 6.9.0-2

Rebuild for xserver 1.11RC

Modified:
  xf86-video-mach64/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 09:45:31 UTC (rev 136284)
+++ PKGBUILD2011-08-25 09:47:01 UTC (rev 136285)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-mach64
 pkgver=6.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc=X.org mach64 video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc' 'mach64-dri')
-makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa')
-conflicts=('xorg-server1.10.0')
+makedepends=('xorg-server-devel=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 
'glproto')
+conflicts=('xorg-server1.10.99.902')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)



[arch-commits] Commit in xf86-video-mach64/repos (staging-i686 staging-i686/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:47:14
  Author: jgc
Revision: 136286

archrelease: copy trunk to staging-i686

Added:
  xf86-video-mach64/repos/staging-i686/
  xf86-video-mach64/repos/staging-i686/PKGBUILD
(from rev 136285, xf86-video-mach64/trunk/PKGBUILD)

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

Copied: xf86-video-mach64/repos/staging-i686/PKGBUILD (from rev 136285, 
xf86-video-mach64/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 09:47:14 UTC (rev 136286)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-mach64
+pkgver=6.9.0
+pkgrel=2
+pkgdesc=X.org mach64 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc' 'mach64-dri')
+makedepends=('xorg-server-devel=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 
'glproto')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('95a7ec9761fe11dadbcd9078c55148198a91b2f1')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --enable-dri
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-mach64/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 05:47:27
  Author: jgc
Revision: 136287

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-mach64/repos/staging-x86_64/
  xf86-video-mach64/repos/staging-x86_64/PKGBUILD
(from rev 136286, xf86-video-mach64/trunk/PKGBUILD)

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

Copied: xf86-video-mach64/repos/staging-x86_64/PKGBUILD (from rev 136286, 
xf86-video-mach64/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 09:47:27 UTC (rev 136287)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-mach64
+pkgver=6.9.0
+pkgrel=2
+pkgdesc=X.org mach64 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc' 'mach64-dri')
+makedepends=('xorg-server-devel=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 
'glproto')
+conflicts=('xorg-server1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('95a7ec9761fe11dadbcd9078c55148198a91b2f1')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --enable-dri
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-unichrome/trunk (PKGBUILD drm-include.patch)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 06:05:25
  Author: jgc
Revision: 136288

upgpkg: xf86-video-unichrome 0.2.7-6

Rebuild for xserver 1.11RC, update to last git version

Modified:
  xf86-video-unichrome/trunk/PKGBUILD
Deleted:
  xf86-video-unichrome/trunk/drm-include.patch

---+
 PKGBUILD  |   19 +++
 drm-include.patch |   11 ---
 2 files changed, 7 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 09:47:27 UTC (rev 136287)
+++ PKGBUILD2011-08-25 10:05:25 UTC (rev 136288)
@@ -3,29 +3,24 @@
 
 pkgname=xf86-video-unichrome
 pkgver=0.2.7
-pkgrel=5
-_gitversion=cd12cce88ff886031c23c743569fba97eccace4e
+pkgrel=6
+_gitversion=b917bee87db8a65b8e8da0ca12c24a176c9e9fb2
 pkgdesc=Unichrome video drivers for X.Org
 arch=(i686 x86_64)
 url=http://unichrome.sf.net/;
 license=('custom')
 depends=('glibc' 'unichrome-dri')
-makedepends=('xorg-server-devel' 'libx11' 'libdrm' 'xf86driproto' 'mesa' 
'libxvmc')
+makedepends=('xorg-server-devel=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 
'mesa' 'libxvmc' 'glproto')
 options=('!libtool')
-conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 
'xorg-server1.10.0')
-source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2
-drm-include.patch
-LICENSE)
-md5sums=('c64332e6c386ed9a580116e131f288f4'
- '4a9bf2e3ef338c170a2f58988ebb97dc'
- '6ea7d64c87c5c32201a1e38e3336e44a')
+conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 
'xorg-server1.10.99.902')
+source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2)
+md5sums=('f7adef052de08a01af86e245d1932239')
 
 build() {
   cd ${srcdir}/${pkgname}-${_gitversion}
-  patch -Np0 -i ${srcdir}/drm-include.patch
   ./autogen.sh --prefix=/usr --enable-dri
   make
   make DESTDIR=${pkgdir} install
   install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/
+  install -m644 debian/copyright 
${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 }

Deleted: drm-include.patch
===
--- drm-include.patch   2011-08-25 09:47:27 UTC (rev 136287)
+++ drm-include.patch   2011-08-25 10:05:25 UTC (rev 136288)
@@ -1,11 +0,0 @@
 src/via_memory.h.orig  2010-05-09 16:17:00.143352805 +0200
-+++ src/via_memory.h   2010-05-09 16:17:14.433351301 +0200
-@@ -30,7 +30,7 @@
- 
- /* don't include local via_drm.h when using modular */
- #ifdef HAVE_CONFIG_H
--#include drm/via_drm.h
-+#include via_drm.h
- #else
- #include via_drm.h
- #endif



[arch-commits] Commit in xf86-video-unichrome/repos (3 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 06:05:46
  Author: jgc
Revision: 136289

archrelease: copy trunk to staging-i686

Added:
  xf86-video-unichrome/repos/staging-i686/
  xf86-video-unichrome/repos/staging-i686/LICENSE
(from rev 136288, xf86-video-unichrome/trunk/LICENSE)
  xf86-video-unichrome/repos/staging-i686/PKGBUILD
(from rev 136288, xf86-video-unichrome/trunk/PKGBUILD)

--+
 LICENSE  |   23 +++
 PKGBUILD |   26 ++
 2 files changed, 49 insertions(+)

Copied: xf86-video-unichrome/repos/staging-i686/LICENSE (from rev 136288, 
xf86-video-unichrome/trunk/LICENSE)
===
--- staging-i686/LICENSE(rev 0)
+++ staging-i686/LICENSE2011-08-25 10:05:46 UTC (rev 136289)
@@ -0,0 +1,23 @@
+Copyright (c) 2004-2007 Luc Verhaegen. All Rights Reserved.
+Copyright (c) 2004-2005 The Unichrome Project. All Rights Reserved.
+Copyright (c) 1998-2003 VIA Technologies, Inc. All Rights Reserved.
+Copyright (c) 2001-2003 S3 Graphics, 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, sub license,
+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 (including the
+next paragraph) 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 NON-INFRINGEMENT. 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: xf86-video-unichrome/repos/staging-i686/PKGBUILD (from rev 136288, 
xf86-video-unichrome/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 10:05:46 UTC (rev 136289)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-unichrome
+pkgver=0.2.7
+pkgrel=6
+_gitversion=b917bee87db8a65b8e8da0ca12c24a176c9e9fb2
+pkgdesc=Unichrome video drivers for X.Org
+arch=(i686 x86_64)
+url=http://unichrome.sf.net/;
+license=('custom')
+depends=('glibc' 'unichrome-dri')
+makedepends=('xorg-server-devel=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 
'mesa' 'libxvmc' 'glproto')
+options=('!libtool')
+conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 
'xorg-server1.10.99.902')
+source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2)
+md5sums=('f7adef052de08a01af86e245d1932239')
+
+build() {
+  cd ${srcdir}/${pkgname}-${_gitversion}
+  ./autogen.sh --prefix=/usr --enable-dri
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 debian/copyright 
${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}



[arch-commits] Commit in xf86-video-unichrome/repos (3 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 06:06:07
  Author: jgc
Revision: 136290

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-unichrome/repos/staging-x86_64/
  xf86-video-unichrome/repos/staging-x86_64/LICENSE
(from rev 136289, xf86-video-unichrome/trunk/LICENSE)
  xf86-video-unichrome/repos/staging-x86_64/PKGBUILD
(from rev 136289, xf86-video-unichrome/trunk/PKGBUILD)

--+
 LICENSE  |   23 +++
 PKGBUILD |   26 ++
 2 files changed, 49 insertions(+)

Copied: xf86-video-unichrome/repos/staging-x86_64/LICENSE (from rev 136289, 
xf86-video-unichrome/trunk/LICENSE)
===
--- staging-x86_64/LICENSE  (rev 0)
+++ staging-x86_64/LICENSE  2011-08-25 10:06:07 UTC (rev 136290)
@@ -0,0 +1,23 @@
+Copyright (c) 2004-2007 Luc Verhaegen. All Rights Reserved.
+Copyright (c) 2004-2005 The Unichrome Project. All Rights Reserved.
+Copyright (c) 1998-2003 VIA Technologies, Inc. All Rights Reserved.
+Copyright (c) 2001-2003 S3 Graphics, 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, sub license,
+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 (including the
+next paragraph) 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 NON-INFRINGEMENT. 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: xf86-video-unichrome/repos/staging-x86_64/PKGBUILD (from rev 136289, 
xf86-video-unichrome/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 10:06:07 UTC (rev 136290)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-unichrome
+pkgver=0.2.7
+pkgrel=6
+_gitversion=b917bee87db8a65b8e8da0ca12c24a176c9e9fb2
+pkgdesc=Unichrome video drivers for X.Org
+arch=(i686 x86_64)
+url=http://unichrome.sf.net/;
+license=('custom')
+depends=('glibc' 'unichrome-dri')
+makedepends=('xorg-server-devel=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 
'mesa' 'libxvmc' 'glproto')
+options=('!libtool')
+conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 
'xorg-server1.10.99.902')
+source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2)
+md5sums=('f7adef052de08a01af86e245d1932239')
+
+build() {
+  cd ${srcdir}/${pkgname}-${_gitversion}
+  ./autogen.sh --prefix=/usr --enable-dri
+  make
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 debian/copyright 
${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}



[arch-commits] Commit in xf86-video-mga/trunk (PKGBUILD git-fixes.patch)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 06:21:33
  Author: jgc
Revision: 136291

upgpkg: xf86-video-mga 1.4.13-4

Rebuild for xserver 1.11RC, update to last git version

Added:
  xf86-video-mga/trunk/git-fixes.patch
Modified:
  xf86-video-mga/trunk/PKGBUILD

-+
 PKGBUILD|   13 
 git-fixes.patch |  800 ++
 2 files changed, 808 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 10:06:07 UTC (rev 136290)
+++ PKGBUILD2011-08-25 10:21:33 UTC (rev 136291)
@@ -3,21 +3,24 @@
 
 pkgname=xf86-video-mga
 pkgver=1.4.13
-pkgrel=3
+pkgrel=4
 pkgdesc=X.org mga video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc' 'mga-dri')
-makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa')
-conflicts=('xorg-server1.10.0')
+makedepends=('xorg-server-devel=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 
'glproto')
+conflicts=('xorg-server1.10.99.902')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('55aa185cf381def4b5905c8b93694b8dfbd5c378')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('55aa185cf381def4b5905c8b93694b8dfbd5c378'
+  '74782a39533ef475bd02b8b4645775879494e568')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr --enable-dri
   make
   make DESTDIR=${pkgdir} install

Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2011-08-25 10:21:33 UTC (rev 136291)
@@ -0,0 +1,800 @@
+diff --git a/man/Makefile.am b/man/Makefile.am
+index b3688ce..1ea26b3 100644
+--- a/man/Makefile.am
 b/man/Makefile.am
+@@ -1,5 +1,5 @@
+ #
+-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
++# Copyright (c) 2005, Oracle and/or its affiliates. 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),
+@@ -19,7 +19,7 @@
+ # 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.
+-# 
++#
+ 
+ drivermandir = $(DRIVER_MAN_DIR)
+ 
+diff --git a/man/mga.man b/man/mga.man
+index 3a7a9f8..e1e674f 100644
+--- a/man/mga.man
 b/man/mga.man
+@@ -1,4 +1,3 @@
+-.\ $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man,v 1.7 
2003/04/03 07:11:03 herrb Exp $ 
+ .\ shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH mga __drivermansuffix__ __vendorversion__
+diff --git a/src/binding.h b/src/binding.h
+index 6dcd1e9..57e9b92 100644
+--- a/src/binding.h
 b/src/binding.h
+@@ -13,7 +13,6 @@
+  @end
+ 
+ 
***/
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h,v 
1.3 2000/10/24 22:45:08 dawes Exp $ */
+ 
+ #ifndef _BINDING
+ #define _BINDING
+diff --git a/src/mga.h b/src/mga.h
+index 2cb3d88..c520e86 100644
+--- a/src/mga.h
 b/src/mga.h
+@@ -1,4 +1,3 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h,v 1.87tsi Exp $ 
*/
+ /*
+  * MGA Millennium (MGA2064W) functions
+  *
+@@ -137,6 +136,10 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*);
+ #define PCI_CHIP_MGAG200_EH_PCI 0x0533
+ #endif
+ 
++#ifndef PCI_CHIP_MGAG200_ER_PCI
++#define PCI_CHIP_MGAG200_ER_PCI 0x0534
++#endif
++
+ /*
+  * Read/write to the DAC via MMIO 
+  */
+@@ -200,7 +203,9 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*);
+ typedef struct {
+ unsigned char ExtVga[6];
+ unsigned char DacClk[6];
+-unsigned char * DacRegs;
++unsigned char ExtVga_Index24;
++unsigned char Dac_Index90;
++unsigned char * DacRegs;
+ unsigned long crtc2[0x58];
+ unsigned char dac2[0x21];
+ CARD32Option;
+@@ -479,6 +484,7 @@ typedef struct {
+ int is_G200WB:1;
+ int is_G200EV:1;
+ int is_G200EH:1;
++int is_G200ER:1;
+ 
+ int KVM;
+ 
+diff --git a/src/mga_common.h b/src/mga_common.h
+index 90f6b37..81be2bc 100644
+--- a/src/mga_common.h
 b/src/mga_common.h
+@@ -25,8 +25,6 @@
+  * Converted to common header format:
+  *   Jens Owen j...@tungstengraphics.com
+  *
+- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_common.h,v 1.2 
2002/12/16 16:19:18 dawes Exp $
+- *
+  */
+ 
+ #ifndef _MGA_COMMON_H_
+diff --git a/src/mga_dacG.c b/src/mga_dacG.c
+index df00765..fca1031 100644
+--- a/src/mga_dacG.c
 b/src/mga_dacG.c
+@@ -444,6 +444,116 @@ MGAG200WBPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
+ outMGAdac(MGA1064_REMHEADCTL, 

[arch-commits] Commit in xf86-video-mga/repos (staging-i686 staging-i686/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 06:21:46
  Author: jgc
Revision: 136292

archrelease: copy trunk to staging-i686

Added:
  xf86-video-mga/repos/staging-i686/
  xf86-video-mga/repos/staging-i686/PKGBUILD
(from rev 136291, xf86-video-mga/trunk/PKGBUILD)

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

Copied: xf86-video-mga/repos/staging-i686/PKGBUILD (from rev 136291, 
xf86-video-mga/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 10:21:46 UTC (rev 136292)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-mga
+pkgver=1.4.13
+pkgrel=4
+pkgdesc=X.org mga video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc' 'mga-dri')
+makedepends=('xorg-server-devel=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 
'glproto')
+conflicts=('xorg-server1.10.99.902')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('55aa185cf381def4b5905c8b93694b8dfbd5c378'
+  '74782a39533ef475bd02b8b4645775879494e568')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+  ./configure --prefix=/usr --enable-dri
+  make
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-mga/repos (staging-x86_64 staging-x86_64/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 06:21:59
  Author: jgc
Revision: 136293

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-mga/repos/staging-x86_64/
  xf86-video-mga/repos/staging-x86_64/PKGBUILD
(from rev 136292, xf86-video-mga/trunk/PKGBUILD)

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

Copied: xf86-video-mga/repos/staging-x86_64/PKGBUILD (from rev 136292, 
xf86-video-mga/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 10:21:59 UTC (rev 136293)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-mga
+pkgver=1.4.13
+pkgrel=4
+pkgdesc=X.org mga video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc' 'mga-dri')
+makedepends=('xorg-server-devel=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 
'glproto')
+conflicts=('xorg-server1.10.99.902')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('55aa185cf381def4b5905c8b93694b8dfbd5c378'
+  '74782a39533ef475bd02b8b4645775879494e568')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+  ./configure --prefix=/usr --enable-dri
+  make
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



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

2011-08-25 Thread Tobias Powalowski
Date: Thursday, August 25, 2011 @ 06:25:56
  Author: tpowa
Revision: 136294

db-remove: samba removed by tpowa

Deleted:
  samba/repos/testing-i686/



[arch-commits] Commit in samba/repos (testing-x86_64)

2011-08-25 Thread Tobias Powalowski
Date: Thursday, August 25, 2011 @ 06:26:03
  Author: tpowa
Revision: 136295

db-remove: samba removed by tpowa

Deleted:
  samba/repos/testing-x86_64/



[arch-commits] Commit in xf86-video-v4l/trunk (PKGBUILD git-fixes.patch)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 06:36:07
  Author: jgc
Revision: 136296

upgpkg: xf86-video-v4l 0.2.0-9

Rebuild for xserver 1.11RC, update to last git version

Added:
  xf86-video-v4l/trunk/git-fixes.patch
Modified:
  xf86-video-v4l/trunk/PKGBUILD

-+
 PKGBUILD|9 
 git-fixes.patch | 4362 ++
 2 files changed, 4369 insertions(+), 2 deletions(-)

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


[arch-commits] Commit in xf86-video-v4l/repos (3 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 06:36:28
  Author: jgc
Revision: 136297

archrelease: copy trunk to staging-i686

Added:
  xf86-video-v4l/repos/staging-i686/
  xf86-video-v4l/repos/staging-i686/LICENSE
(from rev 136296, xf86-video-v4l/trunk/LICENSE)
  xf86-video-v4l/repos/staging-i686/PKGBUILD
(from rev 136296, xf86-video-v4l/trunk/PKGBUILD)

--+
 LICENSE  |  826 +
 PKGBUILD |   32 ++
 2 files changed, 858 insertions(+)

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


[arch-commits] Commit in xf86-video-v4l/repos (3 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 06:36:50
  Author: jgc
Revision: 136298

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-v4l/repos/staging-x86_64/
  xf86-video-v4l/repos/staging-x86_64/LICENSE
(from rev 136297, xf86-video-v4l/trunk/LICENSE)
  xf86-video-v4l/repos/staging-x86_64/PKGBUILD
(from rev 136297, xf86-video-v4l/trunk/PKGBUILD)

--+
 LICENSE  |  826 +
 PKGBUILD |   32 ++
 2 files changed, 858 insertions(+)

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


[arch-commits] Commit in xf86-video-s3virge/trunk (LICENSE PKGBUILD copyright.patch)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 07:05:39
  Author: jgc
Revision: 136299

upgpkg: xf86-video-s3virge 1.10.4-6

Rebuild for xserver 1.11RC, replace LICENSE by upstream copyright patch 
from git

Added:
  xf86-video-s3virge/trunk/copyright.patch
Modified:
  xf86-video-s3virge/trunk/PKGBUILD
Deleted:
  xf86-video-s3virge/trunk/LICENSE

-+
 LICENSE |   25 
 PKGBUILD|   14 +
 copyright.patch |   82 ++
 3 files changed, 90 insertions(+), 31 deletions(-)

Deleted: LICENSE
===
--- LICENSE 2011-08-25 10:36:50 UTC (rev 136298)
+++ LICENSE 2011-08-25 11:05:39 UTC (rev 136299)
@@ -1,25 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-Copyright (C) 1994-2000 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, FIT-
-NESS 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.

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 10:36:50 UTC (rev 136298)
+++ PKGBUILD2011-08-25 11:05:39 UTC (rev 136299)
@@ -4,26 +4,28 @@
 
 pkgname=xf86-video-s3virge
 pkgver=1.10.4
-pkgrel=5
+pkgrel=6
 pkgdesc=X.org S3 Virge video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server-devel')
-conflicts=('xorg-server1.10.0')
+makedepends=('pkgconfig' 'xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-LICENSE)
-md5sums=('6517bbbf808c700502d51acdc44662f8' 'c0a38dfcd6288eff39322f7c584b8d1e')
+copyright.patch)
+md5sums=('6517bbbf808c700502d51acdc44662f8'
+ 'f91fb259e3632fb9130fcbe69ecd9d6a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/copyright.patch
   ./configure --prefix=/usr
   make
   make DESTDIR=${pkgdir} install
 
   install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
 }

Added: copyright.patch
===
--- copyright.patch (rev 0)
+++ copyright.patch 2011-08-25 11:05:39 UTC (rev 136299)
@@ -0,0 +1,82 @@
+From c26da404906258951341c4c4ace793f2dfdc47f8 Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon mems...@videotron.ca
+Date: Sun, 13 Jun 2010 14:26:32 +
+Subject: COPYING: update file with Copyright notices from source code.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+---
+diff --git a/COPYING b/COPYING
+index 7f33cbf..727ca51 100644
+--- a/COPYING
 b/COPYING
+@@ -1,12 +1,60 @@
+-This is a stub file.  This package has not yet had its complete licensing
+-information compiled.  Please see the individual source files for details on
+-your rights to use and modify this software.
++Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
+ 
+-Please submit updated COPYING files to the Xorg bugzilla:
++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:
+ 
+-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
++The above copyright 

[arch-commits] Commit in xf86-video-s3virge/repos (staging-i686 staging-i686/PKGBUILD)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 07:05:52
  Author: jgc
Revision: 136300

archrelease: copy trunk to staging-i686

Added:
  xf86-video-s3virge/repos/staging-i686/
  xf86-video-s3virge/repos/staging-i686/PKGBUILD
(from rev 136299, xf86-video-s3virge/trunk/PKGBUILD)

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

Copied: xf86-video-s3virge/repos/staging-i686/PKGBUILD (from rev 136299, 
xf86-video-s3virge/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-08-25 11:05:52 UTC (rev 136300)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Alexander Baldeck alexan...@archlinux.org
+
+pkgname=xf86-video-s3virge
+pkgver=1.10.4
+pkgrel=6
+pkgdesc=X.org S3 Virge video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('pkgconfig' 'xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+options=(!libtool)
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+copyright.patch)
+md5sums=('6517bbbf808c700502d51acdc44662f8'
+ 'f91fb259e3632fb9130fcbe69ecd9d6a')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/copyright.patch
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-s3virge/repos (2 files)

2011-08-25 Thread Jan de Groot
Date: Thursday, August 25, 2011 @ 07:06:05
  Author: jgc
Revision: 136301

archrelease: copy trunk to staging-x86_64

Added:
  xf86-video-s3virge/repos/staging-x86_64/
  xf86-video-s3virge/repos/staging-x86_64/PKGBUILD
(from rev 136300, xf86-video-s3virge/trunk/PKGBUILD)

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

Copied: xf86-video-s3virge/repos/staging-x86_64/PKGBUILD (from rev 136300, 
xf86-video-s3virge/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-08-25 11:06:05 UTC (rev 136301)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Alexander Baldeck alexan...@archlinux.org
+
+pkgname=xf86-video-s3virge
+pkgver=1.10.4
+pkgrel=6
+pkgdesc=X.org S3 Virge video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('pkgconfig' 'xorg-server-devel=1.10.99.902')
+conflicts=('xorg-server1.10.99.902')
+options=(!libtool)
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+copyright.patch)
+md5sums=('6517bbbf808c700502d51acdc44662f8'
+ 'f91fb259e3632fb9130fcbe69ecd9d6a')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/copyright.patch
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



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

2011-08-25 Thread Ionut Biru
Date: Thursday, August 25, 2011 @ 08:32:28
  Author: ibiru
Revision: 136302

update to 10.3.183.7

Modified:
  flashplugin/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 11:06:05 UTC (rev 136301)
+++ PKGBUILD2011-08-25 12:32:28 UTC (rev 136302)
@@ -3,7 +3,7 @@
 
 pkgname=flashplugin
 _licensefile='Reader_Player_AIR_WWEULA-Combined-20080204_1313.pdf'
-pkgver=10.3.183.5
+pkgver=10.3.183.7
 pkgrel=1
 pkgdesc='Adobe Flash Player'
 url='http://get.adobe.com/flashplayer'
@@ -18,7 +18,7 @@
 
source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz'
 http://www.adobe.com/products/eulas/pdfs/${_licensefile};
  mms.cfg)
-md5sums=('3974e5a035f719915d35ac6a2f938fd8'
+md5sums=('8e135a901e8c0b3350ec57819fd6166f'
  '1636037610ee2aa35c5fb736a697b7e0'
  'f34aae6279b40e0bd2abfb0d9963d7b8')
 



[arch-commits] Commit in flashplugin/repos/extra-i686 (6 files)

2011-08-25 Thread Ionut Biru
Date: Thursday, August 25, 2011 @ 08:33:42
  Author: ibiru
Revision: 136303

archrelease: copy trunk to extra-i686

Added:
  flashplugin/repos/extra-i686/PKGBUILD
(from rev 136302, flashplugin/trunk/PKGBUILD)
  flashplugin/repos/extra-i686/flashplugin.install
(from rev 136302, flashplugin/trunk/flashplugin.install)
  flashplugin/repos/extra-i686/mms.cfg
(from rev 136302, flashplugin/trunk/mms.cfg)
Deleted:
  flashplugin/repos/extra-i686/PKGBUILD
  flashplugin/repos/extra-i686/flashplugin.install
  flashplugin/repos/extra-i686/mms.cfg

-+
 PKGBUILD|   72 +-
 flashplugin.install |   28 +--
 mms.cfg |4 +-
 3 files changed, 52 insertions(+), 52 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-25 12:32:28 UTC (rev 136302)
+++ PKGBUILD2011-08-25 12:33:42 UTC (rev 136303)
@@ -1,36 +0,0 @@
-# $Id$
-# Contributor: Andrea Scarpino and...@archlinux.org
-
-pkgname=flashplugin
-_licensefile='Reader_Player_AIR_WWEULA-Combined-20080204_1313.pdf'
-pkgver=10.3.183.5
-pkgrel=1
-pkgdesc='Adobe Flash Player'
-url='http://get.adobe.com/flashplayer'
-arch=('i686') # 'x86_64')
-depends=('mozilla-common' 'libxt' 'gtk2' 'nss' 'curl' 'hicolor-icon-theme')
-optdepends=('libvdpau: GPU acceleration on Nvidia card')
-provides=('flashplayer')
-license=('custom')
-options=(!strip)
-install=flashplugin.install
-backup=(etc/adobe/mms.cfg)
-source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz'
-http://www.adobe.com/products/eulas/pdfs/${_licensefile};
- mms.cfg)
-md5sums=('3974e5a035f719915d35ac6a2f938fd8'
- '1636037610ee2aa35c5fb736a697b7e0'
- 'f34aae6279b40e0bd2abfb0d9963d7b8')
-
-package () {
-cd ${srcdir}
-install -Dm755 libflashplayer.so 
${pkgdir}/usr/lib/mozilla/plugins/libflashplayer.so
-install -Dm755 usr/bin/flash-player-properties 
${pkgdir}/usr/bin/flash-player-properties
-for i in 16x16 22x22 24x24 32x32 48x48; do
-install -Dm644 
usr/share/icons/hicolor/${i}/apps/flash-player-properties.png \
-
${pkgdir}/usr/share/icons/hicolor/${i}/apps/flash-player-properties.png
-done
-install -Dm644 usr/share/applications/flash-player-properties.desktop 
${pkgdir}/usr/share/applications/flash-player-properties.desktop
-install -Dm644 ${_licensefile} 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf
-install -Dm644 ${srcdir}/mms.cfg ${pkgdir}/etc/adobe/mms.cfg
-}

Copied: flashplugin/repos/extra-i686/PKGBUILD (from rev 136302, 
flashplugin/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-25 12:33:42 UTC (rev 136303)
@@ -0,0 +1,36 @@
+# $Id$
+# Contributor: Andrea Scarpino and...@archlinux.org
+
+pkgname=flashplugin
+_licensefile='Reader_Player_AIR_WWEULA-Combined-20080204_1313.pdf'
+pkgver=10.3.183.7
+pkgrel=1
+pkgdesc='Adobe Flash Player'
+url='http://get.adobe.com/flashplayer'
+arch=('i686') # 'x86_64')
+depends=('mozilla-common' 'libxt' 'gtk2' 'nss' 'curl' 'hicolor-icon-theme')
+optdepends=('libvdpau: GPU acceleration on Nvidia card')
+provides=('flashplayer')
+license=('custom')
+options=(!strip)
+install=flashplugin.install
+backup=(etc/adobe/mms.cfg)
+source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz'
+http://www.adobe.com/products/eulas/pdfs/${_licensefile};
+ mms.cfg)
+md5sums=('8e135a901e8c0b3350ec57819fd6166f'
+ '1636037610ee2aa35c5fb736a697b7e0'
+ 'f34aae6279b40e0bd2abfb0d9963d7b8')
+
+package () {
+cd ${srcdir}
+install -Dm755 libflashplayer.so 
${pkgdir}/usr/lib/mozilla/plugins/libflashplayer.so
+install -Dm755 usr/bin/flash-player-properties 
${pkgdir}/usr/bin/flash-player-properties
+for i in 16x16 22x22 24x24 32x32 48x48; do
+install -Dm644 
usr/share/icons/hicolor/${i}/apps/flash-player-properties.png \
+
${pkgdir}/usr/share/icons/hicolor/${i}/apps/flash-player-properties.png
+done
+install -Dm644 usr/share/applications/flash-player-properties.desktop 
${pkgdir}/usr/share/applications/flash-player-properties.desktop
+install -Dm644 ${_licensefile} 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf
+install -Dm644 ${srcdir}/mms.cfg ${pkgdir}/etc/adobe/mms.cfg
+}

Deleted: flashplugin.install
===
--- flashplugin.install 2011-08-25 12:32:28 UTC (rev 136302)
+++ flashplugin.install 2011-08-25 12:33:42 UTC (rev 136303)
@@ -1,14 +0,0 @@
-post_install() {
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-echo   
-echo   If you have an NVIDIA card that supports libvdpau or Broadcom 
Crystal HD chips,
-echo   uncomment EnableLinuxHWVideoDecode=1 from 

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

2011-08-25 Thread Tobias Powalowski
Date: Thursday, August 25, 2011 @ 11:48:21
  Author: tpowa
Revision: 136304

upgpkg: samba 3.6.0-3

fix building issues and paths, now ready for testing

Modified:
  samba/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 12:33:42 UTC (rev 136303)
+++ PKGBUILD2011-08-25 15:48:21 UTC (rev 136304)
@@ -8,7 +8,7 @@
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.6.0
-pkgrel=2
+pkgrel=3
 arch=(i686 x86_64)
 url=http://www.samba.org;
 license=('GPL3')
@@ -27,14 +27,20 @@
   cd ${srcdir}/${pkgbase}-${_realver}/source3
   sed -i s/env python/env python2/g ../buildtools/bin/waf 
   ./autogen-waf.sh
+  # everything needs to be specified :/
   ../buildtools/bin/waf configure --prefix=/usr \
+  --with-privatedir=/etc/samba/private \
   --libdir=/usr/lib/ \
   --with-modulesdir=/usr/lib/samba \
   --with-swatdir=/usr/share/samba/swat \
   --localstatedir=/var \
   --with-configdir=/etc/samba \
   --with-lockdir=/var/cache/samba \
+  --with-cachedir=/var/cache/samba \
+  --with-statedir=/var/cache/samba \
   --with-piddir=/var/run/samba \
+  --with-logfilebase=/var/log/samba \
+  --sysconfdir=/etc \
   --with-pam \
   --with-pam_smbpass \
   --with-pammodulesdir=/lib/security \
@@ -46,6 +52,8 @@
   --disable-rpath \
   --disable-rpath-private-install \
   --disable-rpath-install
+  #fix the shitty build system!
+   sed -i -e 's#/etc/smb.conf#/etc/samba/smb.conf#g' 
bin/default/source3/include/config.h
   ../buildtools/bin/waf build ${MAKEFLAGS} 
 }
 
@@ -56,7 +64,7 @@
   mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
   install -m755 
bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup}
 ${pkgdir}/usr/bin/
   for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so 
libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so 
libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so 
libtdb-wrap.so libaddns.so libcliauth.so; do
-install -m644 -D bin/shared/private/$i ${pkgdir}/usr/lib/samba/$i
+install -m644 -D bin/shared/private/$i ${pkgdir}/usr/lib/$i
   done
   for i in libsmbconf libnetapi libwbclient libsmbclient; do
 install -m644 -D bin/shared/$i.so.0  ${pkgdir}/usr/lib/$i.so.0
@@ -70,8 +78,8 @@
 ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so.0
 ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so
   done
-  install -m644 -D bin/shared/private/libtevent.so.0 
${pkgdir}/usr/lib/samba/libtevent.so.0.9.11
-  ln -sf /usr/lib/samba/libtevent.so.0.9.11  
${pkgdir}/usr/lib/samba/libtevent.so.0
+  install -m644 -D bin/shared/private/libtevent.so.0 
${pkgdir}/usr/lib/libtevent.so.0.9.11
+  ln -sf /usr/lib/samba/libtevent.so.0.9.11  ${pkgdir}/usr/lib/libtevent.so.0
   install -m755 script/smbtar ${pkgdir}/usr/bin/
   mkdir -p ${pkgdir}/usr/lib/cups/backend
   ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
@@ -98,10 +106,9 @@
   cd ${srcdir}/samba-${_realver}/source3
   mkdir -p ${pkgdir}/etc/samba/private
   chmod 700 ${pkgdir}/etc/samba/private
-  make DESTDIR=${pkgdir} install
+  ../buildtools/bin/waf install --destdir=${pkgdir}
   chmod 644 ${pkgdir}/usr/include/*.h
   rm -rf ${pkgdir}/usr/var
-  #(cd script; cp installbin.sh i; cat i | sed s/\/sbin\///  installbin.sh)
   install -D -m755 ${startdir}/samba ${pkgdir}/etc/rc.d/samba
   install -D -m644 ${startdir}/samba.conf.d ${pkgdir}/etc/conf.d/samba
   mkdir -p ${pkgdir}/etc/samba
@@ -123,6 +130,7 @@
   for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so 
libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so 
libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so 
libtdb-wrap.so libaddns.so libcliauth.so libtevent.so.0.9.11 libtevent.so.0; do
   rm -f ${pkgdir}/usr/lib/samba/$i
   done
+  mv ${pkgdir}/usr/lib/samba/*.so ${pkgdir}/usr/lib
   for i in libndr-krb5pac.* libsmbconf.*  libndr-standard.* libndr.* 
libnetapi.* libwbclient.* libsmbclient.*; do
   rm -f ${pkgdir}/usr/lib/$i
   done



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

2011-08-25 Thread Tobias Powalowski
Date: Thursday, August 25, 2011 @ 11:59:32
  Author: tpowa
Revision: 136305

remove wrong directory

Added:
  samba/repos/testing-i686/
  samba/repos/testing-i686/PKGBUILD
(from rev 136304, samba/trunk/PKGBUILD)
  samba/repos/testing-i686/fix-ipv6-mount.patch
(from rev 136304, samba/trunk/fix-ipv6-mount.patch)
  samba/repos/testing-i686/samba
(from rev 136304, samba/trunk/samba)
  samba/repos/testing-i686/samba.conf.d
(from rev 136304, samba/trunk/samba.conf.d)
  samba/repos/testing-i686/samba.logrotate
(from rev 136304, samba/trunk/samba.logrotate)
  samba/repos/testing-i686/samba.pam
(from rev 136304, samba/trunk/samba.pam)
  samba/repos/testing-i686/swat.xinetd
(from rev 136304, samba/trunk/swat.xinetd)

--+
 PKGBUILD |  163 +
 fix-ipv6-mount.patch |   11 +++
 samba|   57 +
 samba.conf.d |7 ++
 samba.logrotate  |9 ++
 samba.pam|3 
 swat.xinetd  |   10 +++
 7 files changed, 260 insertions(+)

Copied: samba/repos/testing-i686/PKGBUILD (from rev 136304, 
samba/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-08-25 15:59:32 UTC (rev 136305)
@@ -0,0 +1,163 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+pkgbase=samba
+pkgname=('smbclient' 'samba')
+pkgver=3.6.0
+# We use the 'A' to fake out pacman's version comparators.  Samba chooses
+# to append 'a','b',etc to their subsequent releases, which pamcan
+# misconstrues as alpha, beta, etc.  Bad samba!
+_realver=3.6.0
+pkgrel=3
+arch=(i686 x86_64)
+url=http://www.samba.org;
+license=('GPL3')
+makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam'
+'gamin' 'gnutls=2.4.1' 'talloc' 'tdb' 'python2')
+options=(!makeflags)
+source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
+samba samba.logrotate
+swat.xinetd
+samba.pam
+samba.conf.d
+fix-ipv6-mount.patch)
+### UNINSTALL dmapi package before building!!!
+
+build() {
+  cd ${srcdir}/${pkgbase}-${_realver}/source3
+  sed -i s/env python/env python2/g ../buildtools/bin/waf 
+  ./autogen-waf.sh
+  # everything needs to be specified :/
+  ../buildtools/bin/waf configure --prefix=/usr \
+  --with-privatedir=/etc/samba/private \
+  --libdir=/usr/lib/ \
+  --with-modulesdir=/usr/lib/samba \
+  --with-swatdir=/usr/share/samba/swat \
+  --localstatedir=/var \
+  --with-configdir=/etc/samba \
+  --with-lockdir=/var/cache/samba \
+  --with-cachedir=/var/cache/samba \
+  --with-statedir=/var/cache/samba \
+  --with-piddir=/var/run/samba \
+  --with-logfilebase=/var/log/samba \
+  --sysconfdir=/etc \
+  --with-pam \
+  --with-pam_smbpass \
+  --with-pammodulesdir=/lib/security \
+  --with-ads \
+  --with-acl-support \
+  --with-syslog \
+  --disable-avahi \
+  
--with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
+  --disable-rpath \
+  --disable-rpath-private-install \
+  --disable-rpath-install
+  #fix the shitty build system!
+   sed -i -e 's#/etc/smb.conf#/etc/samba/smb.conf#g' 
bin/default/source3/include/config.h
+  ../buildtools/bin/waf build ${MAKEFLAGS} 
+}
+
+package_smbclient () {
+pkgdesc=Tools to access a server's filespace and printers via SMB
+depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 
'e2fsprogs' 'tdb' 'talloc')
+  cd ${srcdir}/${pkgbase}-${_realver}/source3
+  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
+  install -m755 
bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup}
 ${pkgdir}/usr/bin/
+  for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so 
libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so 
libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so 
libtdb-wrap.so libaddns.so libcliauth.so; do
+install -m644 -D bin/shared/private/$i ${pkgdir}/usr/lib/$i
+  done
+  for i in libsmbconf libnetapi libwbclient libsmbclient; do
+install -m644 -D bin/shared/$i.so.0  ${pkgdir}/usr/lib/$i.so.0
+ln -sf /usr/lib/$i.so.0  ${pkgdir}/usr/lib/$i.so
+  done
+  mkdir ${pkgdir}/usr/lib/libsmb
+  ln -sf /usr/lib/libsmb/libsmbclient.so.0  
${pkgdir}/usr/lib/libsmb/libsmbclient.so.0
+  ln -sf /usr/lib/libsmb/libsmbclient.so.0  
${pkgdir}/usr/lib/libsmb/libsmbclient.so
+  for i in libndr-krb5pac libndr-standard libndr; do
+install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0.0.1
+ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so.0
+

[arch-commits] Commit in samba/repos/testing-i686 (14 files)

2011-08-25 Thread Tobias Powalowski
Date: Thursday, August 25, 2011 @ 12:01:13
  Author: tpowa
Revision: 136306

archrelease: copy trunk to testing-i686

Added:
  samba/repos/testing-i686/PKGBUILD
(from rev 136305, samba/trunk/PKGBUILD)
  samba/repos/testing-i686/fix-ipv6-mount.patch
(from rev 136305, samba/trunk/fix-ipv6-mount.patch)
  samba/repos/testing-i686/samba
(from rev 136305, samba/trunk/samba)
  samba/repos/testing-i686/samba.conf.d
(from rev 136305, samba/trunk/samba.conf.d)
  samba/repos/testing-i686/samba.logrotate
(from rev 136305, samba/trunk/samba.logrotate)
  samba/repos/testing-i686/samba.pam
(from rev 136305, samba/trunk/samba.pam)
  samba/repos/testing-i686/swat.xinetd
(from rev 136305, samba/trunk/swat.xinetd)
Deleted:
  samba/repos/testing-i686/PKGBUILD
  samba/repos/testing-i686/fix-ipv6-mount.patch
  samba/repos/testing-i686/samba
  samba/repos/testing-i686/samba.conf.d
  samba/repos/testing-i686/samba.logrotate
  samba/repos/testing-i686/samba.pam
  samba/repos/testing-i686/swat.xinetd

--+
 PKGBUILD |  326 -
 fix-ipv6-mount.patch |   22 +--
 samba|  114 -
 samba.conf.d |   14 +-
 samba.logrotate  |   18 +-
 samba.pam|6 
 swat.xinetd  |   20 +--
 7 files changed, 260 insertions(+), 260 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-25 15:59:32 UTC (rev 136305)
+++ PKGBUILD2011-08-25 16:01:13 UTC (rev 136306)
@@ -1,163 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski tp...@archlinux.org
-# Contributor: judd jvi...@zeroflux.org
-pkgbase=samba
-pkgname=('smbclient' 'samba')
-pkgver=3.6.0
-# We use the 'A' to fake out pacman's version comparators.  Samba chooses
-# to append 'a','b',etc to their subsequent releases, which pamcan
-# misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.0
-pkgrel=3
-arch=(i686 x86_64)
-url=http://www.samba.org;
-license=('GPL3')
-makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam'
-'gamin' 'gnutls=2.4.1' 'talloc' 'tdb' 'python2')
-options=(!makeflags)
-source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
-samba samba.logrotate
-swat.xinetd
-samba.pam
-samba.conf.d
-fix-ipv6-mount.patch)
-### UNINSTALL dmapi package before building!!!
-
-build() {
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  sed -i s/env python/env python2/g ../buildtools/bin/waf 
-  ./autogen-waf.sh
-  # everything needs to be specified :/
-  ../buildtools/bin/waf configure --prefix=/usr \
-  --with-privatedir=/etc/samba/private \
-  --libdir=/usr/lib/ \
-  --with-modulesdir=/usr/lib/samba \
-  --with-swatdir=/usr/share/samba/swat \
-  --localstatedir=/var \
-  --with-configdir=/etc/samba \
-  --with-lockdir=/var/cache/samba \
-  --with-cachedir=/var/cache/samba \
-  --with-statedir=/var/cache/samba \
-  --with-piddir=/var/run/samba \
-  --with-logfilebase=/var/log/samba \
-  --sysconfdir=/etc \
-  --with-pam \
-  --with-pam_smbpass \
-  --with-pammodulesdir=/lib/security \
-  --with-ads \
-  --with-acl-support \
-  --with-syslog \
-  --disable-avahi \
-  
--with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
-  --disable-rpath \
-  --disable-rpath-private-install \
-  --disable-rpath-install
-  #fix the shitty build system!
-   sed -i -e 's#/etc/smb.conf#/etc/samba/smb.conf#g' 
bin/default/source3/include/config.h
-  ../buildtools/bin/waf build ${MAKEFLAGS} 
-}
-
-package_smbclient () {
-pkgdesc=Tools to access a server's filespace and printers via SMB
-depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 
'e2fsprogs' 'tdb' 'talloc')
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
-  install -m755 
bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup}
 ${pkgdir}/usr/bin/
-  for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so 
libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so 
libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so 
libtdb-wrap.so libaddns.so libcliauth.so; do
-install -m644 -D bin/shared/private/$i ${pkgdir}/usr/lib/$i
-  done
-  for i in libsmbconf libnetapi libwbclient libsmbclient; do
-install -m644 -D bin/shared/$i.so.0  ${pkgdir}/usr/lib/$i.so.0
-ln -sf /usr/lib/$i.so.0  ${pkgdir}/usr/lib/$i.so
-  done
-  mkdir ${pkgdir}/usr/lib/libsmb
-  ln -sf /usr/lib/libsmb/libsmbclient.so.0  
${pkgdir}/usr/lib/libsmb/libsmbclient.so.0
-  ln -sf /usr/lib/libsmb/libsmbclient.so.0  

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

2011-08-25 Thread Tobias Powalowski
Date: Thursday, August 25, 2011 @ 12:02:25
  Author: tpowa
Revision: 136307

archrelease: copy trunk to testing-x86_64

Added:
  samba/repos/testing-x86_64/
  samba/repos/testing-x86_64/PKGBUILD
(from rev 136306, samba/trunk/PKGBUILD)
  samba/repos/testing-x86_64/fix-ipv6-mount.patch
(from rev 136306, samba/trunk/fix-ipv6-mount.patch)
  samba/repos/testing-x86_64/samba
(from rev 136306, samba/trunk/samba)
  samba/repos/testing-x86_64/samba.conf.d
(from rev 136306, samba/trunk/samba.conf.d)
  samba/repos/testing-x86_64/samba.logrotate
(from rev 136306, samba/trunk/samba.logrotate)
  samba/repos/testing-x86_64/samba.pam
(from rev 136306, samba/trunk/samba.pam)
  samba/repos/testing-x86_64/swat.xinetd
(from rev 136306, samba/trunk/swat.xinetd)

--+
 PKGBUILD |  163 +
 fix-ipv6-mount.patch |   11 +++
 samba|   57 +
 samba.conf.d |7 ++
 samba.logrotate  |9 ++
 samba.pam|3 
 swat.xinetd  |   10 +++
 7 files changed, 260 insertions(+)

Copied: samba/repos/testing-x86_64/PKGBUILD (from rev 136306, 
samba/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2011-08-25 16:02:25 UTC (rev 136307)
@@ -0,0 +1,163 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+pkgbase=samba
+pkgname=('smbclient' 'samba')
+pkgver=3.6.0
+# We use the 'A' to fake out pacman's version comparators.  Samba chooses
+# to append 'a','b',etc to their subsequent releases, which pamcan
+# misconstrues as alpha, beta, etc.  Bad samba!
+_realver=3.6.0
+pkgrel=3
+arch=(i686 x86_64)
+url=http://www.samba.org;
+license=('GPL3')
+makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam'
+'gamin' 'gnutls=2.4.1' 'talloc' 'tdb' 'python2')
+options=(!makeflags)
+source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
+samba samba.logrotate
+swat.xinetd
+samba.pam
+samba.conf.d
+fix-ipv6-mount.patch)
+### UNINSTALL dmapi package before building!!!
+
+build() {
+  cd ${srcdir}/${pkgbase}-${_realver}/source3
+  sed -i s/env python/env python2/g ../buildtools/bin/waf 
+  ./autogen-waf.sh
+  # everything needs to be specified :/
+  ../buildtools/bin/waf configure --prefix=/usr \
+  --with-privatedir=/etc/samba/private \
+  --libdir=/usr/lib/ \
+  --with-modulesdir=/usr/lib/samba \
+  --with-swatdir=/usr/share/samba/swat \
+  --localstatedir=/var \
+  --with-configdir=/etc/samba \
+  --with-lockdir=/var/cache/samba \
+  --with-cachedir=/var/cache/samba \
+  --with-statedir=/var/cache/samba \
+  --with-piddir=/var/run/samba \
+  --with-logfilebase=/var/log/samba \
+  --sysconfdir=/etc \
+  --with-pam \
+  --with-pam_smbpass \
+  --with-pammodulesdir=/lib/security \
+  --with-ads \
+  --with-acl-support \
+  --with-syslog \
+  --disable-avahi \
+  
--with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
+  --disable-rpath \
+  --disable-rpath-private-install \
+  --disable-rpath-install
+  #fix the shitty build system!
+   sed -i -e 's#/etc/smb.conf#/etc/samba/smb.conf#g' 
bin/default/source3/include/config.h
+  ../buildtools/bin/waf build ${MAKEFLAGS} 
+}
+
+package_smbclient () {
+pkgdesc=Tools to access a server's filespace and printers via SMB
+depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 
'e2fsprogs' 'tdb' 'talloc')
+  cd ${srcdir}/${pkgbase}-${_realver}/source3
+  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
+  install -m755 
bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup}
 ${pkgdir}/usr/bin/
+  for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so 
libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so 
libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so 
libtdb-wrap.so libaddns.so libcliauth.so; do
+install -m644 -D bin/shared/private/$i ${pkgdir}/usr/lib/$i
+  done
+  for i in libsmbconf libnetapi libwbclient libsmbclient; do
+install -m644 -D bin/shared/$i.so.0  ${pkgdir}/usr/lib/$i.so.0
+ln -sf /usr/lib/$i.so.0  ${pkgdir}/usr/lib/$i.so
+  done
+  mkdir ${pkgdir}/usr/lib/libsmb
+  ln -sf /usr/lib/libsmb/libsmbclient.so.0  
${pkgdir}/usr/lib/libsmb/libsmbclient.so.0
+  ln -sf /usr/lib/libsmb/libsmbclient.so.0  
${pkgdir}/usr/lib/libsmb/libsmbclient.so
+  for i in libndr-krb5pac libndr-standard libndr; do
+install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0.0.1
+ln -sf 

[arch-commits] Commit in gnome-settings-daemon/trunk (PKGBUILD)

2011-08-25 Thread Jan Steffens
Date: Thursday, August 25, 2011 @ 13:35:16
  Author: heftig
Revision: 136308

Update to 3.0.3

Modified:
  gnome-settings-daemon/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 16:02:25 UTC (rev 136307)
+++ PKGBUILD2011-08-25 17:35:16 UTC (rev 136308)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=gnome-settings-daemon
-pkgver=3.0.2
-pkgrel=2
+pkgver=3.0.3
+pkgrel=1
 pkgdesc=The GNOME Settings daemon
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,8 +17,8 @@
 groups=('gnome')
 replaces=(gnome-settings-daemon-pulse)
 conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9c6e3bb5c4b3a98ab83a917b7be15578d11831330f7f2deeecfbb625568e3e03')
 
 build() {
   cd $srcdir/$pkgname-$pkgver



[arch-commits] Commit in gnome-settings-daemon/repos/extra-i686 (4 files)

2011-08-25 Thread Jan Steffens
Date: Thursday, August 25, 2011 @ 13:38:39
  Author: heftig
Revision: 136309

archrelease: copy trunk to extra-i686

Added:
  gnome-settings-daemon/repos/extra-i686/PKGBUILD
(from rev 136308, gnome-settings-daemon/trunk/PKGBUILD)
  gnome-settings-daemon/repos/extra-i686/gnome-settings-daemon.install
(from rev 136308, gnome-settings-daemon/trunk/gnome-settings-daemon.install)
Deleted:
  gnome-settings-daemon/repos/extra-i686/PKGBUILD
  gnome-settings-daemon/repos/extra-i686/gnome-settings-daemon.install

---+
 PKGBUILD  |   70 
 gnome-settings-daemon.install |   36 ++--
 2 files changed, 53 insertions(+), 53 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-25 17:35:16 UTC (rev 136308)
+++ PKGBUILD2011-08-25 17:38:39 UTC (rev 136309)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=gnome-settings-daemon
-pkgver=3.0.2
-pkgrel=2
-pkgdesc=The GNOME Settings daemon
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme'
- 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf'
- 'dconf' 'pulseaudio' 'pulseaudio-alsa')
-makedepends=('intltool' 'gtk-doc')
-options=('!emptydirs' '!libtool')
-install=gnome-settings-daemon.install
-url=http://www.gnome.org;
-groups=('gnome')
-replaces=(gnome-settings-daemon-pulse)
-conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-  --libexecdir=/usr/bin --disable-static --enable-pulse
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: gnome-settings-daemon/repos/extra-i686/PKGBUILD (from rev 136308, 
gnome-settings-daemon/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-25 17:38:39 UTC (rev 136309)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=gnome-settings-daemon
+pkgver=3.0.3
+pkgrel=1
+pkgdesc=The GNOME Settings daemon
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme'
+ 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf'
+ 'dconf' 'pulseaudio' 'pulseaudio-alsa')
+makedepends=('intltool' 'gtk-doc')
+options=('!emptydirs' '!libtool')
+install=gnome-settings-daemon.install
+url=http://www.gnome.org;
+groups=('gnome')
+replaces=(gnome-settings-daemon-pulse)
+conflicts=(gnome-settings-daemon-pulse)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9c6e3bb5c4b3a98ab83a917b7be15578d11831330f7f2deeecfbb625568e3e03')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  --libexecdir=/usr/bin --disable-static --enable-pulse
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: gnome-settings-daemon.install
===
--- gnome-settings-daemon.install   2011-08-25 17:35:16 UTC (rev 136308)
+++ gnome-settings-daemon.install   2011-08-25 17:38:39 UTC (rev 136309)
@@ -1,18 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0)  0 )); then
-usr/sbin/gconfpkg --uninstall gnome-settings-daemon
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: gnome-settings-daemon/repos/extra-i686/gnome-settings-daemon.install 
(from rev 136308, gnome-settings-daemon/trunk/gnome-settings-daemon.install)
===
--- gnome-settings-daemon.install   (rev 0)
+++ gnome-settings-daemon.install   2011-08-25 17:38:39 UTC (rev 136309)
@@ -0,0 +1,18 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.0)  0 )); then
+usr/sbin/gconfpkg --uninstall gnome-settings-daemon
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}



[arch-commits] Commit in gnome-settings-daemon/repos/extra-x86_64 (4 files)

2011-08-25 Thread Jan Steffens
Date: Thursday, August 25, 2011 @ 13:39:52
  Author: heftig
Revision: 136310

archrelease: copy trunk to extra-x86_64

Added:
  gnome-settings-daemon/repos/extra-x86_64/PKGBUILD
(from rev 136309, gnome-settings-daemon/trunk/PKGBUILD)
  gnome-settings-daemon/repos/extra-x86_64/gnome-settings-daemon.install
(from rev 136309, gnome-settings-daemon/trunk/gnome-settings-daemon.install)
Deleted:
  gnome-settings-daemon/repos/extra-x86_64/PKGBUILD
  gnome-settings-daemon/repos/extra-x86_64/gnome-settings-daemon.install

---+
 PKGBUILD  |   70 
 gnome-settings-daemon.install |   36 ++--
 2 files changed, 53 insertions(+), 53 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-25 17:38:39 UTC (rev 136309)
+++ PKGBUILD2011-08-25 17:39:52 UTC (rev 136310)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=gnome-settings-daemon
-pkgver=3.0.2
-pkgrel=2
-pkgdesc=The GNOME Settings daemon
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme'
- 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf'
- 'dconf' 'pulseaudio' 'pulseaudio-alsa')
-makedepends=('intltool' 'gtk-doc')
-options=('!emptydirs' '!libtool')
-install=gnome-settings-daemon.install
-url=http://www.gnome.org;
-groups=('gnome')
-replaces=(gnome-settings-daemon-pulse)
-conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-  --libexecdir=/usr/bin --disable-static --enable-pulse
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: gnome-settings-daemon/repos/extra-x86_64/PKGBUILD (from rev 136309, 
gnome-settings-daemon/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-25 17:39:52 UTC (rev 136310)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=gnome-settings-daemon
+pkgver=3.0.3
+pkgrel=1
+pkgdesc=The GNOME Settings daemon
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme'
+ 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf'
+ 'dconf' 'pulseaudio' 'pulseaudio-alsa')
+makedepends=('intltool' 'gtk-doc')
+options=('!emptydirs' '!libtool')
+install=gnome-settings-daemon.install
+url=http://www.gnome.org;
+groups=('gnome')
+replaces=(gnome-settings-daemon-pulse)
+conflicts=(gnome-settings-daemon-pulse)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9c6e3bb5c4b3a98ab83a917b7be15578d11831330f7f2deeecfbb625568e3e03')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  --libexecdir=/usr/bin --disable-static --enable-pulse
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: gnome-settings-daemon.install
===
--- gnome-settings-daemon.install   2011-08-25 17:38:39 UTC (rev 136309)
+++ gnome-settings-daemon.install   2011-08-25 17:39:52 UTC (rev 136310)
@@ -1,18 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0)  0 )); then
-usr/sbin/gconfpkg --uninstall gnome-settings-daemon
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: gnome-settings-daemon/repos/extra-x86_64/gnome-settings-daemon.install 
(from rev 136309, gnome-settings-daemon/trunk/gnome-settings-daemon.install)
===
--- gnome-settings-daemon.install   (rev 0)
+++ gnome-settings-daemon.install   2011-08-25 17:39:52 UTC (rev 136310)
@@ -0,0 +1,18 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.0)  0 )); then
+usr/sbin/gconfpkg --uninstall gnome-settings-daemon
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install

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

2011-08-25 Thread Pierre Schmitz
Date: Thursday, August 25, 2011 @ 15:46:04
  Author: pierre
Revision: 136311

upgpkg: devtools 0.9.27-1

Modified:
  devtools/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 17:39:52 UTC (rev 136310)
+++ PKGBUILD2011-08-25 19:46:04 UTC (rev 136311)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=devtools
-pkgver=0.9.26
+pkgver=0.9.27
 pkgrel=1
 pkgdesc='Tools for Arch Linux package maintainers'
 arch=('any')
@@ -10,7 +10,7 @@
 url='http://projects.archlinux.org/devtools.git/'
 depends=('namcap' 'openssh' 'subversion' 'rsync')
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('dabf99cd497d3189bf06cfe48725c6a6')
+md5sums=('56d9d90f58e182154c8aee8fb879b5db')
 
 package() {
cd ${srcdir}/${pkgname}-${pkgver}



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

2011-08-25 Thread Pierre Schmitz
Date: Thursday, August 25, 2011 @ 15:46:33
  Author: pierre
Revision: 136312

archrelease: copy trunk to testing-any

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

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

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-25 19:46:04 UTC (rev 136311)
+++ PKGBUILD2011-08-25 19:46:33 UTC (rev 136312)
@@ -1,18 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz pie...@archlinux.de
-
-pkgname=devtools
-pkgver=0.9.26
-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=('dabf99cd497d3189bf06cfe48725c6a6')
-
-package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   make PREFIX=/usr DESTDIR=${pkgdir} install
-}

Copied: devtools/repos/testing-any/PKGBUILD (from rev 136311, 
devtools/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-25 19:46:33 UTC (rev 136312)
@@ -0,0 +1,18 @@
+# $Id$
+# Maintainer: Pierre Schmitz pie...@archlinux.de
+
+pkgname=devtools
+pkgver=0.9.27
+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=('56d9d90f58e182154c8aee8fb879b5db')
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make PREFIX=/usr DESTDIR=${pkgdir} install
+}