[arch-commits] Commit in psi-i18n/trunk (PKGBUILD)
Date: Wednesday, October 10, 2012 @ 12:39:19
Author: pierre
Revision: 168395
upgpkg: psi-i18n 0.15-1
Modified:
psi-i18n/trunk/PKGBUILD
--+
PKGBUILD | 62 ++---
1 file changed, 27 insertions(+), 35 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-10 05:00:20 UTC (rev 168394)
+++ PKGBUILD2012-10-10 16:39:19 UTC (rev 168395)
@@ -2,61 +2,53 @@
# Maintainer: Pierre Schmitz pie...@archlinux.de
pkgname=psi-i18n
-pkgver=0.14
-pkgrel=3
+pkgver=0.15
+pkgrel=1
arch=('any')
pkgdesc='Language packs for Psi'
depends=('psi')
license=('GPL')
url='http://www.psi-im.org'
source=('http://psi-im.org/download/lang/psi_be.qm'
- 'http://psi-im.org/download/lang/qt_be.qm'
'http://psi-im.org/download/lang/psi_cs.qm'
'http://psi-im.org/download/lang/psi_de.qm'
- 'http://psi-im.org/download/lang/qt_de.qm'
+ 'http://psi-im.org/download/lang/psi_eo.qm'
'http://psi-im.org/download/lang/psi_es.qm'
- 'http://psi-im.org/download/lang/qt_es.qm'
+ 'http://psi-im.org/download/lang/psi_es_ES.qm'
'http://psi-im.org/download/lang/psi_fr.qm'
- 'http://psi-im.org/download/lang/qt_fr.qm'
'http://psi-im.org/download/lang/psi_it.qm'
'http://psi-im.org/download/lang/psi_ja.qm'
'http://psi-im.org/download/lang/psi_mk.qm'
- 'http://psi-im.org/download/lang/qt_mk.qm'
'http://psi-im.org/download/lang/psi_pl.qm'
- 'http://psi-im.org/download/lang/qt_pl.qm'
'http://psi-im.org/download/lang/psi_pt_BR.qm'
'http://psi-im.org/download/lang/psi_ru.qm'
- 'http://psi-im.org/download/lang/qt_ru.qm'
'http://psi-im.org/download/lang/psi_sl.qm'
'http://psi-im.org/download/lang/psi_sv.qm'
- 'http://psi-im.org/download/lang/qt_sv.qm'
+ 'http://psi-im.org/download/lang/psi_uk.qm'
'http://psi-im.org/download/lang/psi_ur_PK.qm'
-'http://psi-im.org/download/lang/qt_ur_PK.qm'
+ 'http://psi-im.org/download/lang/psi_vi.qm'
+ 'http://psi-im.org/download/lang/psi_zh_CN.qm'
'http://psi-im.org/download/lang/psi_zh_TW.qm')
-md5sums=('f628db62e6b30a4072ea9779f75cc683'
- '0a55d0dc3670094726a4534a3817e48b'
- '52e7188513e3f48afd4d445263cd4d76'
- '5f92734bbba1154b49ba4b8217dafc56'
- 'c215a01d474c2e0bf7a0ca7ac41aabf9'
- '5e3b59d5c84f1965cd64a23df7356cad'
- '03db4bdc192862d4faf228f53740c995'
- 'd024849908910cc3ba36367e6c350481'
- 'd691f471dfdeb6b7dd427610f18518fd'
- 'a9c978b841f44978d6c42a45460f742b'
- '55b2c2d8c2cf85deff4a251d2f7e2c3d'
- 'e8c65ff0f662b66134be61af16df174c'
- 'e4e0c359ba36b526252d39cc94348423'
- '3f70cfd939f3e028cd72e02e88024e1f'
- '6d28f48b26d2e2592f185e3455c5018c'
- 'bc1874568651921a52cd6f74582c9833'
- '11da8c1b935a622abd356cfa18a15e77'
- '2ff8c8e48f7dafa79a5492104ab9'
- '5e5d5ce0fdb520880a21ed47a993d9fa'
- 'f0ec4b063d3ad36761d4b1664ea7d784'
- '9e739e288577ab115d0d9af778e8e050'
- '47102c8403715028489ecaa57dd478c7'
- 'bc108cf50fe8bd6122fa198c933c5d3c'
- '92b456a4a87704693d5fcc0af3b81b61')
+md5sums=('47d59547b763cc5faf239f88e33013f3'
+ '2800b4c549553b3ffc9962a11421e216'
+ '6a10c7ee8f1bbbdeb312c2307ff69745'
+ '95ffaa69e5faf0e80fe61269eac4'
+ 'e98895000e5e8a2b4e60ff6e0422a9e7'
+ '4201fb6718e11f09c64f636294ae4f9d'
+ 'b9fdc4a0743665994de37bfd0904d891'
+ 'b19c3c63817a4aa9a158be3be7de2538'
+ '930572adf773b1a7dfcfd6838e5ed438'
+ '0f1641a990f07619f9d48892a7992223'
+ '2ed61225f1f3e39384c9d21c1ad570fc'
+ '4555e2e489ad1fbe1887d1a3efbff03a'
+ '89d8b66aac37d83ecd4c2eb69950a4f0'
+ '701a2233dfad17e9e716a2bb6433cf79'
+ 'dc40389d3ef8b09e1cdd1d026e3e5519'
+ '7471c4f6ede205a85af27a735f4247e1'
+ 'b8deead1c303c38e64f7db72493a3be6'
+ 'acbb012cb0d1366378553938545e7191'
+ 'cfe0ca65a4441056b8c7284d9d015167'
+ 'df75abcd3d8bf30cd14af6d5a7f217cb')
package() {
for i in $srcdir/*.qm; do
[arch-commits] Commit in psi-i18n/repos/extra-any (PKGBUILD PKGBUILD)
Date: Wednesday, October 10, 2012 @ 12:39:45
Author: pierre
Revision: 168396
archrelease: copy trunk to extra-any
Added:
psi-i18n/repos/extra-any/PKGBUILD
(from rev 168395, psi-i18n/trunk/PKGBUILD)
Deleted:
psi-i18n/repos/extra-any/PKGBUILD
--+
PKGBUILD | 122 -
1 file changed, 57 insertions(+), 65 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2012-10-10 16:39:19 UTC (rev 168395)
+++ PKGBUILD2012-10-10 16:39:45 UTC (rev 168396)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz pie...@archlinux.de
-
-pkgname=psi-i18n
-pkgver=0.14
-pkgrel=3
-arch=('any')
-pkgdesc='Language packs for Psi'
-depends=('psi')
-license=('GPL')
-url='http://www.psi-im.org'
-source=('http://psi-im.org/download/lang/psi_be.qm'
- 'http://psi-im.org/download/lang/qt_be.qm'
- 'http://psi-im.org/download/lang/psi_cs.qm'
- 'http://psi-im.org/download/lang/psi_de.qm'
- 'http://psi-im.org/download/lang/qt_de.qm'
- 'http://psi-im.org/download/lang/psi_es.qm'
- 'http://psi-im.org/download/lang/qt_es.qm'
- 'http://psi-im.org/download/lang/psi_fr.qm'
- 'http://psi-im.org/download/lang/qt_fr.qm'
- 'http://psi-im.org/download/lang/psi_it.qm'
- 'http://psi-im.org/download/lang/psi_ja.qm'
- 'http://psi-im.org/download/lang/psi_mk.qm'
- 'http://psi-im.org/download/lang/qt_mk.qm'
- 'http://psi-im.org/download/lang/psi_pl.qm'
- 'http://psi-im.org/download/lang/qt_pl.qm'
- 'http://psi-im.org/download/lang/psi_pt_BR.qm'
- 'http://psi-im.org/download/lang/psi_ru.qm'
- 'http://psi-im.org/download/lang/qt_ru.qm'
- 'http://psi-im.org/download/lang/psi_sl.qm'
- 'http://psi-im.org/download/lang/psi_sv.qm'
- 'http://psi-im.org/download/lang/qt_sv.qm'
-'http://psi-im.org/download/lang/psi_ur_PK.qm'
-'http://psi-im.org/download/lang/qt_ur_PK.qm'
-'http://psi-im.org/download/lang/psi_zh_TW.qm')
-md5sums=('f628db62e6b30a4072ea9779f75cc683'
- '0a55d0dc3670094726a4534a3817e48b'
- '52e7188513e3f48afd4d445263cd4d76'
- '5f92734bbba1154b49ba4b8217dafc56'
- 'c215a01d474c2e0bf7a0ca7ac41aabf9'
- '5e3b59d5c84f1965cd64a23df7356cad'
- '03db4bdc192862d4faf228f53740c995'
- 'd024849908910cc3ba36367e6c350481'
- 'd691f471dfdeb6b7dd427610f18518fd'
- 'a9c978b841f44978d6c42a45460f742b'
- '55b2c2d8c2cf85deff4a251d2f7e2c3d'
- 'e8c65ff0f662b66134be61af16df174c'
- 'e4e0c359ba36b526252d39cc94348423'
- '3f70cfd939f3e028cd72e02e88024e1f'
- '6d28f48b26d2e2592f185e3455c5018c'
- 'bc1874568651921a52cd6f74582c9833'
- '11da8c1b935a622abd356cfa18a15e77'
- '2ff8c8e48f7dafa79a5492104ab9'
- '5e5d5ce0fdb520880a21ed47a993d9fa'
- 'f0ec4b063d3ad36761d4b1664ea7d784'
- '9e739e288577ab115d0d9af778e8e050'
- '47102c8403715028489ecaa57dd478c7'
- 'bc108cf50fe8bd6122fa198c933c5d3c'
- '92b456a4a87704693d5fcc0af3b81b61')
-
-package() {
- for i in $srcdir/*.qm; do
- install -D -m644 $i $pkgdir/usr/share/psi/$(basename $i)
- done
-}
Copied: psi-i18n/repos/extra-any/PKGBUILD (from rev 168395,
psi-i18n/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2012-10-10 16:39:45 UTC (rev 168396)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Pierre Schmitz pie...@archlinux.de
+
+pkgname=psi-i18n
+pkgver=0.15
+pkgrel=1
+arch=('any')
+pkgdesc='Language packs for Psi'
+depends=('psi')
+license=('GPL')
+url='http://www.psi-im.org'
+source=('http://psi-im.org/download/lang/psi_be.qm'
+ 'http://psi-im.org/download/lang/psi_cs.qm'
+ 'http://psi-im.org/download/lang/psi_de.qm'
+ 'http://psi-im.org/download/lang/psi_eo.qm'
+ 'http://psi-im.org/download/lang/psi_es.qm'
+ 'http://psi-im.org/download/lang/psi_es_ES.qm'
+ 'http://psi-im.org/download/lang/psi_fr.qm'
+ 'http://psi-im.org/download/lang/psi_it.qm'
+ 'http://psi-im.org/download/lang/psi_ja.qm'
+ 'http://psi-im.org/download/lang/psi_mk.qm'
+ 'http://psi-im.org/download/lang/psi_pl.qm'
+ 'http://psi-im.org/download/lang/psi_pt_BR.qm'
+ 'http://psi-im.org/download/lang/psi_ru.qm'
+ 'http://psi-im.org/download/lang/psi_sl.qm'
+ 'http://psi-im.org/download/lang/psi_sv.qm'
+ 'http://psi-im.org/download/lang/psi_uk.qm'
+'http://psi-im.org/download/lang/psi_ur_PK.qm'
+ 'http://psi-im.org/download/lang/psi_vi.qm'
+ 'http://psi-im.org/download/lang/psi_zh_CN.qm'
+'http://psi-im.org/download/lang/psi_zh_TW.qm')
+md5sums=('47d59547b763cc5faf239f88e33013f3'
+ '2800b4c549553b3ffc9962a11421e216'
+ '6a10c7ee8f1bbbdeb312c2307ff69745'
+
[arch-commits] Commit in chromium/trunk (PKGBUILD)
Date: Wednesday, October 10, 2012 @ 16:01:49
Author: foutrelis
Revision: 168397
upgpkg: chromium 22.0.1229.94-1
New upstream release.
Modified:
chromium/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-10 16:39:45 UTC (rev 168396)
+++ PKGBUILD2012-10-10 20:01:49 UTC (rev 168397)
@@ -5,7 +5,7 @@
# Contributor: Daniel J Griffiths ghost1...@archlinux.us
pkgname=chromium
-pkgver=22.0.1229.92
+pkgver=22.0.1229.94
pkgrel=1
pkgdesc=The open-source project behind Google Chrome, an attempt at creating
a safer, faster, and more stable browser
arch=('i686' 'x86_64')
@@ -25,7 +25,7 @@
chromium.sh
chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
chromium-ppapi-r0.patch)
-sha256sums=('7f796f9df9ac2030801f5e0fc4b19d00757568f295d46e9cbc235853ec861e19'
+sha256sums=('a0af7e681ef43a7a17b32a1f6e1dc16ffa2a5f725f946ddaeea13660eba31caf'
'09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
'478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
'4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
[arch-commits] Commit in chromium/repos (28 files)
Date: Wednesday, October 10, 2012 @ 16:02:34 Author: foutrelis Revision: 168398 archrelease: copy trunk to extra-i686, extra-x86_64 Added: chromium/repos/extra-i686/PKGBUILD (from rev 168397, chromium/trunk/PKGBUILD) chromium/repos/extra-i686/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch (from rev 168397, chromium/trunk/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch) chromium/repos/extra-i686/chromium-ppapi-r0.patch (from rev 168397, chromium/trunk/chromium-ppapi-r0.patch) chromium/repos/extra-i686/chromium.default (from rev 168397, chromium/trunk/chromium.default) chromium/repos/extra-i686/chromium.desktop (from rev 168397, chromium/trunk/chromium.desktop) chromium/repos/extra-i686/chromium.install (from rev 168397, chromium/trunk/chromium.install) chromium/repos/extra-i686/chromium.sh (from rev 168397, chromium/trunk/chromium.sh) chromium/repos/extra-x86_64/PKGBUILD (from rev 168397, chromium/trunk/PKGBUILD) chromium/repos/extra-x86_64/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch (from rev 168397, chromium/trunk/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch) chromium/repos/extra-x86_64/chromium-ppapi-r0.patch (from rev 168397, chromium/trunk/chromium-ppapi-r0.patch) chromium/repos/extra-x86_64/chromium.default (from rev 168397, chromium/trunk/chromium.default) chromium/repos/extra-x86_64/chromium.desktop (from rev 168397, chromium/trunk/chromium.desktop) chromium/repos/extra-x86_64/chromium.install (from rev 168397, chromium/trunk/chromium.install) chromium/repos/extra-x86_64/chromium.sh (from rev 168397, chromium/trunk/chromium.sh) Deleted: chromium/repos/extra-i686/PKGBUILD chromium/repos/extra-i686/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch chromium/repos/extra-i686/chromium-ppapi-r0.patch chromium/repos/extra-i686/chromium.default chromium/repos/extra-i686/chromium.desktop chromium/repos/extra-i686/chromium.install chromium/repos/extra-i686/chromium.sh chromium/repos/extra-x86_64/PKGBUILD chromium/repos/extra-x86_64/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch chromium/repos/extra-x86_64/chromium-ppapi-r0.patch chromium/repos/extra-x86_64/chromium.default chromium/repos/extra-x86_64/chromium.desktop chromium/repos/extra-x86_64/chromium.install chromium/repos/extra-x86_64/chromium.sh --+ extra-i686/PKGBUILD | 264 +- extra-i686/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch | 70 +- extra-i686/chromium-ppapi-r0.patch | 22 extra-i686/chromium.default |8 extra-i686/chromium.desktop | 226 extra-i686/chromium.install | 24 extra-i686/chromium.sh | 32 - extra-x86_64/PKGBUILD| 264 +- extra-x86_64/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch | 70 +- extra-x86_64/chromium-ppapi-r0.patch | 22 extra-x86_64/chromium.default|8 extra-x86_64/chromium.desktop| 226 extra-x86_64/chromium.install| 24 extra-x86_64/chromium.sh | 32 - 14 files changed, 646 insertions(+), 646 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 168397:168398 to see the changes.
[arch-commits] Commit in mono/repos (18 files)
Date: Wednesday, October 10, 2012 @ 18:19:40
Author: tomegun
Revision: 168399
db-move: moved mono from [testing] to [extra] (i686, x86_64)
Added:
mono/repos/extra-i686/PKGBUILD
(from rev 168398, mono/repos/testing-i686/PKGBUILD)
mono/repos/extra-i686/bug434892.patch
(from rev 168398, mono/repos/testing-i686/bug434892.patch)
mono/repos/extra-i686/mini_amd64.patch
(from rev 168398, mono/repos/testing-i686/mini_amd64.patch)
mono/repos/extra-i686/mono.binfmt.d
(from rev 168398, mono/repos/testing-i686/mono.binfmt.d)
mono/repos/extra-x86_64/PKGBUILD
(from rev 168398, mono/repos/testing-x86_64/PKGBUILD)
mono/repos/extra-x86_64/bug434892.patch
(from rev 168398, mono/repos/testing-x86_64/bug434892.patch)
mono/repos/extra-x86_64/mini_amd64.patch
(from rev 168398, mono/repos/testing-x86_64/mini_amd64.patch)
mono/repos/extra-x86_64/mono.binfmt.d
(from rev 168398, mono/repos/testing-x86_64/mono.binfmt.d)
Deleted:
mono/repos/extra-i686/PKGBUILD
mono/repos/extra-i686/bug434892.patch
mono/repos/extra-i686/mini_amd64.patch
mono/repos/extra-i686/mono.rc.d
mono/repos/extra-x86_64/PKGBUILD
mono/repos/extra-x86_64/bug434892.patch
mono/repos/extra-x86_64/mini_amd64.patch
mono/repos/extra-x86_64/mono.rc.d
mono/repos/testing-i686/
mono/repos/testing-x86_64/
---+
extra-i686/PKGBUILD | 105 +++-
extra-i686/bug434892.patch| 22
extra-i686/mini_amd64.patch | 26 -
extra-i686/mono.binfmt.d |1
extra-i686/mono.rc.d | 35 -
extra-x86_64/PKGBUILD | 105 +++-
extra-x86_64/bug434892.patch | 22
extra-x86_64/mini_amd64.patch | 26 -
extra-x86_64/mono.binfmt.d|1
extra-x86_64/mono.rc.d| 35 -
10 files changed, 154 insertions(+), 224 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-10 20:02:34 UTC (rev 168398)
+++ extra-i686/PKGBUILD 2012-10-10 22:19:40 UTC (rev 168399)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Daniel Isenmann dan...@archlinux.org
-# Contributor: Brice Carpentier br...@dlfp.org
-
-pkgname=mono
-pkgver=2.10.8
-pkgrel=1
-pkgdesc=Free implementation of the .NET platform including runtime and
compiler
-arch=(i686 x86_64)
-license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11')
-url=http://www.mono-project.com/;
-depends=('zlib' 'libgdiplus=2.10' 'sh')
-makedepends=('pkgconfig')
-options=('!libtool' '!makeflags')
-provides=('monodoc')
-conflicts=('monodoc')
-source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz
-mono.rc.d)
-md5sums=('411a2d9bcfc37a61eb9aedba88b40533'
- '8315e46c6a6e9625502521fc0ad1a322')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- # build mono
- ./configure --prefix=/usr --sysconfdir=/etc \
- --with-libgdiplus=installed
- make || return 1
-
- # build jay
- cd ${srcdir}/${pkgname}-${pkgver}/mcs/jay
- make || return 1
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install || return 1
-
- # install jay
- cd ${srcdir}/${pkgname}-${pkgver}/mcs/jay
- make DESTDIR=${pkgdir} prefix=/usr INSTALL=../../install-sh install
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # install daemons and pathes
- mkdir -p ${pkgdir}/etc/rc.d
- install -m755 ${srcdir}/mono.rc.d ${pkgdir}/etc/rc.d/mono
-
- #install license
- mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
- install -m644 mcs/MIT.X11 ${pkgdir}/usr/share/licenses/${pkgname}/
-
- #fix .pc file to be able to request mono on what it depends, fixes #go-oo
build
- sed -i -e s:#Requires:Requires: ${pkgdir}/usr/lib/pkgconfig/mono.pc
-}
Copied: mono/repos/extra-i686/PKGBUILD (from rev 168398,
mono/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-10 22:19:40 UTC (rev 168399)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Daniel Isenmann dan...@archlinux.org
+# Contributor: Brice Carpentier br...@dlfp.org
+
+pkgname=mono
+pkgver=2.10.8
+pkgrel=2
+pkgdesc=Free implementation of the .NET platform including runtime and
compiler
+arch=(i686 x86_64)
+license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11')
+url=http://www.mono-project.com/;
+depends=('zlib' 'libgdiplus=2.10' 'sh')
+makedepends=('pkgconfig')
+options=('!libtool' '!makeflags')
+provides=('monodoc')
+conflicts=('monodoc')
+source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz
+mono.binfmt.d)
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ # build mono
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --with-libgdiplus=installed
+ make || return 1
+
+ # build jay
+ cd ${srcdir}/${pkgname}-${pkgver}/mcs/jay
+ make || return 1
+}
+
[arch-commits] Commit in xsp/repos (24 files)
Date: Wednesday, October 10, 2012 @ 18:19:53
Author: tomegun
Revision: 168400
db-move: moved xsp from [testing] to [extra] (i686, x86_64)
Added:
xsp/repos/extra-i686/PKGBUILD
(from rev 168398, xsp/repos/testing-i686/PKGBUILD)
xsp/repos/extra-i686/xsp.conf.d
(from rev 168398, xsp/repos/testing-i686/xsp.conf.d)
xsp/repos/extra-i686/xsp.install
(from rev 168398, xsp/repos/testing-i686/xsp.install)
xsp/repos/extra-i686/xsp.rc.d
(from rev 168398, xsp/repos/testing-i686/xsp.rc.d)
xsp/repos/extra-i686/xsp.service
(from rev 168398, xsp/repos/testing-i686/xsp.service)
xsp/repos/extra-i686/xsp.webapp
(from rev 168398, xsp/repos/testing-i686/xsp.webapp)
xsp/repos/extra-x86_64/PKGBUILD
(from rev 168398, xsp/repos/testing-x86_64/PKGBUILD)
xsp/repos/extra-x86_64/xsp.conf.d
(from rev 168398, xsp/repos/testing-x86_64/xsp.conf.d)
xsp/repos/extra-x86_64/xsp.install
(from rev 168398, xsp/repos/testing-x86_64/xsp.install)
xsp/repos/extra-x86_64/xsp.rc.d
(from rev 168398, xsp/repos/testing-x86_64/xsp.rc.d)
xsp/repos/extra-x86_64/xsp.service
(from rev 168398, xsp/repos/testing-x86_64/xsp.service)
xsp/repos/extra-x86_64/xsp.webapp
(from rev 168398, xsp/repos/testing-x86_64/xsp.webapp)
Deleted:
xsp/repos/extra-i686/PKGBUILD
xsp/repos/extra-i686/xsp.conf.d
xsp/repos/extra-i686/xsp.install
xsp/repos/extra-i686/xsp.rc.d
xsp/repos/extra-i686/xsp.webapp
xsp/repos/extra-x86_64/PKGBUILD
xsp/repos/extra-x86_64/xsp.conf.d
xsp/repos/extra-x86_64/xsp.install
xsp/repos/extra-x86_64/xsp.rc.d
xsp/repos/extra-x86_64/xsp.webapp
xsp/repos/testing-i686/
xsp/repos/testing-x86_64/
--+
extra-i686/PKGBUILD | 125 +++--
extra-i686/xsp.conf.d| 20 +++
extra-i686/xsp.install | 74 +-
extra-i686/xsp.rc.d | 80 ++--
extra-i686/xsp.service |8 ++
extra-i686/xsp.webapp| 16 ++---
extra-x86_64/PKGBUILD| 125 +++--
extra-x86_64/xsp.conf.d | 20 +++
extra-x86_64/xsp.install | 74 +-
extra-x86_64/xsp.rc.d| 80 ++--
extra-x86_64/xsp.service |8 ++
extra-x86_64/xsp.webapp | 16 ++---
12 files changed, 334 insertions(+), 312 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-10 22:19:40 UTC (rev 168399)
+++ extra-i686/PKGBUILD 2012-10-10 22:19:53 UTC (rev 168400)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Daniel Isenmann dan...@archlinux.org
-# Contributor: Tobias Kieslich tob...@justdreams.de
-
-pkgname=xsp
-pkgver=2.10.2
-pkgrel=3
-pkgdesc=A simple webserver based on mono - provides ASP.NET support
-arch=(i686 x86_64)
-license=('custom')
-url=http://www.go-mono.com;
-depends=('mono=2.10.2' 'sqlite')
-options=(!makeflags)
-install=${pkgname}.install
-source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
\
-${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp)
-md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6'
- '9575bd7d6f64d51ba05bdd6370665858'
- '35d921df0fefc30f47a438c95d420efc'
- 'c917c07f68b945691506c29750db482f')
-
-build() {
- # get rid of that .wapi errors; thanks to brice
- export MONO_SHARED_DIR=${srcdir}/src/weird
- mkdir -p ${MONO_SHARED_DIR}
- # import pathes
- # build
- cd ${srcdir}/${pkgname}-${pkgver}
- #sed -i 's|/bin/sh|\0\nexport
MONO_PATH=${MONO_PATH}:/opt/mono/lib/mono/1.0|' scripts/script.in
- ./configure --prefix=/usr --sysconfdir=/etc
- make || return 1
- # tweak the xsp shellscript to grab system dll's
- for script in scripts/*2; do
-sed -i 's|/usr/lib/mono/1.0|/usr/lib/mono/2.0|' $script
- done
- #destdir related bugfixes
- sed -i 's|mkdir \$(datadir)|mkdir $(DESTDIR)$(datadir)|'
test/2.0/treeview/Makefile
- sed -i 's|gif \$(datadir)|gif $(DESTDIR)$(datadir)|'
test/2.0/treeview/Makefile
-}
-
-package(){
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir}/ install
- # move test files from share to arch' default html home
- mkdir -p ${pkgdir}/srv/http/html
- mv ${pkgdir}/usr/lib/xsp/test ${pkgdir}/srv/http/html/xsp
- rm -rf ${pkgdir}/usr/share
- chown -R http:http ${pkgdir}/srv/http/html/${pkgname}
-
- # install a deamon
- install -D -m755 ${srcdir}/${pkgname}.rc.d \
-${pkgdir}/etc/rc.d/${pkgname}
- # install a deamon configurationfile
- install -D -m644 ${srcdir}/$pkgname.conf.d \
-${pkgdir}/etc/conf.d/${pkgname}
- # install a xsp configuration home
- install -D -m644 ${srcdir}/${pkgname}.webapp \
-${pkgdir}/etc/${pkgname}/${pkgname}.webapp
- install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-
-}
Copied: xsp/repos/extra-i686/PKGBUILD (from rev 168398,
xsp/repos/testing-i686/PKGBUILD)
===
---
[arch-commits] Commit in lm_sensors/trunk (PKGBUILD healthd.service)
Date: Wednesday, October 10, 2012 @ 19:18:53
Author: eric
Revision: 168401
upgpkg: lm_sensors 3.3.2-5
Fix healthd unit file (close FS#31886)
Modified:
lm_sensors/trunk/PKGBUILD
lm_sensors/trunk/healthd.service
-+
PKGBUILD|4 ++--
healthd.service |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-10 22:19:53 UTC (rev 168400)
+++ PKGBUILD2012-10-10 23:18:53 UTC (rev 168401)
@@ -3,7 +3,7 @@
pkgname=lm_sensors
pkgver=3.3.2
-pkgrel=4
+pkgrel=5
pkgdesc=Collection of user space tools for general SMBus access and hardware
monitoring
arch=('i686' 'x86_64')
url=http://www.lm-sensors.org/;
@@ -28,7 +28,7 @@
'72a60251d1d55a67307dab4105d9f3f01a080af4'
'7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c'
'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51'
- '9cc453eb0e9f9057227459cb07e74815383544bf'
+ 'a7a20eb3c799d70287e6c7968a7ab42165925293'
'34241388c4001bfb6e49b7e10da1217e29a258d6'
'5662828085cdd981f0dc7cf8f79d3d6e2b72f50c')
Modified: healthd.service
===
--- healthd.service 2012-10-10 22:19:53 UTC (rev 168400)
+++ healthd.service 2012-10-10 23:18:53 UTC (rev 168401)
@@ -2,7 +2,7 @@
Description=A daemon which can be used to alert you in the event of a hardware
health monitoring alarm
[Service]
-PIDFile=/var/run/healthd.pid
+Type=forking
ExecStart=/usr/sbin/healthd
[Install]
[arch-commits] Commit in lm_sensors/repos (52 files)
Date: Wednesday, October 10, 2012 @ 19:19:44 Author: eric Revision: 168402 archrelease: copy trunk to extra-i686, extra-x86_64 Added: lm_sensors/repos/extra-i686/PKGBUILD (from rev 168401, lm_sensors/trunk/PKGBUILD) lm_sensors/repos/extra-i686/daemonarg.patch (from rev 168401, lm_sensors/trunk/daemonarg.patch) lm_sensors/repos/extra-i686/fancontrol.rc (from rev 168401, lm_sensors/trunk/fancontrol.rc) lm_sensors/repos/extra-i686/fancontrol.service (from rev 168401, lm_sensors/trunk/fancontrol.service) lm_sensors/repos/extra-i686/healthd (from rev 168401, lm_sensors/trunk/healthd) lm_sensors/repos/extra-i686/healthd.conf (from rev 168401, lm_sensors/trunk/healthd.conf) lm_sensors/repos/extra-i686/healthd.rc (from rev 168401, lm_sensors/trunk/healthd.rc) lm_sensors/repos/extra-i686/healthd.service (from rev 168401, lm_sensors/trunk/healthd.service) lm_sensors/repos/extra-i686/linux_3.0.patch (from rev 168401, lm_sensors/trunk/linux_3.0.patch) lm_sensors/repos/extra-i686/sensord.conf (from rev 168401, lm_sensors/trunk/sensord.conf) lm_sensors/repos/extra-i686/sensord.rc (from rev 168401, lm_sensors/trunk/sensord.rc) lm_sensors/repos/extra-i686/sensord.service (from rev 168401, lm_sensors/trunk/sensord.service) lm_sensors/repos/extra-i686/sensors.rc (from rev 168401, lm_sensors/trunk/sensors.rc) lm_sensors/repos/extra-x86_64/PKGBUILD (from rev 168401, lm_sensors/trunk/PKGBUILD) lm_sensors/repos/extra-x86_64/daemonarg.patch (from rev 168401, lm_sensors/trunk/daemonarg.patch) lm_sensors/repos/extra-x86_64/fancontrol.rc (from rev 168401, lm_sensors/trunk/fancontrol.rc) lm_sensors/repos/extra-x86_64/fancontrol.service (from rev 168401, lm_sensors/trunk/fancontrol.service) lm_sensors/repos/extra-x86_64/healthd (from rev 168401, lm_sensors/trunk/healthd) lm_sensors/repos/extra-x86_64/healthd.conf (from rev 168401, lm_sensors/trunk/healthd.conf) lm_sensors/repos/extra-x86_64/healthd.rc (from rev 168401, lm_sensors/trunk/healthd.rc) lm_sensors/repos/extra-x86_64/healthd.service (from rev 168401, lm_sensors/trunk/healthd.service) lm_sensors/repos/extra-x86_64/linux_3.0.patch (from rev 168401, lm_sensors/trunk/linux_3.0.patch) lm_sensors/repos/extra-x86_64/sensord.conf (from rev 168401, lm_sensors/trunk/sensord.conf) lm_sensors/repos/extra-x86_64/sensord.rc (from rev 168401, lm_sensors/trunk/sensord.rc) lm_sensors/repos/extra-x86_64/sensord.service (from rev 168401, lm_sensors/trunk/sensord.service) lm_sensors/repos/extra-x86_64/sensors.rc (from rev 168401, lm_sensors/trunk/sensors.rc) Deleted: lm_sensors/repos/extra-i686/PKGBUILD lm_sensors/repos/extra-i686/daemonarg.patch lm_sensors/repos/extra-i686/fancontrol.rc lm_sensors/repos/extra-i686/fancontrol.service lm_sensors/repos/extra-i686/healthd lm_sensors/repos/extra-i686/healthd.conf lm_sensors/repos/extra-i686/healthd.rc lm_sensors/repos/extra-i686/healthd.service lm_sensors/repos/extra-i686/linux_3.0.patch lm_sensors/repos/extra-i686/sensord.conf lm_sensors/repos/extra-i686/sensord.rc lm_sensors/repos/extra-i686/sensord.service lm_sensors/repos/extra-i686/sensors.rc lm_sensors/repos/extra-x86_64/PKGBUILD lm_sensors/repos/extra-x86_64/daemonarg.patch lm_sensors/repos/extra-x86_64/fancontrol.rc lm_sensors/repos/extra-x86_64/fancontrol.service lm_sensors/repos/extra-x86_64/healthd lm_sensors/repos/extra-x86_64/healthd.conf lm_sensors/repos/extra-x86_64/healthd.rc lm_sensors/repos/extra-x86_64/healthd.service lm_sensors/repos/extra-x86_64/linux_3.0.patch lm_sensors/repos/extra-x86_64/sensord.conf lm_sensors/repos/extra-x86_64/sensord.rc lm_sensors/repos/extra-x86_64/sensord.service lm_sensors/repos/extra-x86_64/sensors.rc -+ extra-i686/PKGBUILD | 122 +-- extra-i686/daemonarg.patch | 100 +++ extra-i686/fancontrol.rc| 70 +-- extra-i686/fancontrol.service | 18 +- extra-i686/healthd | 106 extra-i686/healthd.conf | 34 ++--- extra-i686/healthd.rc | 72 +-- extra-i686/healthd.service | 18 +- extra-i686/linux_3.0.patch | 22 +-- extra-i686/sensord.conf |8 - extra-i686/sensord.rc | 74 +-- extra-i686/sensord.service | 18 +- extra-i686/sensors.rc | 238 +++--- extra-x86_64/PKGBUILD | 122 +-- extra-x86_64/daemonarg.patch| 100 +++ extra-x86_64/fancontrol.rc | 70 +-- extra-x86_64/fancontrol.service | 18 +- extra-x86_64/healthd| 106 extra-x86_64/healthd.conf | 34 ++--- extra-x86_64/healthd.rc | 72 +-- extra-x86_64/healthd.service| 18 +- extra-x86_64/linux_3.0.patch| 22 +--
[arch-commits] Commit in git/trunk (PKGBUILD)
Date: Wednesday, October 10, 2012 @ 20:42:00
Author: dan
Revision: 168403
upgpkg: git 1.7.12.3-1
Modified:
git/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-10 23:19:44 UTC (rev 168402)
+++ PKGBUILD2012-10-11 00:42:00 UTC (rev 168403)
@@ -2,7 +2,7 @@
# Maintainer: Dan McGee d...@archlinux.org
pkgname=git
-pkgver=1.7.12.2
+pkgver=1.7.12.3
pkgrel=1
pkgdesc=the fast distributed version control system
arch=(i686 x86_64)
@@ -109,8 +109,8 @@
install -D -m 644 $srcdir/git-daemon.socket
$pkgdir/usr/lib/systemd/system/git-daemon.socket
}
-md5sums=('5aa5d146825f74fee889ca5408e4e00b'
- '51db657f9e8fa70f43ae56cb6bcb631b'
+md5sums=('c3c1e2d56794fcc46e31fd8cb0e71252'
+ '27c0a53545e3f89579a98cae009bc3c8'
'8e2648910fd5dd4f1c41d3c7fa9e9156'
'2e42bf97779a1c6411d89043334c9e78'
'042524f942785772d7bd52a1f02fe5ae'
[arch-commits] Commit in git/repos (10 files)
Date: Wednesday, October 10, 2012 @ 20:42:56
Author: dan
Revision: 168404
archrelease: copy trunk to extra-i686, extra-x86_64
Deleted:
git/repos/extra-i686/PKGBUILD
git/repos/extra-i686/git-daemon
git/repos/extra-i686/git-daemon.conf
git/repos/extra-i686/git-daemon.socket
git/repos/extra-i686/git.install
git/repos/extra-x86_64/PKGBUILD
git/repos/extra-x86_64/git-daemon
git/repos/extra-x86_64/git-daemon.conf
git/repos/extra-x86_64/git-daemon.socket
git/repos/extra-x86_64/git.install
+
extra-i686/PKGBUILD| 117 ---
extra-i686/git-daemon | 70 ---
extra-i686/git-daemon.conf |5 -
extra-i686/git-daemon.socket |9 ---
extra-i686/git.install | 21 ---
extra-x86_64/PKGBUILD | 117 ---
extra-x86_64/git-daemon| 70 ---
extra-x86_64/git-daemon.conf |5 -
extra-x86_64/git-daemon.socket |9 ---
extra-x86_64/git.install | 21 ---
10 files changed, 444 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-11 00:42:00 UTC (rev 168403)
+++ extra-i686/PKGBUILD 2012-10-11 00:42:56 UTC (rev 168404)
@@ -1,117 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee d...@archlinux.org
-
-pkgname=git
-pkgver=1.7.12.2
-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.14.0' 'openssl' 'pcre')
-makedepends=('python2' 'emacs')
-optdepends=('tk: gitk and git gui'
-'perl-libwww: git svn'
-'perl-term-readkey: git svn'
-'perl-mime-tools: git send-email'
-'perl-net-smtp-ssl: git send-email TLS support'
-'perl-authen-sasl: git send-email TLS support'
-'python2: various helper scripts'
-'subversion: git svn'
-'cvsps: git cvsimport')
-replaces=('git-core')
-provides=('git-core')
-backup=('etc/conf.d/git-daemon.conf')
-install=git.install
-source=(http://git-core.googlecode.com/files/git-$pkgver.tar.gz;
-http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz;
-git-daemon
-git-daemon.conf
-git-daemon@.service
-git-daemon.socket)
-
-build() {
- export PYTHON_PATH='/usr/bin/python2'
- cd $srcdir/$pkgname-$pkgver
- make prefix=/usr gitexecdir=/usr/lib/git-core \
-CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS \
-USE_LIBPCRE=1 \
-NO_CROSS_DIRECTORY_HARDLINKS=1 \
-all
-
- cd contrib/emacs
- make prefix=/usr
-}
-
-check() {
- export PYTHON_PATH='/usr/bin/python2'
- cd $srcdir/$pkgname-$pkgver
- local jobs
- jobs=$(expr $MAKEFLAGS : '.*\(-j[0-9]*\).*')
- mkdir -p /dev/shm/git-test
- # We used to use this, but silly git regressions:
- #GIT_TEST_OPTS=--root=/dev/shm/ \
- # http://comments.gmane.org/gmane.comp.version-control.git/202020
- make prefix=/usr gitexecdir=/usr/lib/git-core \
-CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS \
-USE_LIBPCRE=1 \
-NO_CROSS_DIRECTORY_HARDLINKS=1 \
-NO_SVN_TESTS=y \
-DEFAULT_TEST_TARGET=prove \
-GIT_PROVE_OPTS=$jobs -Q \
-GIT_TEST_OPTS=--root=/dev/shm/git-test \
-test
-}
-
-package() {
- export PYTHON_PATH='/usr/bin/python2'
- cd $srcdir/$pkgname-$pkgver
- make prefix=/usr gitexecdir=/usr/lib/git-core \
-CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS \
-USE_LIBPCRE=1 \
-NO_CROSS_DIRECTORY_HARDLINKS=1 \
-INSTALLDIRS=vendor DESTDIR=$pkgdir install
-
- # bash completion
- mkdir -p $pkgdir/usr/share/bash-completion/completions/
- install -m644 ./contrib/completion/git-completion.bash
$pkgdir/usr/share/bash-completion/completions/git
- # fancy git prompt
- mkdir -p $pkgdir/usr/share/git/
- install -m644 ./contrib/completion/git-prompt.sh
$pkgdir/usr/share/git/git-prompt.sh
- # more contrib stuff
- cp -a ./contrib/* $pkgdir/usr/share/git/
- # scripts are for python 2.x
- sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \
-$(find $pkgdir -name '*.py') \
-$pkgdir/usr/lib/git-core/git-p4 \
-$pkgdir/usr/share/git/gitview/gitview
-
- # emacs interface
- 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)
-done
- done
-
- # remove perllocal.pod, .packlist, and empty directories.
- 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
-
- # systemd stuff
- install -D -m 644 $srcdir/git-daemon@.service
$pkgdir/usr/lib/systemd/system/git-daemon@.service
- install -D -m 644
[arch-commits] Commit in linux/trunk (3 files)
Date: Thursday, October 11, 2012 @ 01:17:02
Author: tpowa
Revision: 168405
remove not needed patches
Deleted:
linux/trunk/alsa-powersave-3.5.x.patch
linux/trunk/i915-i2c-crash-3.5.x.patch
linux/trunk/watchdog-3.5.x.patch
+
alsa-powersave-3.5.x.patch | 29
i915-i2c-crash-3.5.x.patch | 47 -
watchdog-3.5.x.patch | 60 ---
3 files changed, 136 deletions(-)
Deleted: alsa-powersave-3.5.x.patch
===
--- alsa-powersave-3.5.x.patch 2012-10-11 00:42:56 UTC (rev 168404)
+++ alsa-powersave-3.5.x.patch 2012-10-11 05:17:02 UTC (rev 168405)
@@ -1,29 +0,0 @@
-From: Takashi Iwai ti...@suse.de
-Date: Mon, 20 Aug 2012 19:25:22 + (+0200)
-Subject: ALSA: hda - Fix leftover codec-power_transition
-X-Git-Tag: v3.6-rc3~14^2~1
-X-Git-Url:
http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=commitdiff_plain;h=535b6c51fe8293c88ce919cdfc4390c67a1cb6d1
-
-ALSA: hda - Fix leftover codec-power_transition
-
-When the codec turn-on operation is canceled by the immediate
-power-on, the driver left the power_transition flag as is.
-This caused the persistent avoidance of power-save behavior.
-
-Cc: sta...@vger.kernel.org [v3.5+]
-Signed-off-by: Takashi Iwai ti...@suse.de
-
-diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
-index c3077d5..f560051 100644
a/sound/pci/hda/hda_codec.c
-+++ b/sound/pci/hda/hda_codec.c
-@@ -4454,6 +4454,8 @@ static void __snd_hda_power_up(struct hda_codec *codec,
bool wait_power_down)
-* then there is no need to go through power up here.
-*/
- if (codec-power_on) {
-+ if (codec-power_transition 0)
-+ codec-power_transition = 0;
- spin_unlock(codec-power_lock);
- return;
- }
Deleted: i915-i2c-crash-3.5.x.patch
===
--- i915-i2c-crash-3.5.x.patch 2012-10-11 00:42:56 UTC (rev 168404)
+++ i915-i2c-crash-3.5.x.patch 2012-10-11 05:17:02 UTC (rev 168405)
@@ -1,47 +0,0 @@
-From cee25168e9c4ef7f9417632af2dc78b8521dfda7 Mon Sep 17 00:00:00 2001
-From: Jani Nikula jani.nik...@intel.com
-Date: Mon, 13 Aug 2012 17:33:02 +0300
-Subject: [PATCH] drm/i915: ensure i2c adapter is all set before adding it
-
-i2c_add_adapter() may do i2c transfers on the bus to detect supported
-devices. Therefore the adapter needs to be all set before adding it. This
-was not the case for the bit-banging fallback, resulting in an oops if the
-device detection GMBUS transfers timed out. Fix the issue by calling
-i2c_add_adapter() only after intel_gpio_setup().
-
-LKML-Reference: 5021f00b.7000...@ionic.de
-Tested-by: Mihai Moldovan io...@ionic.de
-Signed-off-by: Jani Nikula jani.nik...@intel.com
-Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
- drivers/gpu/drm/i915/intel_i2c.c |7 ---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_i2c.c
b/drivers/gpu/drm/i915/intel_i2c.c
-index d79500b..b9755f6 100644
a/drivers/gpu/drm/i915/intel_i2c.c
-+++ b/drivers/gpu/drm/i915/intel_i2c.c
-@@ -486,9 +486,6 @@ int intel_setup_gmbus(struct drm_device *dev)
- bus-dev_priv = dev_priv;
-
- bus-adapter.algo = gmbus_algorithm;
-- ret = i2c_add_adapter(bus-adapter);
-- if (ret)
-- goto err;
-
- /* By default use a conservative clock rate */
- bus-reg0 = port | GMBUS_RATE_100KHZ;
-@@ -498,6 +495,10 @@ int intel_setup_gmbus(struct drm_device *dev)
- bus-force_bit = true;
-
- intel_gpio_setup(bus, port);
-+
-+ ret = i2c_add_adapter(bus-adapter);
-+ if (ret)
-+ goto err;
- }
-
- intel_i2c_reset(dev_priv-dev);
---
-1.7.7.6
-
Deleted: watchdog-3.5.x.patch
===
--- watchdog-3.5.x.patch2012-10-11 00:42:56 UTC (rev 168404)
+++ watchdog-3.5.x.patch2012-10-11 05:17:02 UTC (rev 168405)
@@ -1,60 +0,0 @@
-diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
-index 027cc8f..a05fdfc 100644
a/drivers/mfd/lpc_ich.c
-+++ b/drivers/mfd/lpc_ich.c
-@@ -765,7 +765,6 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev,
- u32 base_addr_cfg;
- u32 base_addr;
- int ret;
-- bool acpi_conflict = false;
- struct resource *res;
-
- /* Setup power management base register */
-@@ -780,20 +779,11 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev
*dev,
- res = wdt_io_res(ICH_RES_IO_TCO);
- res-start = base_addr + ACPIBASE_TCO_OFF;
- res-end = base_addr + ACPIBASE_TCO_END;
-- ret = acpi_check_resource_conflict(res);
-- if (ret) {
--
