SOURCES: kdiff3-am.patch - allow automake 1.9

arekm arekm at pld-linux.org
Sat Apr 1 17:13:00 CEST 2006


Author: arekm                        Date: Sat Apr  1 15:13:00 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- allow automake 1.9

---- Files affected:
SOURCES:
   kdiff3-am.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/kdiff3-am.patch
diff -u SOURCES/kdiff3-am.patch:1.2 SOURCES/kdiff3-am.patch:1.3
--- SOURCES/kdiff3-am.patch:1.2	Fri Feb 25 15:58:38 2005
+++ SOURCES/kdiff3-am.patch	Sat Apr  1 17:12:55 2006
@@ -1,5 +1,18 @@
---- kdiff3-0.9.88/doc/Makefile.am.orig	2005-02-24 23:32:57.000000000 +0100
-+++ kdiff3-0.9.88/doc/Makefile.am	2005-02-25 15:24:21.242974624 +0100
+diff -urN kdiff3-0.9.88.org/admin/cvs.sh kdiff3-0.9.88/admin/cvs.sh
+--- kdiff3-0.9.88.org/admin/cvs.sh	2004-09-13 21:21:55.000000000 +0200
++++ kdiff3-0.9.88/admin/cvs.sh	2006-04-01 17:12:23.803626500 +0200
+@@ -64,7 +64,7 @@
+     echo "*** KDE requires automake 1.6.1 or newer"
+     exit 1
+     ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8.* ) : ;;
++  automake*1.6.* | automake*1.7* | automake*1.8.* | automake*1.9.* ) : ;;
+   "" )
+     echo "*** AUTOMAKE NOT FOUND!."
+     echo "*** KDE requires automake 1.6.1 or newer"
+diff -urN kdiff3-0.9.88.org/doc/Makefile.am kdiff3-0.9.88/doc/Makefile.am
+--- kdiff3-0.9.88.org/doc/Makefile.am	2005-02-24 23:32:57.000000000 +0100
++++ kdiff3-0.9.88/doc/Makefile.am	2006-04-01 17:11:54.981825250 +0200
 @@ -1,6 +1,6 @@
  # the SUBDIRS is filled automatically by am_edit. If files are 
  # in this directory they are installed into the english dir
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdiff3-am.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list