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

   1 diff -upNr imlib2.old/Makefile.am imlib2.new/Makefile.am
   2 --- imlib2.old/Makefile.am      2007-12-10 21:58:54.000000000 -0200
   3 +++ imlib2.new/Makefile.am      2007-12-10 22:00:35.000000000 -0200
   4 @@ -9,8 +9,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
   5                        imlib2_docs.tar.gz imlib2.c \
   6                        README \
   7                        imlib2.pc \
   8 -                      imlib2.spec \
   9 -                      debian/changelog
  10 +                      imlib2.spec
  11
  12  bin_SCRIPTS = imlib2-config
  13
  14 @@ -18,18 +17,7 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLA
  15               Doxyfile \
  16              README.in README \
  17              imlib2.pc.in \
  18 -            imlib2.spec.in imlib2.spec \
  19 -            debian/changelog \
  20 -            debian/changelog.in \
  21 -            debian/control \
  22 -            debian/copyright \
  23 -            debian/imlib2-config.1 \
  24 -            debian/imlib2-demo.install \
  25 -            debian/imlib2-test.install \
  26 -            debian/libimlib2-dev.doc-base \
  27 -            debian/libimlib2-dev.install \
  28 -            debian/libimlib2.install \
  29 -            debian/rules
  30 +            imlib2.spec.in imlib2.spec
  31
  32  pkgconfigdir = $(libdir)/pkgconfig
  33  pkgconfig_DATA = imlib2.pc
  34 diff -upNr imlib2.old/Makefile.in imlib2.new/Makefile.in
  35 --- imlib2.old/Makefile.in      2007-12-10 21:59:52.000000000 -0200
  36 +++ imlib2.new/Makefile.in      2007-12-10 22:01:00.000000000 -0200
  37 @@ -40,9 +40,9 @@ DIST_COMMON = README $(am__configure_dep
  38         $(srcdir)/Makefile.in $(srcdir)/README.in \
  39         $(srcdir)/config.h.in $(srcdir)/imlib2-config.in \
  40         $(srcdir)/imlib2.pc.in $(srcdir)/imlib2.spec.in \
  41 -       $(top_srcdir)/configure $(top_srcdir)/debian/changelog.in \
  42 -       AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \
  43 -       config.sub depcomp install-sh ltmain.sh missing
  44 +       $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
  45 +       TODO config.guess config.sub depcomp install-sh ltmain.sh \
  46 +       missing
  47  subdir = .
  48  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  49  am__aclocal_m4_deps = $(top_srcdir)/configure.in
  50 @@ -52,8 +52,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
  51   configure.lineno configure.status.lineno
  52  mkinstalldirs = $(mkdir_p)
  53  CONFIG_HEADER = config.h
  54 -CONFIG_CLEAN_FILES = imlib2.pc imlib2-config README imlib2.spec \
  55 -       debian/changelog
  56 +CONFIG_CLEAN_FILES = imlib2.pc imlib2-config README imlib2.spec
  57  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"
  58  binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  59  SCRIPTS = $(bin_SCRIPTS)
  60 @@ -213,26 +212,14 @@ MAINTAINERCLEANFILES = Makefile.in acloc
  61                        imlib2_docs.tar.gz imlib2.c \
  62                        README \
  63                        imlib2.pc \
  64 -                      imlib2.spec \
  65 -                      debian/changelog
  66 +                      imlib2.spec
  67
  68  bin_SCRIPTS = imlib2-config
  69  EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN gendoc \
  70               Doxyfile \
  71              README.in README \
  72              imlib2.pc.in \
  73 -            imlib2.spec.in imlib2.spec \
  74 -            debian/changelog \
  75 -            debian/changelog.in \
  76 -            debian/control \
  77 -            debian/copyright \
  78 -            debian/imlib2-config.1 \
  79 -            debian/imlib2-demo.install \
  80 -            debian/imlib2-test.install \
  81 -            debian/libimlib2-dev.doc-base \
  82 -            debian/libimlib2-dev.install \
  83 -            debian/libimlib2.install \
  84 -            debian/rules
  85 +            imlib2.spec.in imlib2.spec
  86
  87  pkgconfigdir = $(libdir)/pkgconfig
  88  pkgconfig_DATA = imlib2.pc
  89 @@ -298,8 +285,6 @@ README: $(top_builddir)/config.status $(
  90         cd $(top_builddir) && $(SHELL) ./config.status $@
  91  imlib2.spec: $(top_builddir)/config.status $(srcdir)/imlib2.spec.in
  92         cd $(top_builddir) && $(SHELL) ./config.status $@
  93 -debian/changelog: $(top_builddir)/config.status $(top_srcdir)/debian/changelog.in
  94 -       cd $(top_builddir) && $(SHELL) ./config.status $@
  95  install-binSCRIPTS: $(bin_SCRIPTS)
  96         @$(NORMAL_INSTALL)
  97         test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
  98 @@ -470,7 +455,7 @@ distclean-tags:
  99  distdir: $(DISTFILES)
 100         $(am__remove_distdir)
 101         mkdir $(distdir)
 102 -       $(mkdir_p) $(distdir)/. $(distdir)/debian
 103 +       $(mkdir_p) $(distdir)/.
 104         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 105         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 106         list='$(DISTFILES)'; for file in $$list; do \
 107 diff -upNr imlib2.old/configure imlib2.new/configure
 108 --- imlib2.old/configure        2007-12-10 21:59:43.000000000 -0200
 109 +++ imlib2.new/configure        2007-12-10 22:00:51.000000000 -0200
 110 @@ -24340,7 +24340,7 @@ if test "x$enable_visibility_hiding" = x
 111    CPPFLAGS="$CPPFLAGS -fvisibility=hidden"
 112  fi
 113
 114 -                                                                                                                                                                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"
 115 +                                                                                                                                                      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"
 116            ac_config_commands="$ac_config_commands default"
 117  cat >confcache <<\_ACEOF
 118  # This file is a shell script that caches the results of configure
 119 @@ -24983,7 +24983,6 @@ do
 120    "imlib2-config" ) CONFIG_FILES="$CONFIG_FILES imlib2-config" ;;
 121    "README" ) CONFIG_FILES="$CONFIG_FILES README" ;;
 122    "imlib2.spec" ) CONFIG_FILES="$CONFIG_FILES imlib2.spec" ;;
 123 -  "debian/changelog" ) CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
 124    "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
 125    "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 126    "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
 127 diff -upNr imlib2.old/configure.in imlib2.new/configure.in
 128 --- imlib2.old/configure.in     2007-12-10 21:58:54.000000000 -0200
 129 +++ imlib2.new/configure.in     2007-12-10 22:00:22.000000000 -0200
 130 @@ -583,7 +583,6 @@ doc/Makefile
 131  imlib2-config
 132  README
 133  imlib2.spec
 134 -debian/changelog
 135  ],[
 136  chmod +x imlib2-config
 137  ])