[arch-commits] Commit in kdiff3/trunk (PKGBUILD docbook.patch)

[Eric Bélanger]

    Date: Saturday, September 3, 2011 @ 17:15:17
  Author: eric
Revision: 136959

upgpkg: kdiff3 0.9.96-1

Upstream update, Remove old patch

Modified:
  kdiff3/trunk/PKGBUILD
Deleted:
  kdiff3/trunk/docbook.patch

---------------+
 PKGBUILD      |   14 ++++++--------
 docbook.patch |   40 ----------------------------------------
 2 files changed, 6 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-03 21:03:54 UTC (rev 136958)
+++ PKGBUILD	2011-09-03 21:15:17 UTC (rev 136959)
@@ -1,9 +1,9 @@
 # $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=kdiff3
-pkgver=0.9.95
-pkgrel=2
+pkgver=0.9.96
+pkgrel=1
 pkgdesc="A KDE file comparator/merge tool"
 arch=('i686' 'x86_64')
 url="http://kdiff3.sourceforge.net/"
@@ -12,14 +12,12 @@
 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')
+source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
+md5sums=('46b96befddf3448a3cb673f018c6f6f9')
+sha1sums=('d7efdacdfd7ea3c7ec9f7dee32aba5962c1709a5')
 
 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

Deleted: docbook.patch
===================================================================
--- docbook.patch	2011-09-03 21:03:54 UTC (rev 136958)
+++ docbook.patch	2011-09-03 21:15:17 UTC (rev 136959)
@@ -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
- >">