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

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 03:25:15
  Author: eric
Revision: 122622

upgpkg: lm_sensors 3.3.0-2
Moved rrdtool to optdepends to remove X libs dependency for servers (close 
FS#23328)

Modified:
  lm_sensors/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 05:06:08 UTC (rev 122621)
+++ PKGBUILD2011-05-05 07:25:15 UTC (rev 122622)
@@ -3,12 +3,14 @@
 
 pkgname=lm_sensors
 pkgver=3.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc=Collection of user space tools for general SMBus access and hardware 
monitoring
 arch=('i686' 'x86_64')
 url=http://www.lm-sensors.org/;
 license=('GPL' 'LGPL')
-depends=('perl' 'sysfsutils' 'rrdtool')
+depends=('perl' 'sysfsutils')
+makedepends=('rrdtool')
+optdepends=('rrdtool: for logging with sensord')
 backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord')
 options=('!emptydirs')
 
source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2
 \



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

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 03:25:17
  Author: eric
Revision: 122623

archrelease: remove extra-i686

Deleted:
  lm_sensors/repos/extra-i686/



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

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 03:25:26
  Author: eric
Revision: 122624

archrelease: copy trunk to extra-i686

Added:
  lm_sensors/repos/extra-i686/



[arch-commits] Commit in lm_sensors/repos (extra-x86_64)

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 03:25:28
  Author: eric
Revision: 122625

archrelease: remove extra-x86_64

Deleted:
  lm_sensors/repos/extra-x86_64/



[arch-commits] Commit in lm_sensors/repos (extra-x86_64)

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 03:25:38
  Author: eric
Revision: 122626

archrelease: copy trunk to extra-x86_64

Added:
  lm_sensors/repos/extra-x86_64/



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

2011-05-05 Thread Ronald van Haren
Date: Thursday, May 5, 2011 @ 04:41:24
  Author: ronald
Revision: 122627

make linux-atm an optional dep: FS#23059

Modified:
  iproute2/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 07:25:38 UTC (rev 122626)
+++ PKGBUILD2011-05-05 08:41:24 UTC (rev 122627)
@@ -9,7 +9,9 @@
 arch=('i686' 'x86_64')
 license=('GPL2')
 url=http://www.linux-foundation.org/en/Net:Iproute2;
-depends=('linux-atm' 'perl')
+depends=('perl')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
 provides=('iproute')
 conflicts=('iproute')
 replaces=('iproute')



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

2011-05-05 Thread Ronald van Haren
Date: Thursday, May 5, 2011 @ 04:47:16
  Author: ronald
Revision: 122628

upgpkg: iproute2 2.6.38-2
move linux-atm to optdepends FS#23059

Modified:
  iproute2/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 08:41:24 UTC (rev 122627)
+++ PKGBUILD2011-05-05 08:47:16 UTC (rev 122628)
@@ -4,7 +4,7 @@
 
 pkgname=iproute2
 pkgver=2.6.38
-pkgrel=1
+pkgrel=2
 pkgdesc=IP Routing Utilities
 arch=('i686' 'x86_64')
 license=('GPL2')



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

2011-05-05 Thread Ronald van Haren
Date: Thursday, May 5, 2011 @ 04:47:20
  Author: ronald
Revision: 122629

archrelease: remove testing-i686

Deleted:
  iproute2/repos/testing-i686/



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

2011-05-05 Thread Ronald van Haren
Date: Thursday, May 5, 2011 @ 04:47:35
  Author: ronald
Revision: 122630

archrelease: copy trunk to testing-i686

Added:
  iproute2/repos/testing-i686/



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

2011-05-05 Thread Ronald van Haren
Date: Thursday, May 5, 2011 @ 04:47:39
  Author: ronald
Revision: 122631

archrelease: remove testing-x86_64

Deleted:
  iproute2/repos/testing-x86_64/



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

2011-05-05 Thread Ronald van Haren
Date: Thursday, May 5, 2011 @ 04:47:55
  Author: ronald
Revision: 122632

archrelease: copy trunk to testing-x86_64

Added:
  iproute2/repos/testing-x86_64/



[arch-commits] Commit in gnome-shell/trunk (2 files)

2011-05-05 Thread Ionut Biru
Date: Thursday, May 5, 2011 @ 07:05:07
  Author: ibiru
Revision: 122633

merge all network manager fixes

Added:
  gnome-shell/trunk/network_fixes_up_to_5090a4ccce.patch
Modified:
  gnome-shell/trunk/PKGBUILD

--+
 PKGBUILD |9 
 network_fixes_up_to_5090a4ccce.patch |  814 +
 2 files changed, 820 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 08:47:55 UTC (rev 122632)
+++ PKGBUILD2011-05-05 11:05:07 UTC (rev 122633)
@@ -4,7 +4,7 @@
 
 pkgname=gnome-shell
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc=The next generation GNOME Shell
 arch=('i686' 'x86_64')
 url=http://live.gnome.org/GnomeShell;
@@ -18,14 +18,17 @@
 install=gnome-shell.install
 groups=(gnome)
 
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
-arch.patch)
+arch.patch
+network_fixes_up_to_5090a4ccce.patch)
 sha256sums=('01f7ae942ba9687a5e67d62423843ed404d77b35f74acc212a5f391beed8e079'
-'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db')
+'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db'
+'01bf41483d5d8935ed2dd6294ee04024f2d9bcb2ef13276b07331e485965c822')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   patch -Np1 -i ${srcdir}/arch.patch
+  patch -Np1 -i ${srcdir}/network_fixes_up_to_5090a4ccce.patch
 
   ./configure --prefix=/usr --sysconfdir=/etc \
   --libexecdir=/usr/lib/gnome-shell \

Added: network_fixes_up_to_5090a4ccce.patch
===
--- network_fixes_up_to_5090a4ccce.patch(rev 0)
+++ network_fixes_up_to_5090a4ccce.patch2011-05-05 11:05:07 UTC (rev 
122633)
@@ -0,0 +1,814 @@
+From d0780d16224d7bb2ad183542337c48324fdd2185 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna gcampa...@src.gnome.org
+Date: Wed, 06 Apr 2011 16:11:23 +
+Subject: NetworkMenu: keep wirelesss networks in predictable order
+
+Adds a function that compares wireless networks and keeps them sorted
+at all times. Order is: first already configured connections, then
+first secure networks, then alphabtic. Also, the appearance of a new access
+point no longer causes the whole menu to be rebuilt (but it still linear
+searches for the position, I guess that could be skipped), which caused
+the addition of more code for tracking the active access point.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=646580
+---
+(limited to 'js/ui/status/network.js')
+
+diff --git a/js/ui/status/network.js b/js/ui/status/network.js
+index 6fa5642..49cb3f0 100644
+--- a/js/ui/status/network.js
 b/js/ui/status/network.js
+@@ -42,6 +42,10 @@ const NM80211Mode = NetworkManager['80211Mode'];
+ const NM80211ApFlags = NetworkManager['80211ApFlags'];
+ const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags'];
+ 
++// number of wireless networks that should be visible
++// (the remaining are placed into More...)
++const NUM_VISIBLE_NETWORKS = 5;
++
+ function macToArray(string) {
+ return string.split(':').map(function(el) {
+ return parseInt(el, 16);
+@@ -1036,6 +1040,7 @@ NMDeviceWireless.prototype = {
+ item: null,
+ accessPoints: [ ap ]
+   };
++obj.ssidText = NetworkManager.utils_ssid_to_utf8(obj.ssid);
+ this._networks.push(obj);
+ }
+ 
+@@ -1048,6 +1053,14 @@ NMDeviceWireless.prototype = {
+ }
+ }
+ }
++if (this.device.active_access_point) {
++this._activeNetwork = 
this._networks[this._findNetwork(this.device.active_access_point)];
++} else {
++this._activeNetwork = null;
++}
++this._networks.sort(this._networkSortFunction);
++
++this._apChangedId = device.connect('notify::active-access-point', 
Lang.bind(this, this._activeApChanged));
+ this._apAddedId = device.connect('access-point-added', 
Lang.bind(this, this._accessPointAdded));
+ this._apRemovedId = device.connect('access-point-removed', 
Lang.bind(this, this._accessPointRemoved));
+ 
+@@ -1055,8 +1068,13 @@ NMDeviceWireless.prototype = {
+ },
+ 
+ destroy: function() {
+-if (this._apAddedId) {
++if (this._apChangedId) {
+ // see above for this HACK
++GObject.Object.prototype.disconnect.call(this.device, 
this._apChangedId);
++this._apChangedId = 0;
++}
++
++if (this._apAddedId) {
+ GObject.Object.prototype.disconnect.call(this.device, 
this._apAddedId);
+ this._apAddedId = 0;
+ }
+@@ -1122,6 +1140,19 @@ NMDeviceWireless.prototype = {
+ }
+ },
+ 
++_activeApChanged: function() {
++this._activeNetwork = null;

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

2011-05-05 Thread Ionut Biru
Date: Thursday, May 5, 2011 @ 07:08:55
  Author: ibiru
Revision: 122634

archrelease: remove extra-i686

Deleted:
  gnome-shell/repos/extra-i686/



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

2011-05-05 Thread Ionut Biru
Date: Thursday, May 5, 2011 @ 07:09:52
  Author: ibiru
Revision: 122635

archrelease: copy trunk to extra-i686

Added:
  gnome-shell/repos/extra-i686/



[arch-commits] Commit in gnome-shell/repos (extra-x86_64)

2011-05-05 Thread Ionut Biru
Date: Thursday, May 5, 2011 @ 07:10:01
  Author: ibiru
Revision: 122636

archrelease: remove extra-x86_64

Deleted:
  gnome-shell/repos/extra-x86_64/



[arch-commits] Commit in gnome-shell/repos (extra-x86_64)

2011-05-05 Thread Ionut Biru
Date: Thursday, May 5, 2011 @ 07:10:19
  Author: ibiru
Revision: 122637

archrelease: copy trunk to extra-x86_64

Added:
  gnome-shell/repos/extra-x86_64/



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

2011-05-05 Thread andyrtr
Date: Thursday, May 5, 2011 @ 07:40:02
  Author: andyrtr
Revision: 122638

prepare 3.4 branch builds; fix missing icons+mimetype, make the packaging less 
verbose

Modified:
  libreoffice/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 11:10:19 UTC (rev 122637)
+++ PKGBUILD2011-05-05 11:40:02 UTC (rev 122638)
@@ -6,7 +6,7 @@
  'libreoffice-extension-report-builder' 
'libreoffice-extension-wiki-publisher' 'libreoffice-extension-ct2n')
 _LOver=3.3.99.3
 pkgver=3.4beta3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 #_LO_tree=3.4
 _OFFICEUPD=300
@@ -329,36 +329,48 @@

# workaround broken make $DESTDIR install :(
 #  install -dm755 ${pkgdir}/usr/lib/libreoffice
-   install -dm755 ${pkgdir}/usr/share/applications
 #  mv 
instsetoo_native/unxlngx6.pro/LibreOffice/native/install/LibO_3.4.0beta3_Linux_x86-64_install_en-US/linux-2.6-x86_64/buildroot/opt/libreoffice/*
 ${pkgdir}/usr/lib/libreoffice
 #  chmod -R +w ${pkgdir}/usr/lib/libreoffice

# fix missing desktop integration
install -dm755 ${pkgdir}/usr/bin
-   cd ${pkgdir}/usr/bin
-   ln -vsf /usr/lib/libreoffice/program/soffice ./libreoffice
-   ln -vsf /usr/lib/libreoffice/program/soffice ./soffice
-   ln -vsf /usr/lib/libreoffice/program/sbase ./lobase
-   ln -vsf /usr/lib/libreoffice/program/scalc ./localc
-   ln -vsf /usr/lib/libreoffice/program/sdraw ./lodraw
-   ln -vsf /usr/lib/libreoffice/program/simpress ./loimpress
-   ln -vsf /usr/lib/libreoffice/program/smath ./lomath
-   ln -vsf /usr/lib/libreoffice/program/swriter ./lowriter
-   ln -vsf /usr/lib/libreoffice/program/unopkg ./unopkg
+   pushd ${pkgdir}/usr/bin
+   ln -vs /usr/lib/libreoffice/program/soffice ./libreoffice
+   ln -vs /usr/lib/libreoffice/program/soffice ./soffice
+   ln -vs /usr/lib/libreoffice/program/sbase ./lobase
+   ln -vs /usr/lib/libreoffice/program/scalc ./localc
+   ln -vs /usr/lib/libreoffice/program/sdraw ./lodraw
+   ln -vs /usr/lib/libreoffice/program/simpress ./loimpress
+   ln -vs /usr/lib/libreoffice/program/smath ./lomath
+   ln -vs /usr/lib/libreoffice/program/swriter ./lowriter
+   ln -vs /usr/lib/libreoffice/program/unopkg ./unopkg
+   popd

# move sysui desktop files into place we want to use - javafilter and 
qstarter, but not unneeded printeradmin
-#  cp ${pkgdir}/usr/lib/libreoffice/share/xdg/javafilter.desktop 
${pkgdir}/usr/share/applications/
+   install -dm755 
${pkgdir}/usr/share/{applications,icons,mime/packages,pixmaps}
+   rm ${pkgdir}/usr/lib/libreoffice/share/xdg/printeradmin.desktop
cp ${pkgdir}/usr/lib/libreoffice/share/xdg/*.desktop 
${pkgdir}/usr/share/applications/
-   rm ${pkgdir}/usr/share/applications/printeradmin.desktop
 #  sed -i -e s/Exec=oo/Exec=so/g 
${pkgdir}/usr/share/applications/javafilter.desktop # 
https://bugs.archlinux.org/task/23361
-#  cp ${pkgdir}/usr/lib/libreoffice/share/xdg/qstart.desktop 
${pkgdir}/usr/share/applications/
# remove version in menu entry and make it visible
 #  sed -i -e s/3.4 Quickstarter/Quickstarter/g 
${pkgdir}/usr/share/applications/qstart.desktop
sed -i -e s/3.4//g ${pkgdir}/usr/share/applications/*.desktop
sed -i -e /NoDisplay=true/d 
${pkgdir}/usr/share/applications/qstart.desktop
-   # remove unneeded .desktop files from vanilla sysui
+   echo Icon=startcenter  
${pkgdir}/usr/share/applications/qstart.desktop
+   # remove unneeded .desktop files
rm -rf ${pkgdir}/usr/lib/libreoffice/share/xdg
+   
+   # add missing icon files
+   cp -R ${srcdir}/build/sysui/desktop/icons/{hi,lo}color 
${pkgdir}/usr/share/icons/
+   pushd ${pkgdir}/usr/share/pixmaps
+ for i in base calc draw impress main math printeradmin startcenter 
writer; do
+   ln -vs /usr/share/icons/hicolor/48x48/apps/$i.png .
+ done
+   popd
+   sed -i -e 's/Icon=libreoffice-/Icon=/' 
${pkgdir}/usr/share/applications/*.desktop
 
+   # add missing mimetype file
+   install -m644 
${srcdir}/build/sysui/unxlngx6.pro/misc/libreoffice/openoffice.org.xml 
${pkgdir}/usr/share/mime/packages/libreoffice.xml
+
# put configuration files into place
install -dm755 ${pkgdir}/etc/libreoffice
install -m644 
${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} 
${pkgdir}/etc/libreoffice/
@@ -370,7 +382,7 @@
ln -vsf /etc/libreoffice/psprint.conf .
  
#fix http://bugs.archlinux.org/task/17656
-   find ${pkgdir} -perm 444 -exec ls -lh {} \; 
+   find ${pkgdir} -perm 444 -exec ls -lh {} \;
find ${pkgdir} -perm 444 -exec chmod 644 {} \;
find ${pkgdir} -perm 555 -exec ls 

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

2011-05-05 Thread Gaetan Bisson
Date: Thursday, May 5, 2011 @ 08:22:20
  Author: bisson
Revision: 122639

upstream upgrade with no pkgver bump

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 11:40:02 UTC (rev 122638)
+++ PKGBUILD2011-05-05 12:22:20 UTC (rev 122639)
@@ -5,18 +5,18 @@
 
 pkgname=openssh
 pkgver=5.8p2
-pkgrel=2
+pkgrel=3
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
-depends=('tcp_wrappers' 'krb5' 'libedit')
+depends=('tcp_wrappers' 'heimdal' 'libedit')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
 'sshd.confd'
 'sshd.pam'
 'sshd')
-sha1sums=('e610270e0c5484fb291cd81bbcbefbeb5e391a62'
+sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '660092c57bde28bed82078f74011f95fc51c2293'
   '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')



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

2011-05-05 Thread Gaetan Bisson
Date: Thursday, May 5, 2011 @ 08:22:31
  Author: bisson
Revision: 122640

archrelease: copy trunk to testing-i686

Added:
  openssh/repos/testing-i686/



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

2011-05-05 Thread Gaetan Bisson
Date: Thursday, May 5, 2011 @ 08:22:38
  Author: bisson
Revision: 122641

archrelease: copy trunk to testing-x86_64

Added:
  openssh/repos/testing-x86_64/



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

2011-05-05 Thread Gaetan Bisson
Date: Thursday, May 5, 2011 @ 08:30:25
  Author: bisson
Revision: 122642

build against krb5 for [staging]

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 12:22:38 UTC (rev 122641)
+++ PKGBUILD2011-05-05 12:30:25 UTC (rev 122642)
@@ -5,13 +5,13 @@
 
 pkgname=openssh
 pkgver=5.8p2
-pkgrel=3
+pkgrel=4
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
-depends=('tcp_wrappers' 'heimdal' 'libedit')
+depends=('tcp_wrappers' 'krb5' 'openssl' 'libedit')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
 'sshd.confd'
 'sshd.pam'



[arch-commits] Commit in openssh/repos (staging-i686)

2011-05-05 Thread Gaetan Bisson
Date: Thursday, May 5, 2011 @ 08:30:27
  Author: bisson
Revision: 122643

archrelease: remove staging-i686

Deleted:
  openssh/repos/staging-i686/



[arch-commits] Commit in openssh/repos (staging-i686)

2011-05-05 Thread Gaetan Bisson
Date: Thursday, May 5, 2011 @ 08:30:34
  Author: bisson
Revision: 122644

archrelease: copy trunk to staging-i686

Added:
  openssh/repos/staging-i686/



[arch-commits] Commit in openssh/repos (staging-x86_64)

2011-05-05 Thread Gaetan Bisson
Date: Thursday, May 5, 2011 @ 08:30:36
  Author: bisson
Revision: 122645

archrelease: remove staging-x86_64

Deleted:
  openssh/repos/staging-x86_64/



[arch-commits] Commit in openssh/repos (staging-x86_64)

2011-05-05 Thread Gaetan Bisson
Date: Thursday, May 5, 2011 @ 08:30:43
  Author: bisson
Revision: 122646

archrelease: copy trunk to staging-x86_64

Added:
  openssh/repos/staging-x86_64/



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

2011-05-05 Thread Dan McGee
Date: Thursday, May 5, 2011 @ 09:19:03
  Author: dan
Revision: 122647

verbump 1.7.5.1 and bug fixes (FS#20874, FS#23963)

Modified:
  git/trunk/PKGBUILD

--+
 PKGBUILD |   38 +-
 1 file changed, 21 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 12:30:43 UTC (rev 122646)
+++ PKGBUILD2011-05-05 13:19:03 UTC (rev 122647)
@@ -2,14 +2,14 @@
 # Maintainer: Dan McGee d...@archlinux.org
 
 pkgname=git
-pkgver=1.7.5
+pkgver=1.7.5.1
 pkgrel=1
 pkgdesc=the fast distributed version control system
 arch=(i686 x86_64)
 url=http://git-scm.com/;
 license=('GPL2')
 depends=('curl' 'expat=2.0' 'perl-error' 'perl=5.12.2')
-makedepends=('python2')
+makedepends=('python2' 'emacs')
 optdepends=('tk: gitk and git gui'
 'perl-libwww: git svn'
 'perl-term-readkey: git svn'
@@ -31,19 +31,24 @@
 build() {
   export PYTHON_PATH='/usr/bin/python2'
   cd $srcdir/$pkgname-$pkgver
-  make prefix=/usr gitexecdir=/usr/lib/git-core 
+  make prefix=/usr gitexecdir=/usr/lib/git-core \
+CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS
+
+  cd contrib/emacs
+  make prefix=/usr
 }
 
 package() {
   export PYTHON_PATH='/usr/bin/python2'
   cd $srcdir/$pkgname-$pkgver
   make prefix=/usr gitexecdir=/usr/lib/git-core \
+CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS \
 NO_CROSS_DIRECTORY_HARDLINKS=1 \
-INSTALLDIRS=vendor DESTDIR=${pkgdir} install 
+INSTALLDIRS=vendor DESTDIR=$pkgdir install 
 
   # bash completion
   mkdir -p $pkgdir/etc/bash_completion.d/
-  install -m644 ./contrib/completion/git-completion.bash 
$pkgdir/etc/bash_completion.d/git 
+  install -m644 ./contrib/completion/git-completion.bash 
$pkgdir/etc/bash_completion.d/git 
   # more contrib stuff
   cp -a ./contrib $pkgdir/usr/share/git/ 
   # scripts are for python 2.x
@@ -52,30 +57,29 @@
 $pkgdir/usr/share/git/{fast-import/git-p4,gitview/gitview}
 
   # emacs interface
-  mkdir -p $pkgdir/usr/share/emacs/site-lisp
-  mv $pkgdir/usr/share/git/emacs $pkgdir/usr/share/emacs/site-lisp/git
-  rm $pkgdir/usr/share/emacs/site-lisp/git/.gitignore
+  cd contrib/emacs
+  make prefix=/usr DESTDIR=$pkgdir install
 
   # how 'bout some manpages?
   for mansect in man1 man5 man7; do
-for manpage in $srcdir/$mansect/*; do
-  install -D -m644 $manpage $pkgdir/usr/share/man/$mansect/$(basename 
$manpage)
+for manpage in $srcdir/$mansect/*; do
+  install -D -m644 $manpage $pkgdir/usr/share/man/$mansect/$(basename 
$manpage)
 done
   done
 
   # remove perllocal.pod, .packlist, and empty directories.
-  rm -rf $pkgdir/usr/lib/perl5
+  rm -rf $pkgdir/usr/lib/perl5
 
   # git daemon script
-  install -D -m755 $srcdir/git-daemon $pkgdir/etc/rc.d/git-daemon
-  install -D -m644 $srcdir/git-daemon.conf $pkgdir/etc/conf.d/git-daemon.conf
+  install -D -m755 $srcdir/git-daemon $pkgdir/etc/rc.d/git-daemon
+  install -D -m644 $srcdir/git-daemon.conf 
$pkgdir/etc/conf.d/git-daemon.conf
 }
 
-md5sums=('7f0bc26a6e87d251c9b09fa05a186ed3'
- '94cf18c292f0db30046092ef306bf57c'
+md5sums=('a49291116e3b0564e069ae989e4db6fb'
+ 'cb0ec1095fbdf5b4935d5c43194b976a'
  '8e2648910fd5dd4f1c41d3c7fa9e9156'
  '2e42bf97779a1c6411d89043334c9e78')
-sha256sums=('7d293c5c0e544188d9b9ea94036cc56b39fbe045ead6f8ced00ad02a8854142d'
-'ced2319cbb48a4aa10bc5b1e1167a5de3b694eb9d256e68d978dbe86d997bee9'
+sha256sums=('a1d4a1c59300e68fbc493a2cbe9257048d4d6f4363924bf34f38c413a825f80c'
+'9d8ab1487df85ca596f3f6718d6a7831868abd9b98035a65c71d7f45af4aac8e'
 '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598'
 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68')



[arch-commits] Commit in git/repos (extra-x86_64)

2011-05-05 Thread Dan McGee
Date: Thursday, May 5, 2011 @ 09:19:06
  Author: dan
Revision: 122648

archrelease: remove extra-x86_64

Deleted:
  git/repos/extra-x86_64/



[arch-commits] Commit in git/repos (extra-x86_64)

2011-05-05 Thread Dan McGee
Date: Thursday, May 5, 2011 @ 09:19:16
  Author: dan
Revision: 122649

archrelease: copy trunk to extra-x86_64

Added:
  git/repos/extra-x86_64/



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

2011-05-05 Thread Allan McRae
Date: Thursday, May 5, 2011 @ 09:23:03
  Author: allan
Revision: 122650

db-move: moved elfutils from [core] to [extra] (i686)

Added:
  elfutils/repos/extra-i686/
Deleted:
  elfutils/repos/core-i686/



[arch-commits] Commit in elfutils/repos (core-x86_64 extra-x86_64)

2011-05-05 Thread Allan McRae
Date: Thursday, May 5, 2011 @ 09:23:04
  Author: allan
Revision: 122651

db-move: moved elfutils from [core] to [extra] (x86_64)

Added:
  elfutils/repos/extra-x86_64/
Deleted:
  elfutils/repos/core-x86_64/



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

2011-05-05 Thread andyrtr
Date: Thursday, May 5, 2011 @ 09:24:10
  Author: andyrtr
Revision: 122652

prepare 3.4 branch builds; fix i686 installation, i686 build is still broken

Modified:
  libreoffice/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 13:23:04 UTC (rev 122651)
+++ PKGBUILD2011-05-05 13:24:10 UTC (rev 122652)
@@ -329,7 +329,7 @@

# workaround broken make $DESTDIR install :(
 #  install -dm755 ${pkgdir}/usr/lib/libreoffice
-#  mv 
instsetoo_native/unxlngx6.pro/LibreOffice/native/install/LibO_3.4.0beta3_Linux_x86-64_install_en-US/linux-2.6-x86_64/buildroot/opt/libreoffice/*
 ${pkgdir}/usr/lib/libreoffice
+#  mv 
instsetoo_native/unxlng*/LibreOffice/native/install/LibO_3.4.0beta3_Linux_x86-64_install_en-US/linux-2.6-x86_64/buildroot/opt/libreoffice/*
 ${pkgdir}/usr/lib/libreoffice
 #  chmod -R +w ${pkgdir}/usr/lib/libreoffice

# fix missing desktop integration
@@ -369,7 +369,7 @@
sed -i -e 's/Icon=libreoffice-/Icon=/' 
${pkgdir}/usr/share/applications/*.desktop
 
# add missing mimetype file
-   install -m644 
${srcdir}/build/sysui/unxlngx6.pro/misc/libreoffice/openoffice.org.xml 
${pkgdir}/usr/share/mime/packages/libreoffice.xml
+   install -m644 
${srcdir}/build/sysui/unxlng*/misc/libreoffice/openoffice.org.xml 
${pkgdir}/usr/share/mime/packages/libreoffice.xml
 
# put configuration files into place
install -dm755 ${pkgdir}/etc/libreoffice
@@ -422,7 +422,7 @@
 
 #  cd ${srcdir}/build
 #  install -dm755 ${pkgdir}/usr/lib/libreoffice
-#  mv 
instsetoo_native/unxlngx6.pro/LibreOffice_SDK/native/install/LibO-SDK_3.4beta3_Linux_x86-64_install_en-US/linux-2.6-x86_64/buildroot/opt/libreoffice/*
 ${pkgdir}/usr/lib/libreoffice
+#  mv 
instsetoo_native/unxlng*/LibreOffice_SDK/native/install/LibO-SDK_3.4beta3_Linux_x86-64_install_en-US/linux-2.6-x86_64/buildroot/opt/libreoffice/*
 ${pkgdir}/usr/lib/libreoffice
 
cd ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk
 #  for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do



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

2011-05-05 Thread Dan McGee
Date: Thursday, May 5, 2011 @ 09:25:17
  Author: dan
Revision: 122653

archrelease: remove extra-i686

Deleted:
  git/repos/extra-i686/



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

2011-05-05 Thread Dan McGee
Date: Thursday, May 5, 2011 @ 09:25:26
  Author: dan
Revision: 122654

archrelease: copy trunk to extra-i686

Added:
  git/repos/extra-i686/



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

2011-05-05 Thread Ionut Biru
Date: Thursday, May 5, 2011 @ 12:31:11
  Author: ibiru
Revision: 122655

add gnome-themes-standard to depends avoid crasher for now. FS#24099

Modified:
  nautilus/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 13:25:26 UTC (rev 122654)
+++ PKGBUILD2011-05-05 16:31:11 UTC (rev 122655)
@@ -3,11 +3,11 @@
 
 pkgname=nautilus
 pkgver=3.0.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc=The GNOME shell and file manager
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libexif' 'gnome-desktop' 'exempi' 'gtk3' 'hicolor-icon-theme' 'gvfs' 
'desktop-file-utils' 'gsettings-desktop-schemas' 'shared-mime-info')
+depends=('libexif' 'gnome-desktop' 'exempi' 'gtk3' 'hicolor-icon-theme' 'gvfs' 
'desktop-file-utils' 'gsettings-desktop-schemas' 'shared-mime-info' 
'gnome-themes-standard')
 makedepends=('intltool' 'gobject-introspection')
 replaces=('gnome-volume-manager')
 url=http://www.gnome.org;



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

2011-05-05 Thread Ionut Biru
Date: Thursday, May 5, 2011 @ 12:45:31
  Author: ibiru
Revision: 122656

archrelease: remove extra-i686

Deleted:
  nautilus/repos/extra-i686/



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

2011-05-05 Thread Ionut Biru
Date: Thursday, May 5, 2011 @ 12:45:46
  Author: ibiru
Revision: 122657

archrelease: copy trunk to extra-i686

Added:
  nautilus/repos/extra-i686/



[arch-commits] Commit in nautilus/repos (extra-x86_64)

2011-05-05 Thread Ionut Biru
Date: Thursday, May 5, 2011 @ 12:45:49
  Author: ibiru
Revision: 122658

archrelease: remove extra-x86_64

Deleted:
  nautilus/repos/extra-x86_64/



[arch-commits] Commit in nautilus/repos (extra-x86_64)

2011-05-05 Thread Ionut Biru
Date: Thursday, May 5, 2011 @ 12:46:06
  Author: ibiru
Revision: 122659

archrelease: copy trunk to extra-x86_64

Added:
  nautilus/repos/extra-x86_64/



[arch-commits] Commit in kdeedu/trunk (PKGBUILD cmake-build-fixes-2.diff)

2011-05-05 Thread Andrea Scarpino
Date: Thursday, May 5, 2011 @ 17:05:28
  Author: andrea
Revision: 122660

new tarball

Modified:
  kdeedu/trunk/PKGBUILD
Deleted:
  kdeedu/trunk/cmake-build-fixes-2.diff

--+
 PKGBUILD |   74 ++
 cmake-build-fixes-2.diff |  125 -
 2 files changed, 30 insertions(+), 169 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 16:46:06 UTC (rev 122659)
+++ PKGBUILD2011-05-05 21:05:28 UTC (rev 122660)
@@ -5,7 +5,6 @@
 pkgbase=kdeedu
 pkgname=('kdeedu-blinken'
  'kdeedu-cantor'
- 'kdeedu-data'
  'kdeedu-kalgebra'
  'kdeedu-kalzium'
  'kdeedu-kanagram'
@@ -35,16 +34,13 @@
'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 
'libspectre'
'python2' 'avogadro')
 
source=(http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2;
-'gpsd-2.96.patch'
-'cmake-build-fixes-2.diff')
-sha1sums=('7c94a10f5c17237dcd5c348a8ac129973934cf05'
-  'fd6b6b81945d951bb6ad0bb735df33c11bb2008e'
-  '2c2f3985734a47d6e0f5142604e197fb050ff547')
+'gpsd-2.96.patch')
+sha1sums=('a3e88f234ab4efe71f2169d3d81764300cde7248'
+  'fd6b6b81945d951bb6ad0bb735df33c11bb2008e')
 
 build() {
 cd ${srcdir}/${pkgbase}-${pkgver}
 patch -Np1 -i ${srcdir}/gpsd-2.96.patch
-patch -p1 -i ${srcdir}/cmake-build-fixes-2.diff
 
 cd ${srcdir}
mkdir build
@@ -63,7 +59,7 @@
install='kdeedu.install'
cd $srcdir/build/blinken
make DESTDIR=$pkgdir install
-   cd $srcdir/build/doc/blinken
+   cd $srcdir/build/blinken/doc
make DESTDIR=$pkgdir install
 }
 
@@ -76,24 +72,17 @@
install='kdeedu.install'
cd $srcdir/build/cantor
make DESTDIR=$pkgdir install
-   cd $srcdir/build/doc/cantor
+   cd $srcdir/build/cantor/doc
make DESTDIR=$pkgdir install
 }
 
-package_kdeedu-data() {
-   pkgdesc='Data for KDE Educational Software'
-   groups=()
-   cd $srcdir/build/data
-   make DESTDIR=$pkgdir install
-}
-
 package_kdeedu-kalgebra() {
pkgdesc='Math Expression Solver and Plotter'
depends=('kdebase-runtime')
install='kdeedu.install'
cd $srcdir/build/kalgebra
make DESTDIR=$pkgdir install
-   cd $srcdir/build/doc/kalgebra
+   cd $srcdir/build/kalgebra/doc
make DESTDIR=$pkgdir install
 }
 
@@ -103,17 +92,17 @@
install='kdeedu.install'
cd $srcdir/build/kalzium
make DESTDIR=$pkgdir install
-   cd $srcdir/build/doc/kalzium
+   cd $srcdir/build/kalzium/doc
make DESTDIR=$pkgdir install
 }
 
 package_kdeedu-kanagram() {
pkgdesc='KDE Letter Order Game'
-   depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
+   depends=('kdebase-runtime' 'kdeedu-libkdeedu')
install='kdeedu.install'
cd $srcdir/build/kanagram
make DESTDIR=$pkgdir install
-   cd $srcdir/build/doc/kanagram
+   cd $srcdir/build/kanagram/doc
make DESTDIR=$pkgdir install
 }
 
@@ -123,7 +112,7 @@
install='kdeedu.install'
cd $srcdir/build/kbruch
make DESTDIR=$pkgdir install
-   cd $srcdir/build/doc/kbruch
+   cd $srcdir/build/kbruch/doc
make DESTDIR=$pkgdir install
 }
 
@@ -133,17 +122,17 @@
install='kdeedu.install'
cd $srcdir/build/kgeography
make DESTDIR=$pkgdir install
-   cd $srcdir/build/doc/kgeography
+   cd $srcdir/build/kgeography/doc
make DESTDIR=$pkgdir install
 }
 
 package_kdeedu-khangman() {
pkgdesc='KDE Hangman Game'
-   depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
+   depends=('kdebase-runtime' 'kdeedu-libkdeedu')
install='kdeedu.install'
cd $srcdir/build/khangman
make DESTDIR=$pkgdir install
-   cd $srcdir/build/doc/khangman
+   cd $srcdir/build/khangman/doc
make DESTDIR=$pkgdir install
 }
 
@@ -153,7 +142,7 @@
install='kdeedu.install'
cd $srcdir/build/kig
make DESTDIR=$pkgdir install
-   cd $srcdir/build/doc/kig
+   cd $srcdir/build/kig/doc
make DESTDIR=$pkgdir install
 
# Use the python2 executable
@@ -166,7 +155,7 @@
install='kdeedu.install'
cd $srcdir/build/kiten
make DESTDIR=$pkgdir install
-   cd $srcdir/build/doc/kiten
+   cd $srcdir/build/kiten/doc
make DESTDIR=$pkgdir install
 }
 
@@ -176,7 +165,7 @@
install='kdeedu.install'
cd $srcdir/build/klettres
make DESTDIR=$pkgdir install
-   cd $srcdir/build/doc/klettres
+   cd $srcdir/build/klettres/doc
make DESTDIR=$pkgdir install
 }
 
@@ -186,7 +175,7 @@
install='kdeedu.install'
cd $srcdir/build/kmplot
make DESTDIR=$pkgdir install
-   cd $srcdir/build/doc/kmplot
+   cd 

[arch-commits] Commit in imagemagick/trunk (PKGBUILD libpng_mmx_patch_x86_64.patch)

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 17:34:04
  Author: eric
Revision: 122661

upgpkg: imagemagick 6.6.9.8-1
Upstream update, Fixed rpath, Removed old patch, Fixed permissions on Magick.so

Modified:
  imagemagick/trunk/PKGBUILD
Deleted:
  imagemagick/trunk/libpng_mmx_patch_x86_64.patch

---+
 PKGBUILD  |   19 +++
 libpng_mmx_patch_x86_64.patch |   12 
 2 files changed, 7 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 21:05:28 UTC (rev 122660)
+++ PKGBUILD2011-05-05 21:34:04 UTC (rev 122661)
@@ -3,7 +3,7 @@
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.6.9.4
+pkgver=6.6.9.8
 pkgrel=1
 arch=('i686' 'x86_64')
 url=http://www.imagemagick.org/;
@@ -12,24 +12,18 @@
  'libxext' 'libjpeg-turbo')
 makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 
'libpng')
 
source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz
 \
-libpng_mmx_patch_x86_64.patch perlmagick.rpath.patch)
-md5sums=('e9355aa38daa1d2c42d7e37108bc0dfa'
- '069980fc2590c02aed86420996259302'
+perlmagick.rpath.patch)
+md5sums=('8cd5fe2bc5a29b38c24a6f9576518319'
  'ff9974decbfe9846f8e347239d87e4eb')
-sha1sums=('e3cbf6d61bf29ec8be6796c89b04f10495a6e52d'
-  'e42f3acbe85b6098af75c5cecc9a254baaa0482c'
+sha1sums=('f5fb5844934e23bffbd0ab2a36ea4914eab0dcd0'
   '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
   cd ${srcdir}/ImageMagick-${pkgver%.*}-${pkgver##*.}
 
-  if [ ${CARCH} = 'x86_64' ]; then
-patch -Np1 -i ../libpng_mmx_patch_x86_64.patch
-  fi
-
-  patch -Np0 -i ../perlmagick.rpath.patch
   sed '/AC_PATH_XTRA/d' -i configure.ac
   autoreconf
+  patch -Np0 -i ../perlmagick.rpath.patch
 
   ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
 --enable-openmp --with-wmf --with-openexr --with-xml \
@@ -62,10 +56,11 @@
   'etc/ImageMagick/type-dejavu.xml'
   'etc/ImageMagick/type-ghostscript.xml'
   'etc/ImageMagick/type-windows.xml')
-  options=('!makeflags' '!docs')
+  options=('!makeflags' '!docs' 'libtool')
 
   cd ${srcdir}/ImageMagick-${pkgver%.*}-${pkgver##*.}
   make DESTDIR=${pkgdir} install
+  chmod 755 ${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so 
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/imagemagick/LICENSE
   install -Dm644 NOTICE ${pkgdir}/usr/share/licenses/imagemagick/NOTICE
 

Deleted: libpng_mmx_patch_x86_64.patch
===
--- libpng_mmx_patch_x86_64.patch   2011-05-05 21:05:28 UTC (rev 122660)
+++ libpng_mmx_patch_x86_64.patch   2011-05-05 21:34:04 UTC (rev 122661)
@@ -1,12 +0,0 @@
-diff -Naur ImageMagick-6.2.7.orig/coders/png.c ImageMagick-6.2.7/coders/png.c
 ImageMagick-6.2.7.orig/coders/png.c2006-05-21 12:35:55.784852536 
+0200
-+++ ImageMagick-6.2.7/coders/png.c 2006-05-21 12:36:50.698504392 +0200
-@@ -164,6 +164,8 @@
- #define PNG_MAX_UINT (png_uint_32) 0x7fffL
- #endif
- 
-+#undef PNG_ASSEMBLER_CODE_SUPPORTED
-+
- /*
-   Constant strings for known chunk types.  If you need to add a chunk,
-   add a string holding the name here.   To make the code more



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

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 17:34:07
  Author: eric
Revision: 122662

archrelease: remove extra-i686

Deleted:
  imagemagick/repos/extra-i686/



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

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 17:34:18
  Author: eric
Revision: 122663

archrelease: copy trunk to extra-i686

Added:
  imagemagick/repos/extra-i686/



[arch-commits] Commit in imagemagick/repos (extra-x86_64)

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 17:34:21
  Author: eric
Revision: 122664

archrelease: remove extra-x86_64

Deleted:
  imagemagick/repos/extra-x86_64/



[arch-commits] Commit in imagemagick/repos (extra-x86_64)

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 17:34:30
  Author: eric
Revision: 122665

archrelease: copy trunk to extra-x86_64

Added:
  imagemagick/repos/extra-x86_64/



[arch-commits] Commit in sysklogd/trunk (ChangeLog PKGBUILD sysklogd-debian.patch)

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 19:43:52
  Author: eric
Revision: 122666

upgpkg: sysklogd 1.5-3
Applied patch from Debian, Added etc/logrotate.d/syslog to backup array, 
PKGBUILD clean-up

Added:
  sysklogd/trunk/sysklogd-debian.patch
Modified:
  sysklogd/trunk/PKGBUILD
Deleted:
  sysklogd/trunk/ChangeLog

---+
 ChangeLog |5 -
 PKGBUILD  |   48 
 sysklogd-debian.patch |   21 +
 3 files changed, 49 insertions(+), 25 deletions(-)

Deleted: ChangeLog
===
--- ChangeLog   2011-05-05 21:34:30 UTC (rev 122665)
+++ ChangeLog   2011-05-05 23:43:52 UTC (rev 122666)
@@ -1,5 +0,0 @@
-2008-03-13  Eric Belanger  e...@archlinux.org
-
-   * Added support for  2 GB logfiles (close FS#9831)
-   * FSH man pages
-   * Added ChangeLog file

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 21:34:30 UTC (rev 122665)
+++ PKGBUILD2011-05-05 23:43:52 UTC (rev 122666)
@@ -1,23 +1,27 @@
 # $Id$
-# Maintainer: Eric Belanger e...@archlinux.org
-# Contributor: judd jvi...@zeroflux.org
+# Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=sysklogd
 pkgver=1.5
-pkgrel=2
+pkgrel=3
 pkgdesc=System and kernel log daemons
 arch=('i686' 'x86_64')
 url=http://www.infodrom.org/projects/sysklogd/;
 license=('GPL' 'BSD')
 depends=('glibc' 'logrotate')
 provides=('logger')
-backup=(etc/syslog.conf)
-source=(http://www.infodrom.org/projects/sysklogd/download/$pkgname-$pkgver.tar.gz
 \
-syslog.conf syslog.logrotate syslogd klogd LICENSE)
-md5sums=('e053094e8103165f98ddafe828f6ae4b' 'b8bc568494359fa932b7a5e17c4ba4de'\
- 'fb3fdb03959ff62ede00487c853bb950' '92531ee64cdc0ca978bbe9a81c269211'\
- 'c2fe75c82c35371972b6ceda72d6a861' '7930f7ff5038e1318511624e348581cc')
+backup=('etc/syslog.conf' 'etc/logrotate.d/syslog')
+source=(http://www.infodrom.org/projects/sysklogd/download/${pkgname}-${pkgver}.tar.gz
 \
+sysklogd-debian.patch syslog.conf syslog.logrotate syslogd klogd 
LICENSE)
+md5sums=('e053094e8103165f98ddafe828f6ae4b'
+ '1759e667ecf07ba23297f2c05b8dbe3f'
+ 'b8bc568494359fa932b7a5e17c4ba4de'
+ 'fb3fdb03959ff62ede00487c853bb950'
+ '92531ee64cdc0ca978bbe9a81c269211'
+ 'c2fe75c82c35371972b6ceda72d6a861'
+ '7930f7ff5038e1318511624e348581cc')
 sha1sums=('070cce745b023f2ce7ca7d9888af434d6d61c236'
+  '7a7320b8e4e21d85cfc9a5aa478a8b013b8afe96'
   '35b4cb76109a6ffe9269021a6bfb4f8da614a4eb'
   'e67c0f78f13c94507d3f686b4e5b8340db4624fd'
   '848beb23b9ca4de19c6022df03878dbe57e04c0a'
@@ -25,15 +29,19 @@
   'c416bcefd3d3d618139cc7912310caddf34c0c0b')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  sed -i s/-O3/${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE/ 
Makefile || return 1
-  make || return 1
-  install -d $startdir/pkg/usr/sbin
-  install -d $startdir/pkg/usr/share/man/{man5,man8}
-  make INSTALL=/bin/install prefix=$startdir/pkg install
-  install -D -m644 ../syslog.conf $startdir/pkg/etc/syslog.conf
-  install -D -m644 ../syslog.logrotate $startdir/pkg/etc/logrotate.d/syslog
-  install -D -m755 ../syslogd $startdir/pkg/etc/rc.d/syslogd
-  install -D -m755 ../klogd $startdir/pkg/etc/rc.d/klogd
-  install -D -m644 ../LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p1 -i ../sysklogd-debian.patch
+  sed -i s/-O3/${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE/ Makefile
+  make
 }
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+  install -d ${pkgdir}/usr/sbin ${pkgdir}/usr/share/man/{man5,man8}
+  make INSTALL=/bin/install prefix=${pkgdir} install
+  install -D -m644 ../syslog.conf ${pkgdir}/etc/syslog.conf
+  install -D -m644 ../syslog.logrotate ${pkgdir}/etc/logrotate.d/syslog
+  install -D -m755 ../syslogd ${pkgdir}/etc/rc.d/syslogd
+  install -D -m755 ../klogd ${pkgdir}/etc/rc.d/klogd
+  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Added: sysklogd-debian.patch
===
--- sysklogd-debian.patch   (rev 0)
+++ sysklogd-debian.patch   2011-05-05 23:43:52 UTC (rev 122666)
@@ -0,0 +1,21 @@
+--- sysklogd-1.5.orig/syslogd.c
 sysklogd-1.5/syslogd.c
+@@ -2392,7 +2392,7 @@
+   if (*p == '\0' || *p == '#')
+   continue;
+ #if CONT_LINE
+-  strcpy(cline, p);
++  memmove(cline, p, strlen(p)+1);
+ #endif
+   for (p = strchr(cline, '\0'); isspace(*--p););
+ #if CONT_LINE
+--- sysklogd-1.5.orig/ksym_mod.c
 sysklogd-1.5/ksym_mod.c
+@@ -189,7 +189,6 @@
+   else
+   Syslog(LOG_ERR, Error loading kernel symbols  \
+  - %s\n, strerror(errno));
+-

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

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 19:49:21
  Author: eric
Revision: 122667

archrelease: remove extra-i686

Deleted:
  sysklogd/repos/extra-i686/



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

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 19:49:31
  Author: eric
Revision: 122668

archrelease: copy trunk to extra-i686

Added:
  sysklogd/repos/extra-i686/



[arch-commits] Commit in sysklogd/repos (extra-x86_64)

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 19:49:45
  Author: eric
Revision: 122669

archrelease: remove extra-x86_64

Deleted:
  sysklogd/repos/extra-x86_64/



[arch-commits] Commit in sysklogd/repos (extra-x86_64)

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 19:49:54
  Author: eric
Revision: 122670

archrelease: copy trunk to extra-x86_64

Added:
  sysklogd/repos/extra-x86_64/



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

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 23:51:25
  Author: eric
Revision: 122671

upgpkg: fvwm 2.6.1-2
Added Xinerama and Xcursor support (close FS#23867)

Modified:
  fvwm/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 23:49:54 UTC (rev 122670)
+++ PKGBUILD2011-05-06 03:51:25 UTC (rev 122671)
@@ -3,13 +3,15 @@
 
 pkgname=fvwm
 pkgver=2.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc=A multiple large virtual desktop window manager originally derived 
from twm
 arch=('i686' 'x86_64')
 url=http://www.fvwm.org;
 license=('GPL' 'custom')
-depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'readline' 'librsvg')
+depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 
'libxcursor')
+makedepends=('libxslt')
 conflicts=('fvwm-devel')
+options=('!emptydirs')
 source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/${pkgname}-${pkgver}.tar.bz2 
fvwm2.desktop)
 md5sums=('fbbbed1bb41fa0878b17ee209947602d'
  'e52a6ef25a936dcf3ad0e58f2e9ed0ea')



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

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 23:51:41
  Author: eric
Revision: 122672

archrelease: remove extra-i686

Deleted:
  fvwm/repos/extra-i686/



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

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 23:51:49
  Author: eric
Revision: 122673

archrelease: copy trunk to extra-i686

Added:
  fvwm/repos/extra-i686/



[arch-commits] Commit in fvwm/repos (extra-x86_64)

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 23:52:00
  Author: eric
Revision: 122674

archrelease: remove extra-x86_64

Deleted:
  fvwm/repos/extra-x86_64/



[arch-commits] Commit in fvwm/repos (extra-x86_64)

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 23:52:08
  Author: eric
Revision: 122675

archrelease: copy trunk to extra-x86_64

Added:
  fvwm/repos/extra-x86_64/



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

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 23:54:22
  Author: eric
Revision: 122676

upgpkg: fvwm-devel 2.7.0-2
Added Xinerama and Xcursor support (close FS#23867)

Modified:
  fvwm-devel/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-06 03:52:08 UTC (rev 122675)
+++ PKGBUILD2011-05-06 03:54:22 UTC (rev 122676)
@@ -3,15 +3,16 @@
 
 pkgname=fvwm-devel
 pkgver=2.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc=A multiple large virtual desktop window manager originally derived 
from twm
 arch=('i686' 'x86_64')
 url=http://www.fvwm.org;
 license=('GPL' 'custom')
-depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'readline' 'librsvg')
-makedepends=('pkg-config')
+depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 
'libxcursor')
+makedepends=('libxslt')
 conflicts=('fvwm')
 provides=(fvwm=${pkgver})
+options=('!emptydirs')
 source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-${pkgver}.tar.bz2 
fvwm-devel.desktop)
 md5sums=('c7dbb0c067f570e478005edb95d3'
  '3f5bcb246e035ff29aa5bf54487a3db4')



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

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 23:54:33
  Author: eric
Revision: 122677

archrelease: remove extra-i686

Deleted:
  fvwm-devel/repos/extra-i686/



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

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 23:54:41
  Author: eric
Revision: 122678

archrelease: copy trunk to extra-i686

Added:
  fvwm-devel/repos/extra-i686/



[arch-commits] Commit in fvwm-devel/repos (extra-x86_64)

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 23:54:52
  Author: eric
Revision: 122679

archrelease: remove extra-x86_64

Deleted:
  fvwm-devel/repos/extra-x86_64/



[arch-commits] Commit in fvwm-devel/repos (extra-x86_64)

2011-05-05 Thread Eric Bélanger
Date: Thursday, May 5, 2011 @ 23:55:00
  Author: eric
Revision: 122680

archrelease: copy trunk to extra-x86_64

Added:
  fvwm-devel/repos/extra-x86_64/



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

2011-05-05 Thread Eric Bélanger
Date: Friday, May 6, 2011 @ 00:34:00
  Author: eric
Revision: 122681

upgpkg: xsnow 1.42-5
Rebuilt with latest toolchain

Modified:
  xsnow/trunk/PKGBUILD
Deleted:
  xsnow/trunk/ChangeLog

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

Deleted: ChangeLog
===
--- ChangeLog   2011-05-06 03:55:00 UTC (rev 122680)
+++ ChangeLog   2011-05-06 04:34:00 UTC (rev 122681)
@@ -1,6 +0,0 @@
-2008-03-31  Eric Belanger  e...@archlinux.org
-
-   * xsnow 1.42-4
-   * FSH man pages
-   * Added ChangeLog
-

Modified: PKGBUILD
===
--- PKGBUILD2011-05-06 03:55:00 UTC (rev 122680)
+++ PKGBUILD2011-05-06 04:34:00 UTC (rev 122681)
@@ -1,33 +1,31 @@
 # $Id$
-# Contributor: Eric Belanger e...@archlinux.org
-# Contributor: Jochem Kossen j.kos...@home.nl
-# Maintainer: Daniel J Griffiths ghost1...@archlinux.us
+# Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=xsnow
 pkgver=1.42
-pkgrel=4
-pkgdesc=xsnow will let it snow on the root window and on windows. Santa and 
his reindeer will complete your festive-season feeling.
+pkgrel=5
+pkgdesc=Xsnow will let it snow on the root window and on windows. Santa and 
his reindeer will complete your festive-season feeling.
 arch=('i686' 'x86_64')
 url=http://dropmix.xs4all.nl/rick/Xsnow/;
 license=('custom')
-depends=('glibc' 'libxpm')
+depends=('libxpm')
 makedepends=('imake')
 source=(http://dropmix.xs4all.nl/rick/Xsnow/${pkgname}-${pkgver}.tar.gz 
LICENSE)
-md5sums=('451d8fc0a2b5393b428faa496a556036' '60d377d8f9c0e99297160a464d4a0a9e')
+md5sums=('451d8fc0a2b5393b428faa496a556036'
+ '60d377d8f9c0e99297160a464d4a0a9e')
 sha1sums=('d63987560dac9c6341e50d270089e40d17031ce3'
   'c93e236bed35a2d5dc23202c1c615d4e146fba49')
 
 build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   xmkmf
-   make depend
-   make || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
+  xmkmf
+  make depend
+  make
 }
 
 package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   make DESTDIR=${pkgdir} MANPATH=/usr/share/man install install.man
-   chmod 644 ${pkgdir}/usr/share/man/man1/xsnow.1x
-   install -Dm644 ${srcdir}/LICENSE \
-   ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} MANPATH=/usr/share/man install install.man
+  chmod 644 ${pkgdir}/usr/share/man/man1/xsnow.1x
+  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }



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

2011-05-05 Thread Eric Bélanger
Date: Friday, May 6, 2011 @ 00:34:12
  Author: eric
Revision: 122682

archrelease: remove extra-i686

Deleted:
  xsnow/repos/extra-i686/



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

2011-05-05 Thread Eric Bélanger
Date: Friday, May 6, 2011 @ 00:34:20
  Author: eric
Revision: 122683

archrelease: copy trunk to extra-i686

Added:
  xsnow/repos/extra-i686/



[arch-commits] Commit in xsnow/repos (extra-x86_64)

2011-05-05 Thread Eric Bélanger
Date: Friday, May 6, 2011 @ 00:34:29
  Author: eric
Revision: 122684

archrelease: remove extra-x86_64

Deleted:
  xsnow/repos/extra-x86_64/



[arch-commits] Commit in xsnow/repos (extra-x86_64)

2011-05-05 Thread Eric Bélanger
Date: Friday, May 6, 2011 @ 00:34:37
  Author: eric
Revision: 122685

archrelease: copy trunk to extra-x86_64

Added:
  xsnow/repos/extra-x86_64/



[arch-commits] Commit in keytouch-editor/trunk (3 files)

2011-05-05 Thread Eric Bélanger
Date: Friday, May 6, 2011 @ 01:33:49
  Author: eric
Revision: 122686

upgpkg: keytouch-editor 3.1.3-2
Updated install scriptlet

Modified:
  keytouch-editor/trunk/PKGBUILD
  keytouch-editor/trunk/keytouch-editor.install
Deleted:
  keytouch-editor/trunk/ChangeLog

-+
 ChangeLog   |8 
 PKGBUILD|   20 +---
 keytouch-editor.install |6 +-
 3 files changed, 10 insertions(+), 24 deletions(-)

Deleted: ChangeLog
===
--- ChangeLog   2011-05-06 04:34:37 UTC (rev 122685)
+++ ChangeLog   2011-05-06 05:33:49 UTC (rev 122686)
@@ -1,8 +0,0 @@
-2008-06-22  Eric Belanger  e...@archlinux.org
-
-   * keytouch-editor 3.1.3-1
-   * Patched for glibc 2.8
-* Added to [extra] repo
-* Added ChangeLog
-
-

Modified: PKGBUILD
===
--- PKGBUILD2011-05-06 04:34:37 UTC (rev 122685)
+++ PKGBUILD2011-05-06 05:33:49 UTC (rev 122686)
@@ -1,11 +1,9 @@
 # $Id$
-# Contributor: Eric Belanger e...@archlinux.org
-# Contributor: mouse256  AndyRTR
-# Maintainer: Daniel J Griffiths ghost1...@archlinux.us
+# Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=keytouch-editor
 pkgver=3.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc=An utility to create keyboard files for keytouch
 arch=('i686' 'x86_64')
 url=http://keytouch.sourceforge.net/;
@@ -17,14 +15,14 @@
 sha1sums=('a8c0b28bac4b1f9de3897e1a78dc14b4d994334e' 
'c6b725267a628cfc93388044cfd72974f53debaf')
 
 build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   patch -p1  ../keytouch-editor-3.1.3-glibc28.patch || return 1
-   autoreconf || return 1
-   ./configure --prefix=/usr || return 1
-   make || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p1  ../keytouch-editor-3.1.3-glibc28.patch
+  autoreconf
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   make DESTDIR=${pkgdir} install || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
 }

Modified: keytouch-editor.install
===
--- keytouch-editor.install 2011-05-06 04:34:37 UTC (rev 122685)
+++ keytouch-editor.install 2011-05-06 05:33:49 UTC (rev 122686)
@@ -1,10 +1,6 @@
 post_install() {
   cat  EOF
 == To use keytouch-editor:
-You'll need to have either gksu (pacman -S gksu) or kdesu (pacman -S kdebase) 
installed.
+== You'll need to have either gksu (pacman -S gksu) or kdesu (pacman -S 
kdebase-runtime) installed.
 EOF
 }
-
-post_upgrade() {
-  post_install $1
-}



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

2011-05-05 Thread Eric Bélanger
Date: Friday, May 6, 2011 @ 01:34:03
  Author: eric
Revision: 122687

archrelease: remove extra-i686

Deleted:
  keytouch-editor/repos/extra-i686/



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

2011-05-05 Thread Eric Bélanger
Date: Friday, May 6, 2011 @ 01:34:11
  Author: eric
Revision: 122688

archrelease: copy trunk to extra-i686

Added:
  keytouch-editor/repos/extra-i686/



[arch-commits] Commit in keytouch-editor/repos (extra-x86_64)

2011-05-05 Thread Eric Bélanger
Date: Friday, May 6, 2011 @ 01:34:22
  Author: eric
Revision: 122689

archrelease: remove extra-x86_64

Deleted:
  keytouch-editor/repos/extra-x86_64/



[arch-commits] Commit in keytouch-editor/repos (extra-x86_64)

2011-05-05 Thread Eric Bélanger
Date: Friday, May 6, 2011 @ 01:34:32
  Author: eric
Revision: 122690

archrelease: copy trunk to extra-x86_64

Added:
  keytouch-editor/repos/extra-x86_64/