[arch-commits] Commit in kbluetooth/trunk (PKGBUILD)
Date: Thursday, November 12, 2009 @ 08:41:59 Author: andrea Revision: 58709 upgpkg: kbluetooth 4.0.4RC2-1 upstream release Modified: kbluetooth/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2009-11-12 13:38:54 UTC (rev 58708) +++ PKGBUILD2009-11-12 13:41:59 UTC (rev 58709) @@ -4,14 +4,14 @@ # Contributor: Thomas Baechler tho...@archlinux.org pkgname=kbluetooth -pkgver=4.0.4RC1 -_pkgver=RC1 +pkgver=4.0.4RC2 +_pkgver=RC2 pkgrel=1 pkgdesc=A collection of Bluetooth utilities and modules for KDE based on BlueZ arch=('i686' 'x86_64') url=http://www.kde-apps.org/content/show.php/kbluetooth?content=112110; license=('GPL2') -depends=('kdebase-workspace=4.3.2' 'bluez=4.55' 'obex-data-server=0.4.4' +depends=('kdebase-workspace=4.3.0' 'bluez=4.55' 'obex-data-server=0.4.4' 'hicolor-icon-theme') makedepends=('pkgconfig' 'cmake' 'automoc4' 'perl') optdepends=('python') @@ -19,7 +19,7 @@ conflicts=('kdebluetooth') install=kbluetooth.install source=(http://www.kde-apps.org/CONTENT/content-files/112110-${pkgname}-${_pkgver}.tar.bz2) -md5sums=('616900af0879109ed43f2cc7108ddb3b') +md5sums=('e0883dd44ff439e8adf7d6d9bc6306d8') build() { cd ${srcdir}
[arch-commits] Commit in kbluetooth/repos (extra-i686 extra-i686/PKGBUILD)
Date: Thursday, November 12, 2009 @ 08:42:39 Author: andrea Revision: 58710 Merged revisions 58709 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/kbluetooth/trunk r58709 | andrea | 2009-11-12 14:41:59 +0100 (Thu, 12 Nov 2009) | 2 lines upgpkg: kbluetooth 4.0.4RC2-1 upstream release Modified: kbluetooth/repos/extra-i686/ (properties) kbluetooth/repos/extra-i686/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Property changes on: kbluetooth/repos/extra-i686 ___ Modified: svnmerge-integrated - /kbluetooth/trunk:1-54276 + /kbluetooth/trunk:1-58709 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2009-11-12 13:41:59 UTC (rev 58709) +++ extra-i686/PKGBUILD 2009-11-12 13:42:39 UTC (rev 58710) @@ -4,14 +4,14 @@ # Contributor: Thomas Baechler tho...@archlinux.org pkgname=kbluetooth -pkgver=4.0.4RC1 -_pkgver=RC1 +pkgver=4.0.4RC2 +_pkgver=RC2 pkgrel=1 pkgdesc=A collection of Bluetooth utilities and modules for KDE based on BlueZ arch=('i686' 'x86_64') url=http://www.kde-apps.org/content/show.php/kbluetooth?content=112110; license=('GPL2') -depends=('kdebase-workspace=4.3.2' 'bluez=4.55' 'obex-data-server=0.4.4' +depends=('kdebase-workspace=4.3.0' 'bluez=4.55' 'obex-data-server=0.4.4' 'hicolor-icon-theme') makedepends=('pkgconfig' 'cmake' 'automoc4' 'perl') optdepends=('python') @@ -19,7 +19,7 @@ conflicts=('kdebluetooth') install=kbluetooth.install source=(http://www.kde-apps.org/CONTENT/content-files/112110-${pkgname}-${_pkgver}.tar.bz2) -md5sums=('616900af0879109ed43f2cc7108ddb3b') +md5sums=('e0883dd44ff439e8adf7d6d9bc6306d8') build() { cd ${srcdir}
[arch-commits] Commit in konversation/trunk (PKGBUILD)
Date: Thursday, November 12, 2009 @ 08:38:16 Author: andrea Revision: 58707 upgpkg: konversation 1.2.1-1 upstream release Modified: konversation/trunk/PKGBUILD --+ PKGBUILD |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2009-11-11 21:49:20 UTC (rev 58706) +++ PKGBUILD2009-11-12 13:38:16 UTC (rev 58707) @@ -4,8 +4,8 @@ # Contributor: Sergio Jovani Guzman mo...@paretux.org pkgname=konversation -pkgver=1.2 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc=A user friendly IRC client for KDE arch=('i686' 'x86_64') url=http://konversation.kde.org; @@ -14,8 +14,7 @@ license=('GPL2' 'FDL') install=konversation.install source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2) -md5sums=('823d06b20161526bb20bd50086a73af1') -options=('force') +md5sums=('7d3c5d7f0062e8441b27ff549aa0029e') build() { cd ${srcdir}
[arch-commits] Commit in konversation/repos (extra-i686 extra-i686/PKGBUILD)
Date: Thursday, November 12, 2009 @ 08:38:54 Author: andrea Revision: 58708 Merged revisions 58707 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/konversation/trunk r58707 | andrea | 2009-11-12 14:38:16 +0100 (Thu, 12 Nov 2009) | 2 lines upgpkg: konversation 1.2.1-1 upstream release Modified: konversation/repos/extra-i686/(properties) konversation/repos/extra-i686/PKGBUILD --+ PKGBUILD |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) Property changes on: konversation/repos/extra-i686 ___ Modified: svnmerge-integrated - /konversation/trunk:1-54390 + /konversation/trunk:1-58707 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2009-11-12 13:38:16 UTC (rev 58707) +++ extra-i686/PKGBUILD 2009-11-12 13:38:54 UTC (rev 58708) @@ -4,8 +4,8 @@ # Contributor: Sergio Jovani Guzman mo...@paretux.org pkgname=konversation -pkgver=1.2 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc=A user friendly IRC client for KDE arch=('i686' 'x86_64') url=http://konversation.kde.org; @@ -14,8 +14,7 @@ license=('GPL2' 'FDL') install=konversation.install source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2) -md5sums=('823d06b20161526bb20bd50086a73af1') -options=('force') +md5sums=('7d3c5d7f0062e8441b27ff549aa0029e') build() { cd ${srcdir}
[arch-commits] Commit in nouveau-drm/trunk (3 files)
Date: Thursday, November 12, 2009 @ 12:08:14 Author: andyrtr Revision: 58711 new snapshot 2009 + much better fix for nv4* tv detection/screen resolution Added: nouveau-drm/trunk/tvdac_load_detection.patch Modified: nouveau-drm/trunk/PKGBUILD nouveau-drm/trunk/fix_resolution_detection.patch + PKGBUILD | 16 ++--- fix_resolution_detection.patch | 77 +++- tvdac_load_detection.patch | 121 +++ 3 files changed, 177 insertions(+), 37 deletions(-) Modified: PKGBUILD === --- PKGBUILD2009-11-12 13:42:39 UTC (rev 58710) +++ PKGBUILD2009-11-12 17:08:14 UTC (rev 58711) @@ -3,7 +3,7 @@ # Contributor: buddabrod buddab...@gmail.com pkgname=nouveau-drm -_snapdate=20091101 +_snapdate=2009 pkgver=0.0.15_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version _kernver='2.6.31-ARCH' pkgrel=1 @@ -19,18 +19,16 @@ #http://people.freedesktop.org/~pq/nouveau-drm/master.tar.gz # get the Makefile from http://cgit.freedesktop.org/nouveau/linux-2.6/plain/nouveau/Makefile?h=master-compat Makefile - fix_resolution_detection.patch) -md5sums=('bff3fb394cedbf54564cdc242ca49f37' + tvdac_load_detection.patch) +md5sums=('bbd406c6b8d93defbe17d4f4b477b500' 'b619729a9374b7172fc1a7ce59f7f3ad' - '47382868360f998213fb0e62fed00716') + 'bf0f9dcbcecd42f8e8f10b6ee786fb99') - # http://nouveau.freedesktop.org/wiki/InstallDRM - build() { cd ${srcdir}/master - # try to fix http://bbs.archlinux.org/viewtopic.php?id=82363 -solved for my nv44 card - patch -Np0 -i ${srcdir}/fix_resolution_detection.patch || return 1 - + # try to fix http://bbs.archlinux.org/viewtopic.php?id=82363 + patch -Np1 -i ${srcdir}/tvdac_load_detection.patch || return 1 + mkdir nouveau cp $srcdir/Makefile ${srcdir}/master/nouveau/ cd nouveau Modified: fix_resolution_detection.patch === --- fix_resolution_detection.patch 2009-11-12 13:42:39 UTC (rev 58710) +++ fix_resolution_detection.patch 2009-11-12 17:08:14 UTC (rev 58711) @@ -1,36 +1,34 @@ drivers/gpu/drm/nouveau/nv04_dac.c 2009-10-20 17:54:19.454045092 +0200 -+++ drivers/gpu/drm/nouveau/nv04_dac.c.block3 2009-10-20 18:01:44.891084375 +0200 -@@ -223,6 +223,20 @@ - saved_rtest_ctrl, temp, saved_gpio_ext = 0, routput; - int head, present = 0; - -+nv_wr32(dev, 0x68252c, 0x100); /*363389.094484 write32 #1 NV11_PRAMDAC.OUTPUT_OR_2_3 - {000}, OUTPUT_SELECT_CRTC1 = 0x1, {000}, OUTPUT_DAC_ENABLE = 0x0*/ -+nv_wr32(dev, 0x68252c, 0x100); /*363391.094548 write32 #1 NV11_PRAMDAC.OUTPUT_OR_2_3 - {000}, OUTPUT_SELECT_CRTC1 = 0x1, {000}, OUTPUT_DAC_ENABLE = 0x0*/ -+nv_wr32(dev, 0x68252c, 0x101); /*363392.095582 write32 #1 NV11_PRAMDAC.OUTPUT_OR_2_3 - {000}, OUTPUT_SELECT_CRTC1 = 0x1, {000}, OUTPUT_DAC_ENABLE = 0x1*/ -+nv_wr32(dev, 0x68252c, 0x101); /*363394.095650 write32 #1 NV11_PRAMDAC.OUTPUT_OR_2_3 - {000}, OUTPUT_SELECT_CRTC1 = 0x1, {000}, OUTPUT_DAC_ENABLE = 0x1*/ -+nv_wr32(dev, 0x68252c, 0x100); /*363396.095714 write32 #1 NV11_PRAMDAC.OUTPUT_OR_2_3 - {000}, OUTPUT_SELECT_CRTC1 = 0x1, {000}, OUTPUT_DAC_ENABLE = 0x0*/ -+nv_wr32(dev, 0x68252c, 0x101); /*363397.161792 write32 #1 NV11_PRAMDAC.OUTPUT_OR_2_3 - {000}, OUTPUT_SELECT_CRTC1 = 0x1, {000}, OUTPUT_DAC_ENABLE = 0x1*/ -+nv_wr32(dev, 0x682610, 0x94050140); /*363399.161860 write32 #1 NV11_PRAMDAC[1].TEST_DATA - 0x94050140*/ -+nv_wr32(dev, 0x682610, 0x94050140); /*363400.161892 write32 #1 NV11_PRAMDAC[1].TEST_DATA - 0x94050140*/ -+nv_wr32(dev, 0x682608, 0xf0101000); /*363402.161956 write32 #1 NV11_PRAMDAC.TEST_CONTROL_OR_2_3 - 0xf0101000*/ -+nv_wr32(dev, 0x682608, 0x10); /*363405.163058 write32 #1 NV11_PRAMDAC.TEST_CONTROL_OR_2_3 - 0x0010*/ -+nv_wr32(dev, 0x68252c, 0x100); /*363406.163090 write32 #1 NV11_PRAMDAC.OUTPUT_OR_2_3 - {000}, OUTPUT_SELECT_CRTC1 = 0x1, {000}, OUTPUT_DAC_ENABLE = 0x0*/ -+ -+msleep(30); -+ - #define RGB_TEST_DATA(r, g, b) (r 0 | g 10 | b 20) - if (dcb-type == OUTPUT_TV) { - testval = RGB_TEST_DATA(0xa0, 0xa0, 0xa0); -@@ -236,6 +250,8 @@ +diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c +index 587b6f5..3aedd20 100644 +--- a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c +@@ -236,29 +236,42 @@ enum drm_connector_status nv17_dac_detect(struct drm_encoder *encoder, testval = dev_priv-vbios-dactestval; } -+ testval = 0x94050140; ++ nv_wr32(dev, 0x60081c, 0x22255256); /*216780.52 write32
[arch-commits] Commit in nouveau-drm/repos (testing-x86_64)
Date: Thursday, November 12, 2009 @ 12:20:43 Author: andyrtr Revision: 58712 archrelease: new repo testing-x86_64 Added: nouveau-drm/repos/testing-x86_64/
[arch-commits] Commit in nouveau-drm/repos (testing-x86_64)
Date: Thursday, November 12, 2009 @ 12:21:02 Author: andyrtr Revision: 58713 Initialized merge tracking via svnmerge with revisions 1-58711 from svn+ssh://gerolde.archlinux.org/srv/svn-packages/nouveau-drm/trunk Modified: nouveau-drm/repos/testing-x86_64/ (properties) Property changes on: nouveau-drm/repos/testing-x86_64 ___ Added: svnmerge-integrated + /nouveau-drm/trunk:1-58711
[arch-commits] Commit in nouveau-drm/repos (testing-i686)
Date: Thursday, November 12, 2009 @ 12:28:30 Author: andyrtr Revision: 58715 Initialized merge tracking via svnmerge with revisions 1-58713 from svn+ssh://gerolde.archlinux.org/srv/svn-packages/nouveau-drm/trunk Modified: nouveau-drm/repos/testing-i686/ (properties) Property changes on: nouveau-drm/repos/testing-i686 ___ Added: svnmerge-integrated + /nouveau-drm/trunk:1-58713
[arch-commits] Commit in kernel26-lts/repos (core-i686)
Date: Thursday, November 12, 2009 @ 13:14:57 Author: andyrtr Revision: 58716 db-move: kernel26-lts removed by andyrtr for move to core Deleted: kernel26-lts/repos/core-i686/
[arch-commits] Commit in kernel26-lts/repos (core-i686 testing-i686)
Date: Thursday, November 12, 2009 @ 13:14:57 Author: andyrtr Revision: 58717 db-move: moved kernel26-lts from [testing] to [core] (i686) Added: kernel26-lts/repos/core-i686/ Deleted: kernel26-lts/repos/testing-i686/
[arch-commits] Commit in kernel26-lts/repos (core-x86_64)
Date: Thursday, November 12, 2009 @ 13:15:10 Author: andyrtr Revision: 58718 db-move: kernel26-lts removed by andyrtr for move to core Deleted: kernel26-lts/repos/core-x86_64/
[arch-commits] Commit in kernel26-lts/repos (core-x86_64 testing-x86_64)
Date: Thursday, November 12, 2009 @ 13:15:11 Author: andyrtr Revision: 58719 db-move: moved kernel26-lts from [testing] to [core] (x86_64) Added: kernel26-lts/repos/core-x86_64/ Deleted: kernel26-lts/repos/testing-x86_64/
[arch-commits] Commit in kbluetooth/repos (extra-x86_64 extra-x86_64/PKGBUILD)
Date: Thursday, November 12, 2009 @ 14:38:27 Author: ibiru Revision: 58720 Merged revisions 58709 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/kbluetooth/trunk r58709 | andrea | 2009-11-12 15:41:59 +0200 (Thu, 12 Nov 2009) | 2 lines upgpkg: kbluetooth 4.0.4RC2-1 upstream release Modified: kbluetooth/repos/extra-x86_64/(properties) kbluetooth/repos/extra-x86_64/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Property changes on: kbluetooth/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /kbluetooth/trunk:1-54310 + /kbluetooth/trunk:1-58719 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2009-11-12 18:15:11 UTC (rev 58719) +++ extra-x86_64/PKGBUILD 2009-11-12 19:38:27 UTC (rev 58720) @@ -4,14 +4,14 @@ # Contributor: Thomas Baechler tho...@archlinux.org pkgname=kbluetooth -pkgver=4.0.4RC1 -_pkgver=RC1 +pkgver=4.0.4RC2 +_pkgver=RC2 pkgrel=1 pkgdesc=A collection of Bluetooth utilities and modules for KDE based on BlueZ arch=('i686' 'x86_64') url=http://www.kde-apps.org/content/show.php/kbluetooth?content=112110; license=('GPL2') -depends=('kdebase-workspace=4.3.2' 'bluez=4.55' 'obex-data-server=0.4.4' +depends=('kdebase-workspace=4.3.0' 'bluez=4.55' 'obex-data-server=0.4.4' 'hicolor-icon-theme') makedepends=('pkgconfig' 'cmake' 'automoc4' 'perl') optdepends=('python') @@ -19,7 +19,7 @@ conflicts=('kdebluetooth') install=kbluetooth.install source=(http://www.kde-apps.org/CONTENT/content-files/112110-${pkgname}-${_pkgver}.tar.bz2) -md5sums=('616900af0879109ed43f2cc7108ddb3b') +md5sums=('e0883dd44ff439e8adf7d6d9bc6306d8') build() { cd ${srcdir}
[arch-commits] Commit in kdeplasma-applets-networkmanager/repos (3 files)
Date: Thursday, November 12, 2009 @ 14:46:20 Author: ibiru Revision: 58721 Merged revisions 58614 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdeplasma-applets-networkmanager/trunk r58614 | andrea | 2009-11-10 13:04:34 +0200 (Tue, 10 Nov 2009) | 2 lines upgpkg: kdeplasma-applets-networkmanager 1047027-1 new snapshot; remove the commit that install the whole plasmoid by default Added: kdeplasma-applets-networkmanager/repos/extra-x86_64/remove-i-know-what-am-doing.patch (from rev 58614, kdeplasma-applets-networkmanager/trunk/remove-i-know-what-am-doing.patch) Modified: kdeplasma-applets-networkmanager/repos/extra-x86_64/ (properties) kdeplasma-applets-networkmanager/repos/extra-x86_64/PKGBUILD ---+ PKGBUILD | 12 +--- remove-i-know-what-am-doing.patch | 14 ++ 2 files changed, 23 insertions(+), 3 deletions(-) Property changes on: kdeplasma-applets-networkmanager/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /kdeplasma-applets-networkmanager/trunk:1-56775 + /kdeplasma-applets-networkmanager/trunk:1-58720 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2009-11-12 19:38:27 UTC (rev 58720) +++ extra-x86_64/PKGBUILD 2009-11-12 19:46:20 UTC (rev 58721) @@ -3,7 +3,7 @@ # Contributor: Jakub Schmidtke sjakub-at-gmail.com pkgname=kdeplasma-applets-networkmanager -pkgver=1040936 +pkgver=1047027 pkgrel=1 pkgdesc=KDE4 NetworkManager plasmoid arch=('i686' 'x86_64') @@ -14,10 +14,16 @@ conflicts=('networkmanager-plasmoid-svn') replaces=('networkmanager-plasmoid-svn') #svn co -q svn://websvn.kde.org:443/home/kde/trunk/playground/base/plasma/applets/networkmanager/ kdeplasma-applets-networkmanager -source=(ftp://ftp.archlinux.org/other/kde/${pkgname}-r${pkgver}.tar.bz2;) -md5sums=('da1b7a439ea03b7db5339b90d313f2ad') +source=(ftp://ftp.archlinux.org/other/kde/${pkgname}-r${pkgver}.tar.bz2; + 'remove-i-know-what-am-doing.patch') +md5sums=('ab554dfe2f503f176d33168f3042c80b' + 'f4edca116beef0d70a93b5709b854e54') build() { + cd ${srcdir}/${pkgname} + # we can't build plasmoid with qt 4.5 + patch -R -p6 -i ${srcdir}/remove-i-know-what-am-doing.patch || return 1 + cd ${srcdir} mkdir build cd build Copied: kdeplasma-applets-networkmanager/repos/extra-x86_64/remove-i-know-what-am-doing.patch (from rev 58614, kdeplasma-applets-networkmanager/trunk/remove-i-know-what-am-doing.patch) === --- extra-x86_64/remove-i-know-what-am-doing.patch (rev 0) +++ extra-x86_64/remove-i-know-what-am-doing.patch 2009-11-12 19:46:20 UTC (rev 58721) @@ -0,0 +1,14 @@ +--- trunk/playground/base/plasma/applets/networkmanager/applet/CMakeLists.txt 2009/11/06 21:19:15 1045850 trunk/playground/base/plasma/applets/networkmanager/applet/CMakeLists.txt 2009/11/06 21:19:26 1045851 +@@ -21,11 +21,6 @@ + + kde4_add_ui_files(networkmanager_SRCS nmConfig.ui ) + +-if(NOT I_KNOW_WHAT_IM_DOING) +- set(networkmanager_SRCS applet_wip.cpp) +- message(STATUS Compiling dummy plasmoid because the real one is still work in progress...) +-endif(NOT I_KNOW_WHAT_IM_DOING) +- + kde4_add_plugin(plasma_applet_networkmanagement ${networkmanager_SRCS}) + target_link_libraries(plasma_applet_networkmanagement ${KDE4_PLASMA_LIBS} knmclient knminternals ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} solidcontrol) +
[arch-commits] Commit in libexif-gtk/repos (4 files)
Date: Thursday, November 12, 2009 @ 14:51:27 Author: ibiru Revision: 58722 Merged revisions 58570,58583 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/libexif-gtk/trunk r58570 | andrea | 2009-11-09 12:15:10 +0200 (Mon, 09 Nov 2009) | 2 lines upgpkg: libexif-gtk 0.3.5-9 fixed patch to use deprecated gtk (FS#15034) r58583 | andrea | 2009-11-09 17:52:32 +0200 (Mon, 09 Nov 2009) | 1 line added patch Added: libexif-gtk/repos/extra-x86_64/gtk2-2.12.patch (from rev 58583, libexif-gtk/trunk/gtk2-2.12.patch) Modified: libexif-gtk/repos/extra-x86_64/ (properties) libexif-gtk/repos/extra-x86_64/PKGBUILD Deleted: libexif-gtk/repos/extra-x86_64/gtk2-fix.patch -+ PKGBUILD| 19 +++ gtk2-2.12.patch | 45 + gtk2-fix.patch | 13 - 3 files changed, 56 insertions(+), 21 deletions(-) Property changes on: libexif-gtk/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /libexif-gtk/trunk:1-5508 + /libexif-gtk/trunk:1-58721 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2009-11-12 19:46:20 UTC (rev 58721) +++ extra-x86_64/PKGBUILD 2009-11-12 19:51:27 UTC (rev 58722) @@ -1,25 +1,28 @@ -# Maintainer: Eduardo Romero edua...@archlinux.org +# $Id$ +# Contributor: Eduardo Romero edua...@archlinux.org # Contributor: Sebastien Piccand sebcactus gmail com pkgname=libexif-gtk pkgver=0.3.5 -pkgrel=8 +pkgrel=9 pkgdesc=GTK frontend to the libexif library arch=('i686' 'x86_64') url=http://libexif.sourceforge.net; license=('GPL') depends=('libexif' 'gtk2') options=('!libtool') -source=(http://downloads.sourceforge.net/libexif/$pkgname-$pkgver.tar.bz2 gtk2-fix.patch) -md5sums=('0ecdba41f3e0f20a11b8555bd2dd2a07' '5ecf915e5b9cfd0a75757d3a046b63fa') +source=(http://downloads.sourceforge.net/libexif/$pkgname-$pkgver.tar.bz2 + 'gtk2-2.12.patch') +md5sums=('0ecdba41f3e0f20a11b8555bd2dd2a07' + 'f8d53413c6291a0dca5da99016b1bf47') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver # Patch for gtk2-2.12 - patch -p1 ../gtk2-fix.patch || return 1 + patch -p1 -i ${srcdir}/gtk2-2.12.patch || return 1 # Patch for libexif sed -i 's|exif-mem.h|libexif/exif-mem.h|g' configure - ./configure --prefix=/usr + ./configure --prefix=/usr || return 1 make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + make DESTDIR=$pkgdir install || return 1 } Copied: libexif-gtk/repos/extra-x86_64/gtk2-2.12.patch (from rev 58583, libexif-gtk/trunk/gtk2-2.12.patch) === --- extra-x86_64/gtk2-2.12.patch(rev 0) +++ extra-x86_64/gtk2-2.12.patch2009-11-12 19:51:27 UTC (rev 58722) @@ -0,0 +1,45 @@ +libexif-gtk needs deprecated GTK API. +--- a/gtk-extensions/Makefile.in b/gtk-extensions/Makefile.in +@@ -219,7 +219,6 @@ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/intl\ +- -DGTK_DISABLE_DEPRECATED\ + $(GTK_CFLAGS) + + noinst_LTLIBRARIES = libgtk-extensions.la +--- a/libexif-gtk/Makefile.in b/libexif-gtk/Makefile.in +@@ -251,8 +251,7 @@ + -I$(top_srcdir)/intl\ + -I$(top_srcdir)/gtk-extensions \ + $(LIBEXIF_GTK_CFLAGS) \ +- -DG_LOG_DOMAIN=\libexif\ \ +- -DGTK_DISABLE_DEPRECATED ++ -DG_LOG_DOMAIN=\libexif\ + + lib_LTLIBRARIES = libexif-gtk.la + libexif_gtkincludedir = $(includedir)/libexif-gtk +--- a/gtk-extensions/Makefile.am b/gtk-extensions/Makefile.am +@@ -1,7 +1,6 @@ + INCLUDES =\ + -I$(top_srcdir) \ + -I$(top_srcdir)/intl\ +- -DGTK_DISABLE_DEPRECATED\ + $(GTK_CFLAGS) + + noinst_LTLIBRARIES = libgtk-extensions.la +--- a/libexif-gtk/Makefile.am b/libexif-gtk/Makefile.am +@@ -3,8 +3,7 @@ + -I$(top_srcdir)/intl\ + -I$(top_srcdir)/gtk-extensions \ + $(LIBEXIF_GTK_CFLAGS) \ +- -DG_LOG_DOMAIN=\libexif\ \ +- -DGTK_DISABLE_DEPRECATED ++ -DG_LOG_DOMAIN=\libexif\ + + lib_LTLIBRARIES = libexif-gtk.la + Deleted: extra-x86_64/gtk2-fix.patch === --- extra-x86_64/gtk2-fix.patch 2009-11-12 19:46:20 UTC (rev 58721) +++ extra-x86_64/gtk2-fix.patch 2009-11-12 19:51:27 UTC (rev 58722) @@ -1,13 +0,0 @@ -diff -ur libexif-gtk-0.3.5.orig/libexif-gtk/Makefile.in libexif-gtk-0.3.5/libexif-gtk/Makefile.in libexif-gtk-0.3.5.orig/libexif-gtk/Makefile.in 2007-10-30
[arch-commits] Commit in xf86-video-nv/repos (3 files)
Date: Thursday, November 12, 2009 @ 14:54:38 Author: ibiru Revision: 58723 Merged revisions 58503 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/xf86-video-nv/trunk r58503 | jgc | 2009-11-08 22:51:17 +0200 (Sun, 08 Nov 2009) | 2 lines upgpkg: xf86-video-nv 2.1.15-2 Add patch to fix segfault on G80 hardware (FS#16979) Added: xf86-video-nv/repos/extra-x86_64/nv-2.1.15-g80-nop-gamma.patch (from rev 58503, xf86-video-nv/trunk/nv-2.1.15-g80-nop-gamma.patch) Modified: xf86-video-nv/repos/extra-x86_64/ (properties) xf86-video-nv/repos/extra-x86_64/PKGBUILD ---+ PKGBUILD |9 ++--- nv-2.1.15-g80-nop-gamma.patch | 25 + 2 files changed, 31 insertions(+), 3 deletions(-) Property changes on: xf86-video-nv/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /xf86-video-nv/trunk:1-55612 + /xf86-video-nv/trunk:1-58722 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2009-11-12 19:51:27 UTC (rev 58722) +++ extra-x86_64/PKGBUILD 2009-11-12 19:54:38 UTC (rev 58723) @@ -3,7 +3,7 @@ pkgname=xf86-video-nv pkgver=2.1.15 -pkgrel=1 +pkgrel=2 pkgdesc=X.org nv video driver arch=(i686 x86_64) license=('custom') @@ -13,11 +13,14 @@ conflicts=('xorg-server1.7.0') options=('!libtool') groups=('xorg-video-drivers') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -md5sums=('1b22188bd9012a148206940708b52ea6') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 +nv-2.1.15-g80-nop-gamma.patch) +md5sums=('1b22188bd9012a148206940708b52ea6' + '9c021cbda033509e8e1bae0042aab82f') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/nv-2.1.15-g80-nop-gamma.patch || return 1 ./configure --prefix=/usr || return 1 make || return 1 make DESTDIR=${pkgdir} install || return 1 Copied: xf86-video-nv/repos/extra-x86_64/nv-2.1.15-g80-nop-gamma.patch (from rev 58503, xf86-video-nv/trunk/nv-2.1.15-g80-nop-gamma.patch) === --- extra-x86_64/nv-2.1.15-g80-nop-gamma.patch (rev 0) +++ extra-x86_64/nv-2.1.15-g80-nop-gamma.patch 2009-11-12 19:54:38 UTC (rev 58723) @@ -0,0 +1,25 @@ +diff -up xf86-video-nv-2.1.15/src/g80_display.c.jx xf86-video-nv-2.1.15/src/g80_display.c +--- xf86-video-nv-2.1.15/src/g80_display.c.jx 2009-07-15 21:11:05.0 -0400 xf86-video-nv-2.1.15/src/g80_display.c 2009-10-28 04:14:55.189892176 -0400 +@@ -645,6 +645,12 @@ G80CrtcCommit(xf86CrtcPtr crtc) + C(0x0080, 0); + } + ++static void ++G80DispGammaSet(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue, ++ int size) ++{ ++} ++ + static const xf86CrtcFuncsRec g80_crtc_funcs = { + .dpms = G80CrtcDPMSSet, + .save = NULL, +@@ -654,7 +660,7 @@ static const xf86CrtcFuncsRec g80_crtc_f + .mode_fixup = G80CrtcModeFixup, + .prepare = G80CrtcPrepare, + .mode_set = G80CrtcModeSet, +-// .gamma_set = G80DispGammaSet, ++.gamma_set = G80DispGammaSet, + .commit = G80CrtcCommit, + .shadow_create = NULL, + .shadow_destroy = NULL,
[arch-commits] Commit in muine/repos (3 files)
Date: Thursday, November 12, 2009 @ 14:57:50 Author: ibiru Revision: 58724 Merged revisions 58496 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/muine/trunk r58496 | jgc | 2009-11-08 22:37:10 +0200 (Sun, 08 Nov 2009) | 2 lines upgpkg: muine 0.8.11-1 Update to 0.8.11 Modified: muine/repos/extra-x86_64/ (properties) muine/repos/extra-x86_64/PKGBUILD Deleted: muine/repos/extra-x86_64/bgo560077.patch -+ PKGBUILD| 21 bgo560077.patch | 56 -- 2 files changed, 9 insertions(+), 68 deletions(-) Property changes on: muine/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /muine/trunk:1-38494 + /muine/trunk:1-58723 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2009-11-12 19:54:38 UTC (rev 58723) +++ extra-x86_64/PKGBUILD 2009-11-12 19:57:50 UTC (rev 58724) @@ -3,23 +3,21 @@ # Contributor: Ben Mazer b...@groknil.org pkgname=muine -pkgver=0.8.10 -pkgrel=4 +pkgver=0.8.11 +pkgrel=1 pkgdesc=A music player written in C# arch=(i686 x86_64) license=('GPL') url=http://www.muine-player.org/; -depends=('gnome-sharp=2.24.1' 'gstreamer0.10-good-plugins' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'libgnomeui=2.24.1' 'libid3tag' 'faad2=2.7' 'ndesk-dbus-glib') -makedepends=('intltool' 'pkgconfig' 'gnome-icon-theme') +depends=('gconf=2.28.0' 'gtk2=2.18.3' 'gnome-icon-theme=2.28.0' 'gstreamer0.10=0.10.25' 'mono=2.4.2.3' 'gnome-sharp=2.24.1' 'taglib-sharp=2.0.3.2' 'ndesk-dbus=0.6.0' 'ndesk-dbus-glib=0.4.1' 'gstreamer0.10-base-plugins=0.10.25' 'gstreamer0.10-good-plugins=0.10.16') +makedepends=('intltool') optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' 'gstreamer0.10-bad-plugins: Extra media codecs' - 'gstreamer0.10-ffmpeg: Extra media codecs') +'gstreamer0.10-ffmpeg: Extra media codecs') options=('!libtool' '!emptydirs' '!makeflags') install=muine.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.bz2 - bgo560077.patch) -md5sums=('28e561388de1deebc6336f936bc74a73' -'282873898d8ffce96c1b3dcb5c88c428') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.bz2) +md5sums=('f2a74519d9e9c6c4fca9c5217a13964a') build() { @@ -27,9 +25,8 @@ mkdir -p ${MONO_SHARED_DIR} cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/bgo560077.patch || return 1 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-gstreamer || return 1 + --disable-static || return 1 make || return 1 make DESTDIR=${pkgdir} GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install || return 1 @@ -37,6 +34,6 @@ install -m644 plugins/muine-tray-*.png ${pkgdir}/usr/lib/muine/plugins/ || return 1 install -m755 -d ${pkgdir}/usr/share/gconf/schemas - gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain muine ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } Deleted: extra-x86_64/bgo560077.patch === --- extra-x86_64/bgo560077.patch2009-11-12 19:54:38 UTC (rev 58723) +++ extra-x86_64/bgo560077.patch2009-11-12 19:57:50 UTC (rev 58724) @@ -1,56 +0,0 @@ -From ed0e81a673fbe09fa18622ff437c36075d33984d Mon Sep 17 00:00:00 2001 -From: Luis Medinas lmedi...@gnome.org -Date: Mon, 10 Nov 2008 00:07:00 + -Subject: Fix for bgo #560077 non-working buttons on Add Song/Album windows. Patch - -2008-11-09 Luis Medinas lmedi...@gnome.org - -* data/glade/AddWindow.glade: -* src/AddWindow.cs: - -Fix for bgo #560077 non-working buttons on Add Song/Album -windows. -Patch from Priit Laes a...@store20.com. - - - -svn path=/trunk/; revision=1236 -diff --git a/data/glade/AddWindow.glade b/data/glade/AddWindow.glade -index 0e72749..4b3ef0e 100644 a/data/glade/AddWindow.glade -+++ b/data/glade/AddWindow.glade -@@ -19,8 +19,6 @@ - property name=gravityGDK_GRAVITY_NORTH_WEST/property - property name=focus_on_mapTrue/property - property name=has_separatorFalse/property -- signal name=response handler=OnWindowResponse last_modification_time=Tue, 04 Jan 2005 17:48:15 GMT/ -- signal name=delete_event handler=OnWindowDeleteEvent last_modification_time=Tue, 04 Jan 2005 17:48:11 GMT/ - - child internal-child=vbox - widget class=GtkVBox id=dialog-vbox1 -diff --git a/src/AddWindow.cs b/src/AddWindow.cs -index 0b602f6..eba501c 100644 a/src/AddWindow.cs -+++ b/src/AddWindow.cs -@@
[arch-commits] Commit in scummvm/trunk (PKGBUILD)
Date: Thursday, November 12, 2009 @ 18:03:37 Author: juergen Revision: 58725 update to 1.0.0rc1 Modified: scummvm/trunk/PKGBUILD --+ PKGBUILD | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) Modified: PKGBUILD === --- PKGBUILD2009-11-12 19:57:50 UTC (rev 58724) +++ PKGBUILD2009-11-12 23:03:37 UTC (rev 58725) @@ -3,32 +3,32 @@ # Contributor: Manolis Tzanidakis, Petter Gundersen pkgname=scummvm -pkgver=0.13.1 -pkgrel=2 +pkgver=1.0.0rc1 +pkgrel=1 pkgdesc=A 'virtual machine' for several classic graphical point-and-click adventure games. arch=('i686' 'x86_64') license=('GPL') url=http://www.scummvm.org/; depends=('gcc-libs' 'alsa-lib' 'libmad' 'libvorbis' 'zlib' 'libmpeg2' 'flac=1.1.4' 'sdl') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 ${pkgname}-${pkgver}-gcc4-fix.patch) -md5sums=('843d9cd4470022bd3b269eb84298dc16' '810a6f483010cd2ccc434f7d01d0436f') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 scummvm-0.13.1-gcc4-fix.patch) +md5sums=('f3fabedc7ff2424d6a4bc678229b22ce' '810a6f483010cd2ccc434f7d01d0436f') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/${pkgname}-${pkgver}-gcc4-fix.patch + patch -p1 -i ${srcdir}/scummvm-0.13.1-gcc4-fix.patch ./configure --backend=sdl --disable-debug \ --with-mpeg2-prefix=/usr \ --with-flac-prefix=/usr \ ---prefix=/usr \ ---disable-fluidsynth - /usr/bin/make || return 1 + --prefix=/usr \ + --disable-fluidsynth + make install -Dm755 scummvm ${pkgdir}/usr/bin/scummvm install -Dm644 dists/scummvm.6 ${pkgdir}/usr/share/man/man6/scummvm.6 - install -Dm644 gui/themes/modern.ini ${pkgdir}/usr/share/scummvm/modern.ini - install -Dm644 gui/themes/modern.zip ${pkgdir}/usr/share/scummvm/modern.zip # fixes FS#9118 install -Dm644 dists/${pkgname}.desktop \ ${pkgdir}/usr/share/applications/${pkgname}.desktop install -Dm644 icons/scummvm.xpm \ ${pkgdir}/usr/share/pixmaps/scummvm.xpm + + install -Dm644 gui/themes/scummmodern.zip ${pkgdir}/usr/share/scummvm/scummmodern.zip }
[arch-commits] Commit in scummvm/repos (extra-x86_64 extra-x86_64/PKGBUILD)
Date: Thursday, November 12, 2009 @ 18:33:18 Author: juergen Revision: 58726 Merged revisions 58725 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/scummvm/trunk r58725 | juergen | 2009-11-13 00:03:37 +0100 (Fr, 13 Nov 2009) | 1 line update to 1.0.0rc1 Modified: scummvm/repos/extra-x86_64/ (properties) scummvm/repos/extra-x86_64/PKGBUILD --+ PKGBUILD | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) Property changes on: scummvm/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /scummvm/trunk:1-57416 + /scummvm/trunk:1-58725 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2009-11-12 23:03:37 UTC (rev 58725) +++ extra-x86_64/PKGBUILD 2009-11-12 23:33:18 UTC (rev 58726) @@ -3,32 +3,32 @@ # Contributor: Manolis Tzanidakis, Petter Gundersen pkgname=scummvm -pkgver=0.13.1 -pkgrel=2 +pkgver=1.0.0rc1 +pkgrel=1 pkgdesc=A 'virtual machine' for several classic graphical point-and-click adventure games. arch=('i686' 'x86_64') license=('GPL') url=http://www.scummvm.org/; depends=('gcc-libs' 'alsa-lib' 'libmad' 'libvorbis' 'zlib' 'libmpeg2' 'flac=1.1.4' 'sdl') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 ${pkgname}-${pkgver}-gcc4-fix.patch) -md5sums=('843d9cd4470022bd3b269eb84298dc16' '810a6f483010cd2ccc434f7d01d0436f') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 scummvm-0.13.1-gcc4-fix.patch) +md5sums=('f3fabedc7ff2424d6a4bc678229b22ce' '810a6f483010cd2ccc434f7d01d0436f') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/${pkgname}-${pkgver}-gcc4-fix.patch + patch -p1 -i ${srcdir}/scummvm-0.13.1-gcc4-fix.patch ./configure --backend=sdl --disable-debug \ --with-mpeg2-prefix=/usr \ --with-flac-prefix=/usr \ ---prefix=/usr \ ---disable-fluidsynth - /usr/bin/make || return 1 + --prefix=/usr \ + --disable-fluidsynth + make install -Dm755 scummvm ${pkgdir}/usr/bin/scummvm install -Dm644 dists/scummvm.6 ${pkgdir}/usr/share/man/man6/scummvm.6 - install -Dm644 gui/themes/modern.ini ${pkgdir}/usr/share/scummvm/modern.ini - install -Dm644 gui/themes/modern.zip ${pkgdir}/usr/share/scummvm/modern.zip # fixes FS#9118 install -Dm644 dists/${pkgname}.desktop \ ${pkgdir}/usr/share/applications/${pkgname}.desktop install -Dm644 icons/scummvm.xpm \ ${pkgdir}/usr/share/pixmaps/scummvm.xpm + + install -Dm644 gui/themes/scummmodern.zip ${pkgdir}/usr/share/scummvm/scummmodern.zip }
[arch-commits] Commit in (5 files)
Date: Thursday, November 12, 2009 @ 22:10:53 Author: allan Revision: 58728 add libmpc, needed for future gcc-4.5 release Added: libmpc/ libmpc/repos/ libmpc/trunk/ libmpc/trunk/PKGBUILD libmpc/trunk/libmpc.install + PKGBUILD | 26 ++ libmpc.install | 20 2 files changed, 46 insertions(+) Added: libmpc/trunk/PKGBUILD === --- libmpc/trunk/PKGBUILD (rev 0) +++ libmpc/trunk/PKGBUILD 2009-11-13 03:10:53 UTC (rev 58728) @@ -0,0 +1,26 @@ +# $Id$ +# Maintainer: Allan McRae al...@archlinux.org + +pkgname=libmpc +pkgver=0.8 +pkgrel=1 +pkgdesc=Library for the arithmetic of complex numbers with arbitrarily high precision +arch=('i686' 'x86_64') +url=http://www.multiprecision.org; +license=('LGPL') +depends=('mpfr') +options=('!libtool') +install=libmpc.install +source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz) +md5sums=('4df67a05d0251a3fcdd956390e9bd59f') + +build() { + cd $srcdir/mpc-${pkgver/_/-} + ./configure --prefix=/usr + make || return 1 + make DESTDIR=$pkgdir/ install + + make check + + mv -f $pkgdir/usr/share/info/{mpc,libmpc}.info +} Property changes on: libmpc/trunk/PKGBUILD ___ Added: svn:keywords + Id Added: libmpc/trunk/libmpc.install === --- libmpc/trunk/libmpc.install (rev 0) +++ libmpc/trunk/libmpc.install 2009-11-13 03:10:53 UTC (rev 58728) @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(libmpc.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${fileli...@]}; do +install-info $infodir/$file.gz $infodir/dir 2 /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${fileli...@]}; do +install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null + done +}
[arch-commits] Commit in libmpc/repos (testing-i686)
Date: Thursday, November 12, 2009 @ 22:12:34 Author: allan Revision: 58730 Initialized merge tracking via svnmerge with revisions 1-58728 from svn+ssh://gerolde.archlinux.org/srv/svn-packages/libmpc/trunk Modified: libmpc/repos/testing-i686/(properties) Property changes on: libmpc/repos/testing-i686 ___ Added: svnmerge-integrated + /libmpc/trunk:1-58728
[arch-commits] Commit in libmpc/repos (testing-x86_64)
Date: Thursday, November 12, 2009 @ 22:13:31 Author: allan Revision: 58732 Initialized merge tracking via svnmerge with revisions 1-58730 from svn+ssh://gerolde.archlinux.org/srv/svn-packages/libmpc/trunk Modified: libmpc/repos/testing-x86_64/ (properties) Property changes on: libmpc/repos/testing-x86_64 ___ Added: svnmerge-integrated + /libmpc/trunk:1-58730