Updated debian/patches/01_dont_overwrite_changelog.diff

diff --git a/trunk/imlib2/debian/patches/01_dont_overwrite_changelog.diff b/trunk/imlib2/debian/patches/01_dont_overwrite_changelog.diff
index fcd736e..1d6e0a9 100644 (file)
--- a/trunk/imlib2/debian/patches/01_dont_overwrite_changelog.diff
+++ b/trunk/imlib2/debian/patches/01_dont_overwrite_changelog.diff
@@ -1,17 +1,7 @@
 diff -upr imlib2/Makefile.am imlib2.new/Makefile.am
---- imlib2/Makefile.am 2008-03-06 10:50:22.000000000 -0300
-+++ imlib2.new/Makefile.am     2008-05-08 11:00:05.000000000 -0300
-@@ -9,8 +9,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
-                      imlib2_docs.tar.gz imlib2.c \
-                      README \
-                      imlib2.pc \
--                     imlib2.spec \
--                     debian/changelog
-+                     imlib2.spec
- 
- bin_SCRIPTS = imlib2-config
- 
-@@ -18,18 +17,7 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLA
+--- imlib2/Makefile.am 2008-05-14 10:30:21.000000000 -0300
++++ imlib2.new/Makefile.am     2008-05-14 14:27:35.000000000 -0300
+@@ -12,18 +12,7 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLA
               Doxyfile \
             README.in README \
             imlib2.pc.in \
@@ -32,8 +22,8 @@ diff -upr imlib2/Makefile.am imlib2.new/Makefile.am
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = imlib2.pc
 diff -upr imlib2/Makefile.in imlib2.new/Makefile.in
---- imlib2/Makefile.in 2008-05-08 10:59:15.000000000 -0300
-+++ imlib2.new/Makefile.in     2008-05-08 11:00:27.000000000 -0300
+--- imlib2/Makefile.in 2008-05-14 14:11:13.000000000 -0300
++++ imlib2.new/Makefile.in     2008-05-14 14:27:53.000000000 -0300
 @@ -38,9 +38,9 @@ DIST_COMMON = README $(am__configure_dep
        $(srcdir)/Makefile.in $(srcdir)/README.in \
        $(srcdir)/config.h.in $(srcdir)/imlib2-config.in \
@@ -57,16 +47,7 @@ diff -upr imlib2/Makefile.in imlib2.new/Makefile.in
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"
  binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  SCRIPTS = $(bin_SCRIPTS)
-@@ -214,26 +213,14 @@ MAINTAINERCLEANFILES = Makefile.in acloc
-                      imlib2_docs.tar.gz imlib2.c \
-                      README \
-                      imlib2.pc \
--                     imlib2.spec \
--                     debian/changelog
-+                     imlib2.spec
- 
- bin_SCRIPTS = imlib2-config
- EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN gendoc \
+@@ -216,18 +215,7 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLA
               Doxyfile \
             README.in README \
             imlib2.pc.in \
@@ -86,7 +67,7 @@ diff -upr imlib2/Makefile.in imlib2.new/Makefile.in
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = imlib2.pc
-@@ -299,8 +286,6 @@ README: $(top_builddir)/config.status $(
+@@ -293,8 +281,6 @@ README: $(top_builddir)/config.status $(
        cd $(top_builddir) && $(SHELL) ./config.status $@
  imlib2.spec: $(top_builddir)/config.status $(srcdir)/imlib2.spec.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -96,9 +77,9 @@ diff -upr imlib2/Makefile.in imlib2.new/Makefile.in
        @$(NORMAL_INSTALL)
        test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 diff -upr imlib2/configure imlib2.new/configure
---- imlib2/configure   2008-05-08 10:59:12.000000000 -0300
-+++ imlib2.new/configure       2008-05-08 11:00:24.000000000 -0300
-@@ -24568,7 +24568,7 @@ if test "x$enable_visibility_hiding" = x
+--- imlib2/configure   2008-05-14 14:11:10.000000000 -0300
++++ imlib2.new/configure       2008-05-14 14:27:50.000000000 -0300
+@@ -18613,7 +18613,7 @@ if test "x$enable_visibility_hiding" = x
    CPPFLAGS="$CPPFLAGS -fvisibility=hidden"
  fi
  
@@ -107,7 +88,7 @@ diff -upr imlib2/configure imlib2.new/configure
  
  ac_config_commands="$ac_config_commands default"
  
-@@ -25243,7 +25243,6 @@ do
+@@ -19288,7 +19288,6 @@ do
      "imlib2-config") CONFIG_FILES="$CONFIG_FILES imlib2-config" ;;
      "README") CONFIG_FILES="$CONFIG_FILES README" ;;
      "imlib2.spec") CONFIG_FILES="$CONFIG_FILES imlib2.spec" ;;
@@ -116,9 +97,9 @@ diff -upr imlib2/configure imlib2.new/configure
  
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 diff -upr imlib2/configure.in imlib2.new/configure.in
---- imlib2/configure.in        2008-05-05 16:45:04.000000000 -0300
-+++ imlib2.new/configure.in    2008-05-08 11:00:13.000000000 -0300
-@@ -584,7 +584,6 @@ doc/Makefile
+--- imlib2/configure.in        2008-05-14 10:30:21.000000000 -0300
++++ imlib2.new/configure.in    2008-05-14 14:27:24.000000000 -0300
+@@ -530,7 +530,6 @@ doc/Makefile
  imlib2-config
  README
  imlib2.spec