vcs.maemo.org Git - maemo-efl/blob - trunk/imlib2/debian/patches/01_dont_overwrite_changelog.diff

   1 diff -upr imlib2/Makefile.am imlib2.new/Makefile.am
   2 --- imlib2/Makefile.am  2008-05-14 10:30:21.000000000 -0300
   3 +++ imlib2.new/Makefile.am      2008-05-14 14:27:35.000000000 -0300
   4 @@ -12,18 +12,7 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLA
   5               Doxyfile \
   6              README.in README \
   7              imlib2.pc.in \
   8 -            imlib2.spec.in imlib2.spec \
   9 -            debian/changelog \
  10 -            debian/changelog.in \
  11 -            debian/control \
  12 -            debian/copyright \
  13 -            debian/imlib2-config.1 \
  14 -            debian/imlib2-demo.install \
  15 -            debian/imlib2-test.install \
  16 -            debian/libimlib2-dev.doc-base \
  17 -            debian/libimlib2-dev.install \
  18 -            debian/libimlib2.install \
  19 -            debian/rules
  20 +            imlib2.spec.in imlib2.spec
  21
  22  pkgconfigdir = $(libdir)/pkgconfig
  23  pkgconfig_DATA = imlib2.pc
  24 diff -upr imlib2/Makefile.in imlib2.new/Makefile.in
  25 --- imlib2/Makefile.in  2008-05-14 14:11:13.000000000 -0300
  26 +++ imlib2.new/Makefile.in      2008-05-14 14:27:53.000000000 -0300
  27 @@ -38,9 +38,9 @@ DIST_COMMON = README $(am__configure_dep
  28         $(srcdir)/Makefile.in $(srcdir)/README.in \
  29         $(srcdir)/config.h.in $(srcdir)/imlib2-config.in \
  30         $(srcdir)/imlib2.pc.in $(srcdir)/imlib2.spec.in \
  31 -       $(top_srcdir)/configure $(top_srcdir)/debian/changelog.in \
  32 -       AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \
  33 -       config.sub depcomp install-sh ltmain.sh missing
  34 +       $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
  35 +       TODO config.guess config.sub depcomp install-sh ltmain.sh \
  36 +       missing
  37  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  38  am__aclocal_m4_deps = $(top_srcdir)/configure.in
  39  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  40 @@ -49,8 +49,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
  41   configure.lineno config.status.lineno
  42  mkinstalldirs = $(install_sh) -d
  43  CONFIG_HEADER = config.h
  44 -CONFIG_CLEAN_FILES = imlib2.pc imlib2-config README imlib2.spec \
  45 -       debian/changelog
  46 +CONFIG_CLEAN_FILES = imlib2.pc imlib2-config README imlib2.spec
  47  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"
  48  binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  49  SCRIPTS = $(bin_SCRIPTS)
  50 @@ -216,18 +215,7 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLA
  51               Doxyfile \
  52              README.in README \
  53              imlib2.pc.in \
  54 -            imlib2.spec.in imlib2.spec \
  55 -            debian/changelog \
  56 -            debian/changelog.in \
  57 -            debian/control \
  58 -            debian/copyright \
  59 -            debian/imlib2-config.1 \
  60 -            debian/imlib2-demo.install \
  61 -            debian/imlib2-test.install \
  62 -            debian/libimlib2-dev.doc-base \
  63 -            debian/libimlib2-dev.install \
  64 -            debian/libimlib2.install \
  65 -            debian/rules
  66 +            imlib2.spec.in imlib2.spec
  67
  68  pkgconfigdir = $(libdir)/pkgconfig
  69  pkgconfig_DATA = imlib2.pc
  70 @@ -293,8 +281,6 @@ README: $(top_builddir)/config.status $(
  71         cd $(top_builddir) && $(SHELL) ./config.status $@
  72  imlib2.spec: $(top_builddir)/config.status $(srcdir)/imlib2.spec.in
  73         cd $(top_builddir) && $(SHELL) ./config.status $@
  74 -debian/changelog: $(top_builddir)/config.status $(top_srcdir)/debian/changelog.in
  75 -       cd $(top_builddir) && $(SHELL) ./config.status $@
  76  install-binSCRIPTS: $(bin_SCRIPTS)
  77         @$(NORMAL_INSTALL)
  78         test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
  79 diff -upr imlib2/configure imlib2.new/configure
  80 --- imlib2/configure    2008-05-14 14:11:10.000000000 -0300
  81 +++ imlib2.new/configure        2008-05-14 14:27:50.000000000 -0300
  82 @@ -18613,7 +18613,7 @@ if test "x$enable_visibility_hiding" = x
  83    CPPFLAGS="$CPPFLAGS -fvisibility=hidden"
  84  fi
  85
  86 -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"
  87 +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"
  88
  89  ac_config_commands="$ac_config_commands default"
  90
  91 @@ -19288,7 +19288,6 @@ do
  92      "imlib2-config") CONFIG_FILES="$CONFIG_FILES imlib2-config" ;;
  93      "README") CONFIG_FILES="$CONFIG_FILES README" ;;
  94      "imlib2.spec") CONFIG_FILES="$CONFIG_FILES imlib2.spec" ;;
  95 -    "debian/changelog") CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
  96      "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
  97
  98    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  99 diff -upr imlib2/configure.in imlib2.new/configure.in
 100 --- imlib2/configure.in 2008-05-14 10:30:21.000000000 -0300
 101 +++ imlib2.new/configure.in     2008-05-14 14:27:24.000000000 -0300
 102 @@ -530,7 +530,6 @@ doc/Makefile
 103  imlib2-config
 104  README
 105  imlib2.spec
 106 -debian/changelog
 107  ],[
 108  chmod +x imlib2-config
 109  ])