Merge branch 'testing' of gitorious.org:chakra-packages/apps into testing

Conflicts:
	cinstall/PKGBUILD

cinstall/PKGBUILD

@@ -10,7 +10,11 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=cinstall
 pkgver=20100704
+<<<<<<< HEAD
 pkgrel=4
+=======
+pkgrel=3
+>>>>>>> 8e03ff0acf86c6956d28fb9198ba5930fc69f0aa
 depends=('kdelibs' 'qt' 'squashfs-tools' 'xz-utils')
 pkgdesc="Drake Justice's Bundle Creator/Launcher and Package-Manager"
 arch=("i686" "x86_64")
@@ -20,8 +24,13 @@ url="http://chakra-project.org/"
 optdepends=('akabei: for akabei support'
             'pacman: for pacman support')
 
+<<<<<<< HEAD
 #sources=("cinstall-0704-3-fixdesktopfile.patch")
 #md5sums=("decf4d7e9a091e07e954062df7211f9a")
+=======
+sources=("cinstall-0704-3-fixdesktopfile.patch")
+md5sums=("decf4d7e9a091e07e954062df7211f9a")
+>>>>>>> 8e03ff0acf86c6956d28fb9198ba5930fc69f0aa
 
 
 _gitroot="git://gitorious.org/cinstall/cinstall.git"
@@ -47,8 +56,13 @@ cd "${srcdir}"
         cp -r "${srcdir}/$_gitname" "${srcdir}/$_gitname-build"
         cd "${srcdir}/$_gitname-build/"
 
+<<<<<<< HEAD
 #        msg "patch source"
 #	patch -Np1 -i ${startdir}/cinstall-0704-3-fixdesktopfile.patch || return 1
+=======
+        msg "patch source"
+	patch -Np1 -i ${startdir}/cinstall-0704-3-fixdesktopfile.patch || return 1
+>>>>>>> 8e03ff0acf86c6956d28fb9198ba5930fc69f0aa
 
         cmake ../$_gitname-build \
           -DCMAKE_INSTALL_PREFIX=/usr \

gtk-integration/gtk-integration.install

@@ -1,42 +0,0 @@
-post_install() {
-	cat <<-'EOF'
-		################################################################################
-		#  In order to use this theme, you will need to modify (please backup the file
-		#+ first) or create the `.gtkrc-2.0-kde4' file in your $HOME directory with the 
-		#+ following (Adjust the font name and size to your liking):
-
-		include "/usr/share/themes/kde44-oxygen-molecule/gtk-2.0/gtkrc"
-		include "/etc/gtk-2.0/gtkrc"
-		
-		style "user-font"
-		{
-			font_name="Sans Serif"
-		}
-		widget_class "*" style "user-font"
-		gtk-theme-name="kde44-oxygen-molecule"
-		gtk-font-name="Sans Serif 10"
-                gtk-icon-theme-name="oxygenrefit2"
-
-		################################################################################
-		#  If you want GTK+ apps run with root privileges to be themed as well, copy
-		#+ your newly created `~/.gtkrc-2.0-kde4' file to `/root/gtkrc-2.0'
-
-		sudo cp ~/.gtkrc-2.0-kde4 /root/.gtkrc-2.0
-
-		################################################################################
-		#  You may apply the Oxygen-Molecule color scheme to your KDE apps by going to
-		#+ `System Settings -> Appearance -> Colors' and selecting the OxygenMolecule.
-		#
-		#  Also, to make sure your GTK apps use only the Oxygen Molecule color scheme,
-		#+ navigate to `System Settings -> Appearance -> Colors -> Options (tab)' and
-		#+ uncheck the "Apply colors to non-KDE4 applications" option.
-	EOF
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-op=$1
-shift
-$op $*

kipi-plugins/PKGBUILD

@@ -5,7 +5,7 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=kipi-plugins
-pkgver=1.2.0
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="libkipi plugins for digikam and kde apps"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ source=("http://downloads.sourceforge.net/kipi/$pkgname-$pkgver.tar.bz2")
 optdepends=('imagemagick: for picture manipulation'
             'qca: for shwup webservice support')
 install=${pkgname}.install
-md5sums=('f11471f680f8efde2fa72b76b68134be')
+md5sums=('01095ed3d523fbc5e27dc9ba3ee47240')
 
 build() {
   cd $srcdir

knemo/PKGBUILD

@@ -8,7 +8,7 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=knemo
-pkgver=0.6.2
+pkgver=0.6.3
 pkgrel=1
 pkgdesc="The KDE Network Monitor"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 options=('libtool')
 source=(http://www.kde-apps.org/CONTENT/content-files/12956-$pkgname-$pkgver.tar.bz2)
-md5sums=('9a4662c5a4f82d913684465c25db0f50')
+md5sums=('ee21176b15a0ee947d5f3c6dbfa568e4')
 
 build() {
   cd ${srcdir}

konversation/PKGBUILD

@@ -5,7 +5,7 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=konversation
-pkgver=1.2.3
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="A user friendly IRC client for KDE"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('automoc4' 'cmake' 'pkgconfig')
 license=('GPL2' 'FDL')
 install=${pkgname}.install
 source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3747187c392f46ee2337add514aec03a')
+md5sums=('f43ac55e4925e9578e87b13fde173671')
 
 build() {
   cd ${srcdir}

libktorrent/PKGBUILD

@@ -5,9 +5,9 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=libktorrent
-pkgver=1.0.0
+pkgver=1.0.1
 pkgrel=1
-ktorver=4.0
+ktorver=4.0.1
 pkgdesc="A BitTorrent program for KDE"
 arch=('i686' 'x86_64')
 url="http://ktorrent.org"
@@ -16,7 +16,7 @@ depends=('kdelibs')
 makedepends=('autoconf' 'perl' 'automoc4' 'cmake' 'kdepimlibs' 'kdebase-workspace')
 source=(http://ktorrent.org/downloads/${ktorver}/libktorrent-${pkgver}.tar.bz2)
 options=('libtool')
-md5sums=('b409ef0381343d998abce8c85073f7d3')
+md5sums=('c123f1467b6c7dcd55ab44b37e3911a4')
 
 build() {
 	cd ${srcdir}/libktorrent-1.0.0

luckybackup/PKGBUILD

@@ -8,8 +8,8 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=luckybackup
-pkgver=0.4.0
-pkgrel=2
+pkgver=0.4.1
+pkgrel=1
 pkgdesc="Backup & Sync tool using Rsync and Qt4"
 arch=('i686' 'x86_64')
 url="http://luckybackup.sourceforge.net/"
@@ -17,7 +17,7 @@ license=('GPL3')
 depends=( 'qt' 'rsync' 'openssh')
 makedepends=('pkgconfig' 'desktop-file-utils')
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz)
-md5sums=('8ed16f568b41f8c7b31cc4914f1693bb')
+md5sums=('14c2d65cd5626a118401771d6230cac2')
 
 build() {
 cd "${srcdir}/$pkgname-$pkgver"