[arch-commits] Commit in kdiff3/repos (10 files)
Eric Bélanger
eric at archlinux.org
Sat Sep 3 21:15:57 UTC 2011
Date: Saturday, September 3, 2011 @ 17:15:57
Author: eric
Revision: 136960
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kdiff3/repos/extra-i686/PKGBUILD
(from rev 136959, kdiff3/trunk/PKGBUILD)
kdiff3/repos/extra-i686/kdiff3.install
(from rev 136959, kdiff3/trunk/kdiff3.install)
kdiff3/repos/extra-x86_64/PKGBUILD
(from rev 136959, kdiff3/trunk/PKGBUILD)
kdiff3/repos/extra-x86_64/kdiff3.install
(from rev 136959, kdiff3/trunk/kdiff3.install)
Deleted:
kdiff3/repos/extra-i686/PKGBUILD
kdiff3/repos/extra-i686/docbook.patch
kdiff3/repos/extra-i686/kdiff3.install
kdiff3/repos/extra-x86_64/PKGBUILD
kdiff3/repos/extra-x86_64/docbook.patch
kdiff3/repos/extra-x86_64/kdiff3.install
-----------------------------+
extra-i686/PKGBUILD | 62 ++++++++++++++++++++----------------------
extra-i686/docbook.patch | 40 ---------------------------
extra-i686/kdiff3.install | 22 +++++++-------
extra-x86_64/PKGBUILD | 62 ++++++++++++++++++++----------------------
extra-x86_64/docbook.patch | 40 ---------------------------
extra-x86_64/kdiff3.install | 22 +++++++-------
6 files changed, 82 insertions(+), 166 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-09-03 21:15:17 UTC (rev 136959)
+++ extra-i686/PKGBUILD 2011-09-03 21:15:57 UTC (rev 136960)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-
-pkgname=kdiff3
-pkgver=0.9.95
-pkgrel=2
-pkgdesc="A KDE file comparator/merge tool"
-arch=('i686' 'x86_64')
-url="http://kdiff3.sourceforge.net/"
-license=('GPL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml')
-optdepends=('kdebase-lib: for the plugin')
-install=kdiff3.install
-source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz docbook.patch)
-md5sums=('652a98bf79ba762a8a646d4a0fddb323' '7a91d1ab6f62c41dc65082ae99bdeff0')
-sha1sums=('1fb27e8b42463ea23ad0169e20819352c1c476b7' '96a856fc7d9829f64bb59853a6dffba8a70d794e')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 < ../docbook.patch
- sed -i 's|kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3|kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3part|' src-QT4/CMakeLists.txt
- mkdir release
- cd release
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}/release"
- make DESTDIR="${pkgdir}" install
-}
Copied: kdiff3/repos/extra-i686/PKGBUILD (from rev 136959, kdiff3/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-03 21:15:57 UTC (rev 136960)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=kdiff3
+pkgver=0.9.96
+pkgrel=1
+pkgdesc="A KDE file comparator/merge tool"
+arch=('i686' 'x86_64')
+url="http://kdiff3.sourceforge.net/"
+license=('GPL')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml')
+optdepends=('kdebase-lib: for the plugin')
+install=kdiff3.install
+source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
+md5sums=('46b96befddf3448a3cb673f018c6f6f9')
+sha1sums=('d7efdacdfd7ea3c7ec9f7dee32aba5962c1709a5')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ mkdir release
+ cd release
+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}/release"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/docbook.patch
===================================================================
--- extra-i686/docbook.patch 2011-09-03 21:15:17 UTC (rev 136959)
+++ extra-i686/docbook.patch 2011-09-03 21:15:57 UTC (rev 136960)
@@ -1,40 +0,0 @@
-diff -r --unified kdiff3-0.9.95/doc/de/index.docbook kdiff3-0.9.95-neu/doc/de/index.docbook
---- kdiff3-0.9.95/doc/de/index.docbook 2010-10-11 23:51:27.575286877 +0200
-+++ kdiff3-0.9.95-neu/doc/de/index.docbook 2010-10-11 23:52:40.138829992 +0200
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
- <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
-diff -r --unified kdiff3-0.9.95/doc/fr/index.docbook kdiff3-0.9.95-neu/doc/fr/index.docbook
---- kdiff3-0.9.95/doc/fr/index.docbook 2010-10-11 23:51:27.610931550 +0200
-+++ kdiff3-0.9.95-neu/doc/fr/index.docbook 2010-10-11 23:52:23.739728901 +0200
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
- <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
-diff -r --unified kdiff3-0.9.95/doc/it/index.docbook kdiff3-0.9.95-neu/doc/it/index.docbook
---- kdiff3-0.9.95/doc/it/index.docbook 2010-10-11 23:51:27.580378903 +0200
-+++ kdiff3-0.9.95-neu/doc/it/index.docbook 2010-10-11 23:52:32.462829209 +0200
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
- <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
-diff -r --unified kdiff3-0.9.95/doc/nl/index.docbook kdiff3-0.9.95-neu/doc/nl/index.docbook
---- kdiff3-0.9.95/doc/nl/index.docbook 2010-10-11 23:51:27.575286877 +0200
-+++ kdiff3-0.9.95-neu/doc/nl/index.docbook 2010-10-11 23:52:45.371829602 +0200
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
- <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
Deleted: extra-i686/kdiff3.install
===================================================================
--- extra-i686/kdiff3.install 2011-09-03 21:15:17 UTC (rev 136959)
+++ extra-i686/kdiff3.install 2011-09-03 21:15:57 UTC (rev 136960)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdiff3/repos/extra-i686/kdiff3.install (from rev 136959, kdiff3/trunk/kdiff3.install)
===================================================================
--- extra-i686/kdiff3.install (rev 0)
+++ extra-i686/kdiff3.install 2011-09-03 21:15:57 UTC (rev 136960)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-09-03 21:15:17 UTC (rev 136959)
+++ extra-x86_64/PKGBUILD 2011-09-03 21:15:57 UTC (rev 136960)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-
-pkgname=kdiff3
-pkgver=0.9.95
-pkgrel=2
-pkgdesc="A KDE file comparator/merge tool"
-arch=('i686' 'x86_64')
-url="http://kdiff3.sourceforge.net/"
-license=('GPL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml')
-optdepends=('kdebase-lib: for the plugin')
-install=kdiff3.install
-source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz docbook.patch)
-md5sums=('652a98bf79ba762a8a646d4a0fddb323' '7a91d1ab6f62c41dc65082ae99bdeff0')
-sha1sums=('1fb27e8b42463ea23ad0169e20819352c1c476b7' '96a856fc7d9829f64bb59853a6dffba8a70d794e')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 < ../docbook.patch
- sed -i 's|kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3|kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3part|' src-QT4/CMakeLists.txt
- mkdir release
- cd release
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}/release"
- make DESTDIR="${pkgdir}" install
-}
Copied: kdiff3/repos/extra-x86_64/PKGBUILD (from rev 136959, kdiff3/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-09-03 21:15:57 UTC (rev 136960)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=kdiff3
+pkgver=0.9.96
+pkgrel=1
+pkgdesc="A KDE file comparator/merge tool"
+arch=('i686' 'x86_64')
+url="http://kdiff3.sourceforge.net/"
+license=('GPL')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml')
+optdepends=('kdebase-lib: for the plugin')
+install=kdiff3.install
+source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
+md5sums=('46b96befddf3448a3cb673f018c6f6f9')
+sha1sums=('d7efdacdfd7ea3c7ec9f7dee32aba5962c1709a5')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ mkdir release
+ cd release
+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}/release"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/docbook.patch
===================================================================
--- extra-x86_64/docbook.patch 2011-09-03 21:15:17 UTC (rev 136959)
+++ extra-x86_64/docbook.patch 2011-09-03 21:15:57 UTC (rev 136960)
@@ -1,40 +0,0 @@
-diff -r --unified kdiff3-0.9.95/doc/de/index.docbook kdiff3-0.9.95-neu/doc/de/index.docbook
---- kdiff3-0.9.95/doc/de/index.docbook 2010-10-11 23:51:27.575286877 +0200
-+++ kdiff3-0.9.95-neu/doc/de/index.docbook 2010-10-11 23:52:40.138829992 +0200
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
- <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
-diff -r --unified kdiff3-0.9.95/doc/fr/index.docbook kdiff3-0.9.95-neu/doc/fr/index.docbook
---- kdiff3-0.9.95/doc/fr/index.docbook 2010-10-11 23:51:27.610931550 +0200
-+++ kdiff3-0.9.95-neu/doc/fr/index.docbook 2010-10-11 23:52:23.739728901 +0200
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
- <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
-diff -r --unified kdiff3-0.9.95/doc/it/index.docbook kdiff3-0.9.95-neu/doc/it/index.docbook
---- kdiff3-0.9.95/doc/it/index.docbook 2010-10-11 23:51:27.580378903 +0200
-+++ kdiff3-0.9.95-neu/doc/it/index.docbook 2010-10-11 23:52:32.462829209 +0200
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
- <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
-diff -r --unified kdiff3-0.9.95/doc/nl/index.docbook kdiff3-0.9.95-neu/doc/nl/index.docbook
---- kdiff3-0.9.95/doc/nl/index.docbook 2010-10-11 23:51:27.575286877 +0200
-+++ kdiff3-0.9.95-neu/doc/nl/index.docbook 2010-10-11 23:52:45.371829602 +0200
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
- <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
Deleted: extra-x86_64/kdiff3.install
===================================================================
--- extra-x86_64/kdiff3.install 2011-09-03 21:15:17 UTC (rev 136959)
+++ extra-x86_64/kdiff3.install 2011-09-03 21:15:57 UTC (rev 136960)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdiff3/repos/extra-x86_64/kdiff3.install (from rev 136959, kdiff3/trunk/kdiff3.install)
===================================================================
--- extra-x86_64/kdiff3.install (rev 0)
+++ extra-x86_64/kdiff3.install 2011-09-03 21:15:57 UTC (rev 136960)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list