X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=trunk%2Fetk%2Fdebian%2Fpatches%2F01_dont_overwrite_changelog.diff;h=a91514436d9c8e43028dcf7cafeadc213a71f8b1;hb=3c469a8b3519ebd2230e699ec886e4512658fc84;hp=6be8b45c97685759309009231aae0db8d7524df5;hpb=b592a0e6aa4e26ccb07785c1442c5424c64b474f;p=maemo-efl

diff --git a/trunk/etk/debian/patches/01_dont_overwrite_changelog.diff b/trunk/etk/debian/patches/01_dont_overwrite_changelog.diff
index 6be8b45..a915144 100644
--- a/trunk/etk/debian/patches/01_dont_overwrite_changelog.diff
+++ b/trunk/etk/debian/patches/01_dont_overwrite_changelog.diff
@@ -1,6 +1,6 @@
 diff -upNr etk/Makefile.am etk.new/Makefile.am
---- etk/Makefile.am	2008-02-18 21:01:09.000000000 -0200
-+++ etk.new/Makefile.am	2008-02-18 21:00:00.000000000 -0200
+--- etk/Makefile.am	2008-03-06 10:50:42.000000000 -0300
++++ etk.new/Makefile.am	2008-05-08 16:03:06.000000000 -0300
 @@ -9,8 +9,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
  		ltconfig ltmain.sh missing mkinstalldirs \
  		stamp-h.in build-stamp configure-stamp depcomp \
@@ -29,8 +29,8 @@ diff -upNr etk/Makefile.am etk.new/Makefile.am
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = etk.pc
 diff -upNr etk/Makefile.in etk.new/Makefile.in
---- etk/Makefile.in	2008-02-18 21:01:38.000000000 -0200
-+++ etk.new/Makefile.in	2008-02-18 21:00:32.000000000 -0200
+--- etk/Makefile.in	2008-05-08 16:02:25.000000000 -0300
++++ etk.new/Makefile.in	2008-05-08 16:03:35.000000000 -0300
 @@ -37,10 +37,9 @@ subdir = .
  DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -91,18 +91,18 @@ diff -upNr etk/Makefile.in etk.new/Makefile.in
  	@$(NORMAL_INSTALL)
  	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 diff -upNr etk/configure etk.new/configure
---- etk/configure	2008-02-18 21:01:27.000000000 -0200
-+++ etk.new/configure	2008-02-18 21:00:23.000000000 -0200
+--- etk/configure	2008-05-08 16:02:16.000000000 -0300
++++ etk.new/configure	2008-05-08 16:03:26.000000000 -0300
 @@ -23839,7 +23839,7 @@ _ACEOF
  #####################################################################
  ## Output
  
--ac_config_files="$ac_config_files Makefile etk.spec etk.pc src/Makefile src/lib/Makefile src/engines/Makefile src/engines/ecore_evas/Makefile src/engines/ecore_evas_x11/Makefile src/engines/ecore_evas_software_x11/Makefile src/engines/ecore_evas_software_x11_16/Makefile src/engines/ecore_evas_gl_x11/Makefile src/engines/ecore_fb/Makefile src/bin/Makefile src/tools/Makefile src/tools/etk_prefs/Makefile data/Makefile data/themes/Makefile data/themes/default/Makefile data/themes/default/widgets/Makefile data/themes/default/fonts/Makefile data/themes/default/images/Makefile data/themes/default/macros/Makefile data/wm/Makefile data/wm/default/Makefile data/wm/default/fonts/Makefile data/wm/default/images/Makefile data/fonts/Makefile data/images/Makefile data/icons/Makefile data/icons/default/icons/Makefile data/icons/default/icons/16x16/Makefile data/icons/default/icons/16x16/actions/Makefile data/icons/default/icons/16x16/apps/Makefile data/icons/default/icons/16x16/categories/Makefile data/icons/default/icons/16x16/devices/Makefile data/icons/default/icons/16x16/emblems/Makefile data/icons/default/icons/16x16/emotes/Makefile data/icons/default/icons/16x16/mimetypes/Makefile data/icons/default/icons/16x16/places/Makefile data/icons/default/icons/16x16/status/Makefile data/icons/default/icons/22x22/Makefile data/icons/default/icons/22x22/actions/Makefile data/icons/default/icons/22x22/apps/Makefile data/icons/default/icons/22x22/categories/Makefile data/icons/default/icons/22x22/devices/Makefile data/icons/default/icons/22x22/emblems/Makefile data/icons/default/icons/22x22/emotes/Makefile data/icons/default/icons/22x22/mimetypes/Makefile data/icons/default/icons/22x22/places/Makefile data/icons/default/icons/22x22/status/Makefile data/icons/default/icons/48x48/Makefile data/icons/default/icons/48x48/actions/Makefile data/icons/default/icons/48x48/apps/Makefile data/icons/default/icons/48x48/categories/Makefile data/icons/default/icons/48x48/devices/Makefile data/icons/default/icons/48x48/emblems/Makefile data/icons/default/icons/48x48/emotes/Makefile data/icons/default/icons/48x48/mimetypes/Makefile data/icons/default/icons/48x48/places/Makefile data/icons/default/icons/48x48/status/Makefile data/icons/default/Makefile po/Makefile intl/Makefile debian/changelog"
-+ac_config_files="$ac_config_files Makefile etk.spec etk.pc src/Makefile src/lib/Makefile src/engines/Makefile src/engines/ecore_evas/Makefile src/engines/ecore_evas_x11/Makefile src/engines/ecore_evas_software_x11/Makefile src/engines/ecore_evas_software_x11_16/Makefile src/engines/ecore_evas_gl_x11/Makefile src/engines/ecore_fb/Makefile src/bin/Makefile src/tools/Makefile src/tools/etk_prefs/Makefile data/Makefile data/themes/Makefile data/themes/default/Makefile data/themes/default/widgets/Makefile data/themes/default/fonts/Makefile data/themes/default/images/Makefile data/themes/default/macros/Makefile data/wm/Makefile data/wm/default/Makefile data/wm/default/fonts/Makefile data/wm/default/images/Makefile data/fonts/Makefile data/images/Makefile data/icons/Makefile data/icons/default/icons/Makefile data/icons/default/icons/16x16/Makefile data/icons/default/icons/16x16/actions/Makefile data/icons/default/icons/16x16/apps/Makefile data/icons/default/icons/16x16/categories/Makefile data/icons/default/icons/16x16/devices/Makefile data/icons/default/icons/16x16/emblems/Makefile data/icons/default/icons/16x16/emotes/Makefile data/icons/default/icons/16x16/mimetypes/Makefile data/icons/default/icons/16x16/places/Makefile data/icons/default/icons/16x16/status/Makefile data/icons/default/icons/22x22/Makefile data/icons/default/icons/22x22/actions/Makefile data/icons/default/icons/22x22/apps/Makefile data/icons/default/icons/22x22/categories/Makefile data/icons/default/icons/22x22/devices/Makefile data/icons/default/icons/22x22/emblems/Makefile data/icons/default/icons/22x22/emotes/Makefile data/icons/default/icons/22x22/mimetypes/Makefile data/icons/default/icons/22x22/places/Makefile data/icons/default/icons/22x22/status/Makefile data/icons/default/icons/48x48/Makefile data/icons/default/icons/48x48/actions/Makefile data/icons/default/icons/48x48/apps/Makefile data/icons/default/icons/48x48/categories/Makefile data/icons/default/icons/48x48/devices/Makefile data/icons/default/icons/48x48/emblems/Makefile data/icons/default/icons/48x48/emotes/Makefile data/icons/default/icons/48x48/mimetypes/Makefile data/icons/default/icons/48x48/places/Makefile data/icons/default/icons/48x48/status/Makefile data/icons/default/Makefile po/Makefile intl/Makefile"
+-ac_config_files="$ac_config_files Makefile etk.spec etk.pc src/Makefile src/lib/Makefile src/engines/Makefile src/engines/ecore_evas/Makefile src/engines/ecore_evas_x11/Makefile src/engines/ecore_evas_software_x11/Makefile src/engines/ecore_evas_software_x11_16/Makefile src/engines/ecore_evas_gl_x11/Makefile src/engines/ecore_fb/Makefile src/bin/Makefile src/tools/Makefile src/tools/etk_prefs/Makefile data/Makefile data/themes/Makefile data/themes/default/Makefile data/themes/default/widgets/Makefile data/themes/default/fonts/Makefile data/themes/default/images/Makefile data/themes/default/macros/Makefile data/wm/Makefile data/wm/default/Makefile data/wm/default/fonts/Makefile data/wm/default/images/Makefile data/test/Makefile data/test/clock/Makefile data/fonts/Makefile data/images/Makefile data/icons/Makefile data/icons/default/icons/Makefile data/icons/default/icons/16x16/Makefile data/icons/default/icons/16x16/actions/Makefile data/icons/default/icons/16x16/apps/Makefile data/icons/default/icons/16x16/categories/Makefile data/icons/default/icons/16x16/devices/Makefile data/icons/default/icons/16x16/emblems/Makefile data/icons/default/icons/16x16/emotes/Makefile data/icons/default/icons/16x16/mimetypes/Makefile data/icons/default/icons/16x16/places/Makefile data/icons/default/icons/16x16/status/Makefile data/icons/default/icons/22x22/Makefile data/icons/default/icons/22x22/actions/Makefile data/icons/default/icons/22x22/apps/Makefile data/icons/default/icons/22x22/categories/Makefile data/icons/default/icons/22x22/devices/Makefile data/icons/default/icons/22x22/emblems/Makefile data/icons/default/icons/22x22/emotes/Makefile data/icons/default/icons/22x22/mimetypes/Makefile data/icons/default/icons/22x22/places/Makefile data/icons/default/icons/22x22/status/Makefile data/icons/default/icons/48x48/Makefile data/icons/default/icons/48x48/actions/Makefile data/icons/default/icons/48x48/apps/Makefile data/icons/default/icons/48x48/categories/Makefile data/icons/default/icons/48x48/devices/Makefile data/icons/default/icons/48x48/emblems/Makefile data/icons/default/icons/48x48/emotes/Makefile data/icons/default/icons/48x48/mimetypes/Makefile data/icons/default/icons/48x48/places/Makefile data/icons/default/icons/48x48/status/Makefile data/icons/default/Makefile po/Makefile intl/Makefile debian/changelog"
++ac_config_files="$ac_config_files Makefile etk.spec etk.pc src/Makefile src/lib/Makefile src/engines/Makefile src/engines/ecore_evas/Makefile src/engines/ecore_evas_x11/Makefile src/engines/ecore_evas_software_x11/Makefile src/engines/ecore_evas_software_x11_16/Makefile src/engines/ecore_evas_gl_x11/Makefile src/engines/ecore_fb/Makefile src/bin/Makefile src/tools/Makefile src/tools/etk_prefs/Makefile data/Makefile data/themes/Makefile data/themes/default/Makefile data/themes/default/widgets/Makefile data/themes/default/fonts/Makefile data/themes/default/images/Makefile data/themes/default/macros/Makefile data/wm/Makefile data/wm/default/Makefile data/wm/default/fonts/Makefile data/wm/default/images/Makefile data/test/Makefile data/test/clock/Makefile data/fonts/Makefile data/images/Makefile data/icons/Makefile data/icons/default/icons/Makefile data/icons/default/icons/16x16/Makefile data/icons/default/icons/16x16/actions/Makefile data/icons/default/icons/16x16/apps/Makefile data/icons/default/icons/16x16/categories/Makefile data/icons/default/icons/16x16/devices/Makefile data/icons/default/icons/16x16/emblems/Makefile data/icons/default/icons/16x16/emotes/Makefile data/icons/default/icons/16x16/mimetypes/Makefile data/icons/default/icons/16x16/places/Makefile data/icons/default/icons/16x16/status/Makefile data/icons/default/icons/22x22/Makefile data/icons/default/icons/22x22/actions/Makefile data/icons/default/icons/22x22/apps/Makefile data/icons/default/icons/22x22/categories/Makefile data/icons/default/icons/22x22/devices/Makefile data/icons/default/icons/22x22/emblems/Makefile data/icons/default/icons/22x22/emotes/Makefile data/icons/default/icons/22x22/mimetypes/Makefile data/icons/default/icons/22x22/places/Makefile data/icons/default/icons/22x22/status/Makefile data/icons/default/icons/48x48/Makefile data/icons/default/icons/48x48/actions/Makefile data/icons/default/icons/48x48/apps/Makefile data/icons/default/icons/48x48/categories/Makefile data/icons/default/icons/48x48/devices/Makefile data/icons/default/icons/48x48/emblems/Makefile data/icons/default/icons/48x48/emotes/Makefile data/icons/default/icons/48x48/mimetypes/Makefile data/icons/default/icons/48x48/places/Makefile data/icons/default/icons/48x48/status/Makefile data/icons/default/Makefile po/Makefile intl/Makefile"
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -24512,7 +24512,6 @@ do
+@@ -24514,7 +24514,6 @@ do
      "data/icons/default/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/default/Makefile" ;;
      "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
      "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
@@ -111,9 +111,9 @@ diff -upNr etk/configure etk.new/configure
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
 diff -upNr etk/configure.in etk.new/configure.in
---- etk/configure.in	2008-02-18 21:01:09.000000000 -0200
-+++ etk.new/configure.in	2008-02-18 21:00:00.000000000 -0200
-@@ -228,7 +228,6 @@ data/icons/default/icons/48x48/status/Ma
+--- etk/configure.in	2008-05-05 16:45:30.000000000 -0300
++++ etk.new/configure.in	2008-05-08 16:03:08.000000000 -0300
+@@ -230,7 +230,6 @@ data/icons/default/icons/48x48/status/Ma
  data/icons/default/Makefile
  po/Makefile
  intl/Makefile