2005-04-02 Tollef Fog Heen <tfheen@err.no>

Author: tfheen
Date: 2005-04-01 22:06:47 GMT
2005-04-02  Tollef Fog Heen  <tfheen@err.no>

    * glib-patches/mkinstalldirs.update.diff: cvs admin -ko to avoid
    having the Id CVS keyword being expanded, which broke the
    application of the patch.

diff --git a/ChangeLog b/ChangeLog
index 8922d9d93297ed2ceaf5e7288b7b67a8780969d4..3d7f3fde6105053ff11b670aed64c69997b0c836 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-02  Tollef Fog Heen  <tfheen@err.no>
+
+       * glib-patches/mkinstalldirs.update.diff: cvs admin -ko to avoid
+       having the Id CVS keyword being expanded, which broke the
+       application of the patch.
+
 2005-04-01  Tollef Fog Heen  <tfheen@err.no>
 
        Patches provided by Steve Langasek <vorlon@debian.org>

diff --git a/glib-patches/mkinstalldirs.update.diff b/glib-patches/mkinstalldirs.update.diff
index f936c477848d3aa922a1360c7bc2b4e85d0ccae2..0d4a73e37005947ba37385d80f7cb657a567c7bf 100644 (file)
--- a/glib-patches/mkinstalldirs.update.diff
+++ b/glib-patches/mkinstalldirs.update.diff
@@ -1,9 +1,5 @@
-#
-# Update to mkinstalldirs from automake 1.7
-#
-
---- glib-1.2.8/mkinstalldirs   2000-03-11 10:25:38.000000000 +0100
-+++ glib-1.2.8/mkinstalldirs   2004-06-20 10:56:22.000000000 +0200
+--- glib-1.2.8/mkinstalldirs.old       2005-04-01 23:54:11.908326540 +0200
++++ glib-1.2.8/mkinstalldirs   2005-04-01 23:54:26.425962180 +0200
 @@ -4,37 +4,108 @@
  # Created: 1993-05-16
  # Public domain