projects / maemo-efl / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Updated imlib2 package
[maemo-efl] / trunk / imlib2 / 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 d80a563..fcd736e 100644 (file)
--- a/trunk/imlib2/debian/patches/01_dont_overwrite_changelog.diff
+++ b/trunk/imlib2/debian/patches/01_dont_overwrite_changelog.diff
@@ -1,6 +1,6 @@
-diff -upNr imlib2.old/Makefile.am imlib2.new/Makefile.am
---- imlib2.old/Makefile.am     2007-12-10 21:58:54.000000000 -0200
-+++ imlib2.new/Makefile.am     2007-12-10 22:00:35.000000000 -0200
+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 \
@@ -31,10 +31,10 @@ diff -upNr imlib2.old/Makefile.am imlib2.new/Makefile.am
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = imlib2.pc
-diff -upNr imlib2.old/Makefile.in imlib2.new/Makefile.in
---- imlib2.old/Makefile.in     2007-12-10 21:59:52.000000000 -0200
-+++ imlib2.new/Makefile.in     2007-12-10 22:01:00.000000000 -0200
-@@ -40,9 +40,9 @@ DIST_COMMON = README $(am__configure_dep
+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
+@@ -38,9 +38,9 @@ DIST_COMMON = README $(am__configure_dep
        $(srcdir)/Makefile.in $(srcdir)/README.in \
        $(srcdir)/config.h.in $(srcdir)/imlib2-config.in \
        $(srcdir)/imlib2.pc.in $(srcdir)/imlib2.spec.in \
@@ -44,12 +44,12 @@ diff -upNr imlib2.old/Makefile.in imlib2.new/Makefile.in
 +      $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
 +      TODO config.guess config.sub depcomp install-sh ltmain.sh \
 +      missing
- subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/configure.in
-@@ -52,8 +52,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
-  configure.lineno configure.status.lineno
- mkinstalldirs = $(mkdir_p)
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+@@ -49,8 +49,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+  configure.lineno config.status.lineno
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = config.h
 -CONFIG_CLEAN_FILES = imlib2.pc imlib2-config README imlib2.spec \
 -      debian/changelog
@@ -57,7 +57,7 @@ diff -upNr imlib2.old/Makefile.in imlib2.new/Makefile.in
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"
  binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  SCRIPTS = $(bin_SCRIPTS)
-@@ -213,26 +212,14 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+@@ -214,26 +213,14 @@ MAINTAINERCLEANFILES = Makefile.in acloc
                       imlib2_docs.tar.gz imlib2.c \
                       README \
                       imlib2.pc \
@@ -86,7 +86,7 @@ diff -upNr imlib2.old/Makefile.in imlib2.new/Makefile.in
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = imlib2.pc
-@@ -298,8 +285,6 @@ README: $(top_builddir)/config.status $(
+@@ -299,8 +286,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 $@
@@ -94,40 +94,31 @@ diff -upNr imlib2.old/Makefile.in imlib2.new/Makefile.in
 -      cd $(top_builddir) && $(SHELL) ./config.status $@
  install-binSCRIPTS: $(bin_SCRIPTS)
        @$(NORMAL_INSTALL)
-       test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-@@ -470,7 +455,7 @@ distclean-tags:
- distdir: $(DISTFILES)
-       $(am__remove_distdir)
-       mkdir $(distdir)
--      $(mkdir_p) $(distdir)/. $(distdir)/debian
-+      $(mkdir_p) $(distdir)/.
-       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-       list='$(DISTFILES)'; for file in $$list; do \
-diff -upNr imlib2.old/configure imlib2.new/configure
---- imlib2.old/configure       2007-12-10 21:59:43.000000000 -0200
-+++ imlib2.new/configure       2007-12-10 22:00:51.000000000 -0200
-@@ -24340,7 +24340,7 @@ if test "x$enable_visibility_hiding" = x
+       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
    CPPFLAGS="$CPPFLAGS -fvisibility=hidden"
  fi
  
--                                                                                                                                                                ac_config_files="$ac_config_files Makefile imlib2.pc src/Makefile src/lib/Makefile src/bin/Makefile src/modules/Makefile src/modules/filters/Makefile src/modules/loaders/Makefile data/Makefile data/fonts/Makefile data/images/Makefile doc/Makefile imlib2-config README imlib2.spec debian/changelog"
-+                                                                                                                                                      ac_config_files="$ac_config_files Makefile imlib2.pc src/Makefile src/lib/Makefile src/bin/Makefile src/modules/Makefile src/modules/filters/Makefile src/modules/loaders/Makefile data/Makefile data/fonts/Makefile data/images/Makefile doc/Makefile imlib2-config README imlib2.spec"
-           ac_config_commands="$ac_config_commands default"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -24983,7 +24983,6 @@ do
-   "imlib2-config" ) CONFIG_FILES="$CONFIG_FILES imlib2-config" ;;
-   "README" ) CONFIG_FILES="$CONFIG_FILES README" ;;
-   "imlib2.spec" ) CONFIG_FILES="$CONFIG_FILES imlib2.spec" ;;
--  "debian/changelog" ) CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
-   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-diff -upNr imlib2.old/configure.in imlib2.new/configure.in
---- imlib2.old/configure.in    2007-12-10 21:58:54.000000000 -0200
-+++ imlib2.new/configure.in    2007-12-10 22:00:22.000000000 -0200
-@@ -583,7 +583,6 @@ doc/Makefile
+-ac_config_files="$ac_config_files Makefile imlib2.pc src/Makefile src/lib/Makefile src/bin/Makefile src/modules/Makefile src/modules/filters/Makefile src/modules/loaders/Makefile data/Makefile data/fonts/Makefile data/images/Makefile doc/Makefile imlib2-config README imlib2.spec debian/changelog"
++ac_config_files="$ac_config_files Makefile imlib2.pc src/Makefile src/lib/Makefile src/bin/Makefile src/modules/Makefile src/modules/filters/Makefile src/modules/loaders/Makefile data/Makefile data/fonts/Makefile data/images/Makefile doc/Makefile imlib2-config README imlib2.spec"
+ 
+ ac_config_commands="$ac_config_commands default"
+ 
+@@ -25243,7 +25243,6 @@ do
+     "imlib2-config") CONFIG_FILES="$CONFIG_FILES imlib2-config" ;;
+     "README") CONFIG_FILES="$CONFIG_FILES README" ;;
+     "imlib2.spec") CONFIG_FILES="$CONFIG_FILES imlib2.spec" ;;
+-    "debian/changelog") CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
+     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+ 
+   *) { { 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-config
  README
  imlib2.spec
Unnamed repository; edit this file to name it for gitweb.