Updated etk package
[maemo-efl] / trunk / etk / debian / patches / 01_dont_overwrite_changelog.diff
index 33193e1..a915144 100644 (file)
@@ -1,7 +1,7 @@
-diff -upNr etk.old/Makefile.am etk.new/Makefile.am
---- etk.old/Makefile.am        2007-12-10 22:53:37.000000000 -0200
-+++ etk.new/Makefile.am        2007-12-10 22:53:37.000000000 -0200
-@@ -7,8 +7,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+diff -upNr etk/Makefile.am etk.new/Makefile.am
+--- 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 \
                etk_docs.tar.gz \
@@ -11,7 +11,7 @@ diff -upNr etk.old/Makefile.am etk.new/Makefile.am
  
  bin_SCRIPTS = 
  
-@@ -21,15 +20,7 @@ README \
+@@ -23,15 +22,7 @@ README \
  ABOUT-NLS \
  etk.pc.in \
  etk.spec.in \
@@ -28,10 +28,10 @@ diff -upNr etk.old/Makefile.am etk.new/Makefile.am
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = etk.pc
-diff -upNr etk.old/Makefile.in etk.new/Makefile.in
---- etk.old/Makefile.in        2007-12-10 22:54:30.000000000 -0200
-+++ etk.new/Makefile.in        2007-12-10 22:56:43.000000000 -0200
-@@ -39,10 +39,9 @@ host_triplet = @host@
+diff -upNr etk/Makefile.in etk.new/Makefile.in
+--- 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 \
        $(srcdir)/etk.pc.in $(srcdir)/etk.spec.in \
@@ -42,11 +42,11 @@ diff -upNr etk.old/Makefile.in etk.new/Makefile.in
 +      $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
 +      INSTALL NEWS TODO config.guess config.rpath config.sub depcomp \
 +      install-sh ltmain.sh missing mkinstalldirs
- subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-@@ -57,7 +56,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
-  configure.lineno configure.status.lineno
+       $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+@@ -54,7 +53,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+  configure.lineno config.status.lineno
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
 -CONFIG_CLEAN_FILES = etk.spec etk.pc debian/changelog
@@ -54,7 +54,7 @@ diff -upNr etk.old/Makefile.in etk.new/Makefile.in
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"
  binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  SCRIPTS = $(bin_SCRIPTS)
-@@ -215,8 +214,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+@@ -230,8 +229,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
                ltconfig ltmain.sh missing mkinstalldirs \
                stamp-h.in build-stamp configure-stamp depcomp \
                etk_docs.tar.gz \
@@ -64,7 +64,7 @@ diff -upNr etk.old/Makefile.in etk.new/Makefile.in
  
  bin_SCRIPTS = 
  EXTRA_DIST = \
-@@ -228,15 +226,7 @@ README \
+@@ -243,15 +241,7 @@ README \
  ABOUT-NLS \
  etk.pc.in \
  etk.spec.in \
@@ -81,7 +81,7 @@ diff -upNr etk.old/Makefile.in etk.new/Makefile.in
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = etk.pc
-@@ -299,8 +289,6 @@ etk.spec: $(top_builddir)/config.status 
+@@ -313,8 +303,6 @@ etk.spec: $(top_builddir)/config.status 
        cd $(top_builddir) && $(SHELL) ./config.status $@
  etk.pc: $(top_builddir)/config.status $(srcdir)/etk.pc.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -89,40 +89,31 @@ diff -upNr etk.old/Makefile.in etk.new/Makefile.in
 -      cd $(top_builddir) && $(SHELL) ./config.status $@
  install-binSCRIPTS: $(bin_SCRIPTS)
        @$(NORMAL_INSTALL)
-       test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-@@ -471,7 +459,7 @@ distclean-tags:
- distdir: $(DISTFILES)
-       $(am__remove_distdir)
-       mkdir $(distdir)
--      $(mkdir_p) $(distdir)/. $(distdir)/debian $(distdir)/m4
-+      $(mkdir_p) $(distdir)/. $(distdir)/m4
-       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-       list='$(DISTFILES)'; for file in $$list; do \
-diff -upNr etk.old/configure etk.new/configure
---- etk.old/configure  2007-12-10 22:54:10.000000000 -0200
-+++ etk.new/configure  2007-12-10 22:56:23.000000000 -0200
-@@ -23867,7 +23867,7 @@ _ACEOF
+       test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+diff -upNr etk/configure etk.new/configure
+--- 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
- # tests run on this system so they can be shared between configure
-@@ -24508,7 +24508,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" ;;
--  "debian/changelog" ) CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
-   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-diff -upNr etk.old/configure.in etk.new/configure.in
---- etk.old/configure.in       2007-12-10 22:53:37.000000000 -0200
-+++ etk.new/configure.in       2007-12-10 22:53:37.000000000 -0200
-@@ -225,7 +225,6 @@ data/icons/default/icons/48x48/status/Ma
+@@ -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" ;;
+-    "debian/changelog") CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
+   *) { { 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-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