Remove javacomp.diff, now integrated into gnulib.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 84be300baab9d7a3bdd5bccb6bc8c5d9fb5fea77..e58ec3aab35ba3c0128473c5baf6fabfa5412647 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,8 +1,9 @@
-2007-01-26  Bruno Haible  <bruno@clisp.org>
+2007-01-27  Bruno Haible  <bruno@clisp.org>
 
        Move a patch to gnulib.
        * lib/javacomp.c.diff: Remove file.
-       * Makefile.am (EXTRA_DIST): Remove it.
+       * modules/javacomp.diff: Remove file.
+       * Makefile.am (EXTRA_DIST): Remove them.
 
 2007-01-26  Bruno Haible  <bruno@clisp.org>
 

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index c21fb6cdeded9ed0717026720efceae47edd3d87..1aec055040fecc8874ea63a590a83c7cc9143229 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -293,7 +293,6 @@ modules/html-ostream \
 modules/html-styled-ostream \
 modules/iconv-ostream \
 modules/java \
-modules/javacomp.diff \
 modules/libcroco \
 modules/libglib \
 modules/libxml \

diff --git a/gnulib-local/modules/javacomp.diff b/gnulib-local/modules/javacomp.diff
deleted file mode 100644 (file)
index 77f7e46..0000000
--- a/gnulib-local/modules/javacomp.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-*** gnulib/modules/javacomp    2006-07-24 21:40:37.000000000 +0200
---- javacomp   2006-07-30 18:28:25.000000000 +0200
-***************
-*** 25,31 ****
-  clean-temp
-  error
-  xvasprintf
-! strstr
-  gettext-h
-  javacomp-script
-  
---- 25,31 ----
-  clean-temp
-  error
-  xvasprintf
-! c-strstr
-  gettext-h
-  javacomp-script
-