Updated patches and series files

[maemo-efl] / trunk / epsilon / debian / patches / 01_dont_overwrite_changelog.diff

diff --git a/trunk/epsilon/debian/patches/01_dont_overwrite_changelog.diff b/trunk/epsilon/debian/patches/01_dont_overwrite_changelog.diff
new file mode 100644 (file)
index 0000000..b942cd9
--- /dev/null
+++ b/trunk/epsilon/debian/patches/01_dont_overwrite_changelog.diff
@@ -0,0 +1,102 @@
+diff -upNr epsilon.old/Makefile.am epsilon.new/Makefile.am
+--- epsilon.old/Makefile.am    2007-12-10 22:14:36.000000000 -0200
++++ epsilon.new/Makefile.am    2007-12-10 22:15:36.000000000 -0200
+@@ -9,10 +9,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+                      epsilon.spec epsilon.pc depcomp
+ 
+ EXTRA_DIST = README AUTHORS COPYING epsilon.spec.in epsilon.spec gendoc \
+-           Doxyfile debian/changelog debian/changelog.in debian/rules \
+-           debian/copyright debian/control debian/epsilon0-bin.install \
+-           debian/libepsilon0.install debian/libepsilon0-dev.install \
+-           epsilon.pc.in
++           Doxyfile epsilon.pc.in
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = epsilon.pc
+diff -upNr epsilon.old/Makefile.in epsilon.new/Makefile.in
+--- epsilon.old/Makefile.in    2007-12-10 22:15:00.000000000 -0200
++++ epsilon.new/Makefile.in    2007-12-10 22:15:54.000000000 -0200
+@@ -37,10 +37,9 @@ POST_UNINSTALL = :
+ host_triplet = @host@
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+       $(srcdir)/Makefile.in $(srcdir)/epsilon.pc.in \
+-      $(srcdir)/epsilon.spec.in $(top_srcdir)/configure \
+-      $(top_srcdir)/debian/changelog.in AUTHORS COPYING ChangeLog \
+-      INSTALL NEWS TODO config.guess config.sub depcomp install-sh \
+-      ltmain.sh missing
++      $(srcdir)/epsilon.spec.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
+@@ -50,7 +49,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+  configure.lineno configure.status.lineno
+ mkinstalldirs = $(mkdir_p)
+ CONFIG_HEADER = $(top_builddir)/src/config.h
+-CONFIG_CLEAN_FILES = epsilon.pc epsilon.spec debian/changelog
++CONFIG_CLEAN_FILES = epsilon.pc epsilon.spec
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -195,10 +194,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+                      epsilon.spec epsilon.pc depcomp
+ 
+ EXTRA_DIST = README AUTHORS COPYING epsilon.spec.in epsilon.spec gendoc \
+-           Doxyfile debian/changelog debian/changelog.in debian/rules \
+-           debian/copyright debian/control debian/epsilon0-bin.install \
+-           debian/libepsilon0.install debian/libepsilon0-dev.install \
+-           epsilon.pc.in
++           Doxyfile epsilon.pc.in
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = epsilon.pc
+@@ -242,8 +238,6 @@ epsilon.pc: $(top_builddir)/config.statu
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+ epsilon.spec: $(top_builddir)/config.status $(srcdir)/epsilon.spec.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+-debian/changelog: $(top_builddir)/config.status $(top_srcdir)/debian/changelog.in
+-      cd $(top_builddir) && $(SHELL) ./config.status $@
+ 
+ mostlyclean-libtool:
+       -rm -f *.lo
+@@ -395,7 +389,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 epsilon.old/configure epsilon.new/configure
+--- epsilon.old/configure      2007-12-10 22:14:55.000000000 -0200
++++ epsilon.new/configure      2007-12-10 22:15:48.000000000 -0200
+@@ -14988,7 +14988,7 @@ requirements="imlib2 evas ecore-evas eco
+ #####################################################################
+ ## Output
+ 
+-                                                                                                    ac_config_files="$ac_config_files Makefile epsilon.pc epsilon.spec src/Makefile src/include/Makefile src/lib/Makefile src/lib/exiftags/Makefile src/bin/Makefile src/plugins/Makefile debian/changelog"
++                                                                                          ac_config_files="$ac_config_files Makefile epsilon.pc epsilon.spec src/Makefile src/include/Makefile src/lib/Makefile src/lib/exiftags/Makefile src/bin/Makefile src/plugins/Makefile"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -15561,7 +15561,6 @@ do
+   "src/lib/exiftags/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/exiftags/Makefile" ;;
+   "src/bin/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/bin/Makefile" ;;
+   "src/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/plugins/Makefile" ;;
+-  "debian/changelog" ) CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
+   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+   "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+diff -upNr epsilon.old/configure.in epsilon.new/configure.in
+--- epsilon.old/configure.in   2007-12-10 22:14:36.000000000 -0200
++++ epsilon.new/configure.in   2007-12-10 22:15:13.000000000 -0200
+@@ -106,7 +106,6 @@ src/lib/Makefile
+ src/lib/exiftags/Makefile
+ src/bin/Makefile
+ src/plugins/Makefile
+-debian/changelog
+ ])
+ 
+