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

   1 Files imlib2/.git/index and /tmp/imlib2/.git/index differ
   2 diff -upNr imlib2/Makefile.am /tmp/imlib2/Makefile.am
   3 --- imlib2/Makefile.am  2008-02-18 18:13:44.000000000 -0200
   4 +++ imlib2/Makefile.am  2008-02-18 18:12:36.000000000 -0200
   5 @@ -9,8 +9,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
   6                        imlib2_docs.tar.gz imlib2.c \
   7                        README \
   8                        imlib2.pc \
   9 -                      imlib2.spec \
  10 -                      debian/changelog
  11 +                      imlib2.spec
  12
  13  bin_SCRIPTS = imlib2-config
  14
  15 @@ -18,18 +17,7 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLA
  16               Doxyfile \
  17              README.in README \
  18              imlib2.pc.in \
  19 -            imlib2.spec.in imlib2.spec \
  20 -            debian/changelog \
  21 -            debian/changelog.in \
  22 -            debian/control \
  23 -            debian/copyright \
  24 -            debian/imlib2-config.1 \
  25 -            debian/imlib2-demo.install \
  26 -            debian/imlib2-test.install \
  27 -            debian/libimlib2-dev.doc-base \
  28 -            debian/libimlib2-dev.install \
  29 -            debian/libimlib2.install \
  30 -            debian/rules
  31 +            imlib2.spec.in imlib2.spec
  32
  33  pkgconfigdir = $(libdir)/pkgconfig
  34  pkgconfig_DATA = imlib2.pc
  35 diff -upNr imlib2/Makefile.in /tmp/imlib2/Makefile.in
  36 --- imlib2/Makefile.in  2008-02-18 18:14:10.000000000 -0200
  37 +++ imlib2/Makefile.in  2008-02-18 18:13:15.000000000 -0200
  38 @@ -38,9 +38,9 @@ DIST_COMMON = README $(am__configure_dep
  39         $(srcdir)/Makefile.in $(srcdir)/README.in \
  40         $(srcdir)/config.h.in $(srcdir)/imlib2-config.in \
  41         $(srcdir)/imlib2.pc.in $(srcdir)/imlib2.spec.in \
  42 -       $(top_srcdir)/configure $(top_srcdir)/debian/changelog.in \
  43 -       AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \
  44 -       config.sub depcomp install-sh ltmain.sh missing
  45 +       $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
  46 +       TODO config.guess config.sub depcomp install-sh ltmain.sh \
  47 +       missing
  48  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  49  am__aclocal_m4_deps = $(top_srcdir)/configure.in
  50  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  51 @@ -49,8 +49,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
  52   configure.lineno config.status.lineno
  53  mkinstalldirs = $(install_sh) -d
  54  CONFIG_HEADER = config.h
  55 -CONFIG_CLEAN_FILES = imlib2.pc imlib2-config README imlib2.spec \
  56 -       debian/changelog
  57 +CONFIG_CLEAN_FILES = imlib2.pc imlib2-config README imlib2.spec
  58  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"
  59  binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  60  SCRIPTS = $(bin_SCRIPTS)
  61 @@ -214,26 +213,14 @@ MAINTAINERCLEANFILES = Makefile.in acloc
  62                        imlib2_docs.tar.gz imlib2.c \
  63                        README \
  64                        imlib2.pc \
  65 -                      imlib2.spec \
  66 -                      debian/changelog
  67 +                      imlib2.spec
  68
  69  bin_SCRIPTS = imlib2-config
  70  EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN gendoc \
  71               Doxyfile \
  72              README.in README \
  73              imlib2.pc.in \
  74 -            imlib2.spec.in imlib2.spec \
  75 -            debian/changelog \
  76 -            debian/changelog.in \
  77 -            debian/control \
  78 -            debian/copyright \
  79 -            debian/imlib2-config.1 \
  80 -            debian/imlib2-demo.install \
  81 -            debian/imlib2-test.install \
  82 -            debian/libimlib2-dev.doc-base \
  83 -            debian/libimlib2-dev.install \
  84 -            debian/libimlib2.install \
  85 -            debian/rules
  86 +            imlib2.spec.in imlib2.spec
  87
  88  pkgconfigdir = $(libdir)/pkgconfig
  89  pkgconfig_DATA = imlib2.pc
  90 @@ -299,8 +286,6 @@ README: $(top_builddir)/config.status $(
  91         cd $(top_builddir) && $(SHELL) ./config.status $@
  92  imlib2.spec: $(top_builddir)/config.status $(srcdir)/imlib2.spec.in
  93         cd $(top_builddir) && $(SHELL) ./config.status $@
  94 -debian/changelog: $(top_builddir)/config.status $(top_srcdir)/debian/changelog.in
  95 -       cd $(top_builddir) && $(SHELL) ./config.status $@
  96  install-binSCRIPTS: $(bin_SCRIPTS)
  97         @$(NORMAL_INSTALL)
  98         test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
  99 diff -upNr imlib2/configure /tmp/imlib2/configure
 100 --- imlib2/configure    2008-02-18 18:14:07.000000000 -0200
 101 +++ imlib2/configure    2008-02-18 18:13:11.000000000 -0200
 102 @@ -24303,7 +24303,7 @@ if test "x$enable_visibility_hiding" = x
 103    CPPFLAGS="$CPPFLAGS -fvisibility=hidden"
 104  fi
 105
 106 -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"
 107 +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"
 108
 109  ac_config_commands="$ac_config_commands default"
 110
 111 @@ -24985,7 +24985,6 @@ do
 112      "imlib2-config") CONFIG_FILES="$CONFIG_FILES imlib2-config" ;;
 113      "README") CONFIG_FILES="$CONFIG_FILES README" ;;
 114      "imlib2.spec") CONFIG_FILES="$CONFIG_FILES imlib2.spec" ;;
 115 -    "debian/changelog") CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
 116      "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 117
 118    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 119 diff -upNr imlib2/configure.in /tmp/imlib2/configure.in
 120 --- imlib2/configure.in 2008-02-18 18:13:44.000000000 -0200
 121 +++ imlib2/configure.in 2008-02-18 18:12:36.000000000 -0200
 122 @@ -586,7 +586,6 @@ doc/Makefile
 123  imlib2-config
 124  README
 125  imlib2.spec
 126 -debian/changelog
 127  ],[
 128  chmod +x imlib2-config
 129  ])