[Pkg-e-commits] [SCM] Enlightenment DR17 graphical layout and animation library branch, master, updated. debian/0.9.9.050-1.1-3-g522d72d
Albin Tonnerre
albin.tonnerre at gmail.com
Sat Dec 20 20:29:44 UTC 2008
The following commit has been merged in the master branch:
commit 522d72dc8b6871ea636832d5c5116dc29fc82391
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date: Sun Dec 7 14:09:02 2008 +0100
new upstream snapshot. Lots of packaging changes/updates, see debian/changelog for further details
diff --git a/debian/changelog b/debian/changelog
index 9206cca..1041ef2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+edje (0.9.9.050+svn20081206-1) experimental; urgency=low
+
+ * Upstream SVN snapshot
+ - Packages renamed due to API changes
+ + libedje-dev->libedje-0.9.9.050a-dev, libedje0->libedje-0.9.9.050a
+ - Add debian/patches/{01-fix-library-soname,02-reapply-autofoo}: Use release
+ instead of version-info to create libedje SONAME, to prevent things
+ from breaking when the ABI changes again.
+ - Build-depend and make libedje-0.9.9.050a-dev depend on libeina-0.0.1a-dev
+ * [lintian] Add ${misc:Depends} to package dependencies
+ * [lintian] Fix some escapes in debian/edje_cc.1 and debian/edje_recc.1
+ * Update Standards-Version to 3.8.0
+
+ -- Albin Tonnerre <albin.tonnerre at gmail.com> Sat, 20 Dec 2008 21:18:58 +0100
+
edje (0.9.9.050-1.1) experimental; urgency=low
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index e16cbfb..9dd430e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Priority: optional
Maintainer: Debian Pkg-e Team <pkg-e-devel at lists.alioth.debian.org>
Uploaders: Albin Tonnerre <albin.tonnerre at gmail.com>,
Xavier Oswald <x.oswald at free.fr>, Jan Lübbe <jluebbe at debian.org>
-Build-Depends: debhelper (>= 6), cdbs, quilt, libeet-dev, libevas-dev (>= 0.9.9.050),
- libecore-dev, libembryo-dev, doxygen
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 6), cdbs, quilt, libeet-dev, libevas-0.9.9.050a-dev,
+ libecore-0.9.9.050a-dev, libembryo-dev, libeina-0.0.1a-dev, doxygen
+Standards-Version: 3.8.0
Vcs-Git: git://git.debian.org/pkg-e/libs/edje.git
Vcs-Browser: http://git.debian.org/?p=pkg-e/libs/edje.git
Homepage: http://enlightenment.org
@@ -14,7 +14,7 @@ Homepage: http://enlightenment.org
Package: libedje-bin
Architecture: any
Section: devel
-Depends: ${shlibs:Depends}, libembryo-bin, libevas-engines
+Depends: ${misc:Depends}, ${shlibs:Depends}, libembryo-bin, libevas-0.9.9.050a-engines
Description: Various binaries for use with libedje
Edje is a graphical layout and animation library for animated resizable,
compressed and scalable themes. It is the theming engine behind
@@ -25,9 +25,9 @@ Description: Various binaries for use with libedje
- edje_decc: Used to decompile compiled edje files.
- edje_recc: A convenience script to recompile EDC files.
-Package: libedje0
+Package: libedje-0.9.9.050a
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: libedje-bin (= ${binary:Version})
Description: Graphical layout and animation library
Edje is a graphical layout and animation library for animated resizable,
@@ -45,10 +45,13 @@ Description: libedje0 development documentation
.
This package provides development documentation for Edje.
-Package: libedje-dev
+Package: libedje-0.9.9.050a-dev
Architecture: any
Section: libdevel
-Depends: libedje0 (= ${binary:Version}), libeet-dev, libevas-dev, libecore-dev, libembryo-dev, pkg-config
+Provides: libedje-dev
+Conflicts: libedje-dev
+Depends: ${misc:Depends}, libedje-0.9.9.050a (= ${binary:Version}), libeet-dev, libembryo-dev,
+ libevas-0.9.9.050a-dev, libecore-0.9.9.050a-dev, libeina-0.0.1a-dev, pkg-config
Description: libedje headers and static libraries
Edje is a graphical layout and animation library for animated resizable,
compressed and scalable themes. It is the theming engine behind
@@ -60,7 +63,7 @@ Package: libedje-dbg
Architecture: any
Section: libdevel
Priority: extra
-Depends: libedje0 (= ${binary:Version})
+Depends: ${misc:Depends}, libedje-0.9.9.050a (= ${binary:Version})
Description: Graphical layout and animation library
Edje is a graphical layout and animation library for animated resizable,
compressed and scalable themes. It is the theming engine behind
diff --git a/debian/edje_cc.1 b/debian/edje_cc.1
index 62f8685..b02fa89 100644
--- a/debian/edje_cc.1
+++ b/debian/edje_cc.1
@@ -9,7 +9,7 @@ edje_cc - an edje compiler
.SH DESCRIPTION
edje_cc is a compiler for edje files
.SH EXAMPLES
-edje_cc -v file.edc
+edje_cc \-v file.edc
.SH OPTIONS
.BI \-id " \|image/directory
Add a directory to look in for relative path images
diff --git a/debian/edje_recc.1 b/debian/edje_recc.1
index 985118d..71f4a52 100644
--- a/debian/edje_recc.1
+++ b/debian/edje_recc.1
@@ -1,6 +1,6 @@
.TH EDJE_RECC 1 "Jan 30, 2007" "0.5.0.042" "The edje recompiler"
.SH NAME
-edje_recc \- an edje recompiler
+edje_recc - an edje recompiler
.SH SYNOPSIS
.B edje_recc
.RI [\| OPTIONS \|]
@@ -8,24 +8,24 @@ edje_recc \- an edje recompiler
.SH DESCRIPTION
edje_recc is a recompiler for edje files.
.SH EXAMPLES
-edje_recc -v file.edj
+edje_recc \-v file.edj
.SH OPTIONS
-.B -v
+.B \-v
Verbose output
.P
-.B -no-lossy
+.B \-no\-lossy
Do NOT allow images to be lossy
.P
-.B -no-comp
+.B \-no\-comp
Do NOT allow images to be stored with lossless compression
.P
-.B -no-raw
+.B \-no\-raw
Do NOT allow images to be stored with zero compression (raw)
.P
-.BI -min-quality " \|VAL
+.BI \-min\-quality " \|VAL
Do NOT allow lossy images with quality < VAL (0-100)
.P
-.BI -max-quality " \|VAL
+.BI \-max\-quality " \|VAL
Do NOT allow lossy images with quality > VAL (0-100)
.SH SEE ALSO
edje_cc(1)
diff --git a/debian/libedje-dev.install b/debian/libedje-0.9.9.050a-dev.install
similarity index 73%
rename from debian/libedje-dev.install
rename to debian/libedje-0.9.9.050a-dev.install
index 33c14b5..4ce6cc8 100644
--- a/debian/libedje-dev.install
+++ b/debian/libedje-0.9.9.050a-dev.install
@@ -1,4 +1,4 @@
debian/tmp/usr/include/*
debian/tmp/usr/lib/lib*.a
-debian/tmp/usr/lib/lib*.so
+debian/tmp/usr/lib/libedje.so
debian/tmp/usr/lib/pkgconfig/*
diff --git a/debian/libedje-0.9.9.050a.install b/debian/libedje-0.9.9.050a.install
new file mode 100644
index 0000000..3fcc8c2
--- /dev/null
+++ b/debian/libedje-0.9.9.050a.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libedje-*.so
diff --git a/debian/libedje0.install b/debian/libedje0.install
deleted file mode 100644
index c45ebcf..0000000
--- a/debian/libedje0.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/lib*.so.*
diff --git a/debian/patches/0001-Add-libtool-Wl-as-needed-reordering-workaround.patch b/debian/patches/0001-Add-libtool-Wl-as-needed-reordering-workaround.patch
index 3846f62..1ca6afc 100644
--- a/debian/patches/0001-Add-libtool-Wl-as-needed-reordering-workaround.patch
+++ b/debian/patches/0001-Add-libtool-Wl-as-needed-reordering-workaround.patch
@@ -1,6 +1,6 @@
-From 7606a241d00b8d14b1be3b464728b186b26333f1 Mon Sep 17 00:00:00 2001
-From: Jan Luebbe <jluebbe at debian.org>
-Date: Sun, 4 May 2008 18:23:25 +0200
+From a314297d80e8156245bc1f5ff389bd6d868cc9f1 Mon Sep 17 00:00:00 2001
+From: Albin Tonnerre <albin.tonnerre at gmail.com>
+Date: Fri, 12 Dec 2008 23:57:06 +0100
Subject: [PATCH] Add libtool -Wl,--as-needed reordering workaround
---
@@ -8,7 +8,7 @@ Subject: [PATCH] Add libtool -Wl,--as-needed reordering workaround
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ltmain.sh b/ltmain.sh
-index e420fac..9a9b252 100644
+index 0bf3848..ff10731 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1807,6 +1807,11 @@ EOF
diff --git a/debian/patches/0002-fix-library-soname.patch b/debian/patches/0002-fix-library-soname.patch
new file mode 100644
index 0000000..4e1122e
--- /dev/null
+++ b/debian/patches/0002-fix-library-soname.patch
@@ -0,0 +1,35 @@
+From acd829c971ef2c922fa2cbd35553d4c10857519b Mon Sep 17 00:00:00 2001
+From: Albin Tonnerre <albin.tonnerre at gmail.com>
+Date: Fri, 12 Dec 2008 23:58:32 +0100
+Subject: [PATCH] fix library soname
+
+---
+ configure.ac | 1 +
+ src/lib/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1a9ccd6..d3b7bad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,6 +12,7 @@ AC_CANONICAL_HOST
+ AC_ISC_POSIX
+
+ AM_INIT_AUTOMAKE(1.6 dist-bzip2)
++AM_MAINTAINER_MODE
+ AM_CONFIG_HEADER(config.h)
+
+ AC_LIBTOOL_WIN32_DLL
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index 6f5fc59..8e80cf8 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -42,4 +42,4 @@ edje_script_only.c \
+ edje_entry.c
+
+ libedje_la_LIBADD = @EDJE_LIBS@ -lm
+-libedje_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
++libedje_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -release @PACKAGE_VERSION@$(DEBIAN_MINOR)
+--
+1.5.6.5
+
diff --git a/debian/patches/0003-reapply-autofoo.patch b/debian/patches/0003-reapply-autofoo.patch
new file mode 100644
index 0000000..dcec083
--- /dev/null
+++ b/debian/patches/0003-reapply-autofoo.patch
@@ -0,0 +1,810 @@
+From 4f0552a012b87bfc9898ac6cd18030118cbe2f91 Mon Sep 17 00:00:00 2001
+From: Albin Tonnerre <albin.tonnerre at gmail.com>
+Date: Sat, 13 Dec 2008 00:00:16 +0100
+Subject: [PATCH] reapply autofoo
+
+---
+ INSTALL | 245 +++++++++++++++++++++++++++++++++++++++++++--
+ Makefile.in | 9 +-
+ aclocal.m4 | 29 ++++++
+ configure | 75 +++++++++++----
+ data/Makefile.in | 7 +-
+ data/include/Makefile.in | 7 +-
+ doc/Makefile.in | 7 +-
+ src/Makefile.in | 7 +-
+ src/bin/Makefile.in | 7 +-
+ src/lib/Makefile.in | 9 +-
+ utils/Makefile.in | 7 +-
+ 11 files changed, 353 insertions(+), 56 deletions(-)
+
+diff --git a/INSTALL b/INSTALL
+index c7bf98a..d3c5b40 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -1,14 +1,237 @@
+-COMPILING and INSTALLING:
++Installation Instructions
++*************************
+
+-If you got a official release tar archive do:
+- ./configure
+-
+-( otherwise if you got this from enlightenment cvs do: ./autogen.sh )
+-
+-Then to compile:
+- make
++Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
++2006, 2007 Free Software Foundation, Inc.
+
+-To install (run this as root, or the user who handles installs):
+- make install
++This file is free documentation; the Free Software Foundation gives
++unlimited permission to copy, distribute and modify it.
++
++Basic Installation
++==================
++
++Briefly, the shell commands `./configure; make; make install' should
++configure, build, and install this package. The following
++more-detailed instructions are generic; see the `README' file for
++instructions specific to this package.
++
++ The `configure' shell script attempts to guess correct values for
++various system-dependent variables used during compilation. It uses
++those values to create a `Makefile' in each directory of the package.
++It may also create one or more `.h' files containing system-dependent
++definitions. Finally, it creates a shell script `config.status' that
++you can run in the future to recreate the current configuration, and a
++file `config.log' containing compiler output (useful mainly for
++debugging `configure').
++
++ It can also use an optional file (typically called `config.cache'
++and enabled with `--cache-file=config.cache' or simply `-C') that saves
++the results of its tests to speed up reconfiguring. Caching is
++disabled by default to prevent problems with accidental use of stale
++cache files.
++
++ If you need to do unusual things to compile the package, please try
++to figure out how `configure' could check whether to do them, and mail
++diffs or instructions to the address given in the `README' so they can
++be considered for the next release. If you are using the cache, and at
++some point `config.cache' contains results you don't want to keep, you
++may remove or edit it.
++
++ The file `configure.ac' (or `configure.in') is used to create
++`configure' by a program called `autoconf'. You need `configure.ac' if
++you want to change it or regenerate `configure' using a newer version
++of `autoconf'.
++
++The simplest way to compile this package is:
++
++ 1. `cd' to the directory containing the package's source code and type
++ `./configure' to configure the package for your system.
++
++ Running `configure' might take a while. While running, it prints
++ some messages telling which features it is checking for.
++
++ 2. Type `make' to compile the package.
++
++ 3. Optionally, type `make check' to run any self-tests that come with
++ the package.
++
++ 4. Type `make install' to install the programs and any data files and
++ documentation.
++
++ 5. You can remove the program binaries and object files from the
++ source code directory by typing `make clean'. To also remove the
++ files that `configure' created (so you can compile the package for
++ a different kind of computer), type `make distclean'. There is
++ also a `make maintainer-clean' target, but that is intended mainly
++ for the package's developers. If you use it, you may have to get
++ all sorts of other programs in order to regenerate files that came
++ with the distribution.
++
++ 6. Often, you can also type `make uninstall' to remove the installed
++ files again.
++
++Compilers and Options
++=====================
++
++Some systems require unusual options for compilation or linking that the
++`configure' script does not know about. Run `./configure --help' for
++details on some of the pertinent environment variables.
++
++ You can give `configure' initial values for configuration parameters
++by setting variables in the command line or in the environment. Here
++is an example:
++
++ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
++
++ *Note Defining Variables::, for more details.
++
++Compiling For Multiple Architectures
++====================================
++
++You can compile the package for more than one kind of computer at the
++same time, by placing the object files for each architecture in their
++own directory. To do this, you can use GNU `make'. `cd' to the
++directory where you want the object files and executables to go and run
++the `configure' script. `configure' automatically checks for the
++source code in the directory that `configure' is in and in `..'.
++
++ With a non-GNU `make', it is safer to compile the package for one
++architecture at a time in the source code directory. After you have
++installed the package for one architecture, use `make distclean' before
++reconfiguring for another architecture.
++
++Installation Names
++==================
++
++By default, `make install' installs the package's commands under
++`/usr/local/bin', include files under `/usr/local/include', etc. You
++can specify an installation prefix other than `/usr/local' by giving
++`configure' the option `--prefix=PREFIX'.
++
++ You can specify separate installation prefixes for
++architecture-specific files and architecture-independent files. If you
++pass the option `--exec-prefix=PREFIX' to `configure', the package uses
++PREFIX as the prefix for installing programs and libraries.
++Documentation and other data files still use the regular prefix.
++
++ In addition, if you use an unusual directory layout you can give
++options like `--bindir=DIR' to specify different values for particular
++kinds of files. Run `configure --help' for a list of the directories
++you can set and what kinds of files go in them.
++
++ If the package supports it, you can cause programs to be installed
++with an extra prefix or suffix on their names by giving `configure' the
++option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
++
++Optional Features
++=================
++
++Some packages pay attention to `--enable-FEATURE' options to
++`configure', where FEATURE indicates an optional part of the package.
++They may also pay attention to `--with-PACKAGE' options, where PACKAGE
++is something like `gnu-as' or `x' (for the X Window System). The
++`README' should mention any `--enable-' and `--with-' options that the
++package recognizes.
++
++ For packages that use the X Window System, `configure' can usually
++find the X include and library files automatically, but if it doesn't,
++you can use the `configure' options `--x-includes=DIR' and
++`--x-libraries=DIR' to specify their locations.
++
++Specifying the System Type
++==========================
++
++There may be some features `configure' cannot figure out automatically,
++but needs to determine by the type of machine the package will run on.
++Usually, assuming the package is built to be run on the _same_
++architectures, `configure' can figure that out, but if it prints a
++message saying it cannot guess the machine type, give it the
++`--build=TYPE' option. TYPE can either be a short name for the system
++type, such as `sun4', or a canonical name which has the form:
++
++ CPU-COMPANY-SYSTEM
++
++where SYSTEM can have one of these forms:
++
++ OS KERNEL-OS
++
++ See the file `config.sub' for the possible values of each field. If
++`config.sub' isn't included in this package, then this package doesn't
++need to know the machine type.
++
++ If you are _building_ compiler tools for cross-compiling, you should
++use the option `--target=TYPE' to select the type of system they will
++produce code for.
++
++ If you want to _use_ a cross compiler, that generates code for a
++platform different from the build platform, you should specify the
++"host" platform (i.e., that on which the generated programs will
++eventually be run) with `--host=TYPE'.
++
++Sharing Defaults
++================
++
++If you want to set default values for `configure' scripts to share, you
++can create a site shell script called `config.site' that gives default
++values for variables like `CC', `cache_file', and `prefix'.
++`configure' looks for `PREFIX/share/config.site' if it exists, then
++`PREFIX/etc/config.site' if it exists. Or, you can set the
++`CONFIG_SITE' environment variable to the location of the site script.
++A warning: not all `configure' scripts look for a site script.
++
++Defining Variables
++==================
++
++Variables not defined in a site shell script can be set in the
++environment passed to `configure'. However, some packages may run
++configure again during the build, and the customized values of these
++variables may be lost. In order to avoid this problem, you should set
++them in the `configure' command line, using `VAR=value'. For example:
++
++ ./configure CC=/usr/local2/bin/gcc
++
++causes the specified `gcc' to be used as the C compiler (unless it is
++overridden in the site shell script).
++
++Unfortunately, this technique does not work for `CONFIG_SHELL' due to
++an Autoconf bug. Until the bug is fixed you can use this workaround:
++
++ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
++
++`configure' Invocation
++======================
++
++`configure' recognizes the following options to control how it operates.
++
++`--help'
++`-h'
++ Print a summary of the options to `configure', and exit.
++
++`--version'
++`-V'
++ Print the version of Autoconf used to generate the `configure'
++ script, and exit.
++
++`--cache-file=FILE'
++ Enable the cache: use and save the results of the tests in FILE,
++ traditionally `config.cache'. FILE defaults to `/dev/null' to
++ disable caching.
++
++`--config-cache'
++`-C'
++ Alias for `--cache-file=config.cache'.
++
++`--quiet'
++`--silent'
++`-q'
++ Do not print messages saying which checks are being made. To
++ suppress all normal output, redirect it to `/dev/null' (any error
++ messages will still be shown).
++
++`--srcdir=DIR'
++ Look for the package's source code in directory DIR. Usually
++ `configure' can determine that directory automatically.
++
++`configure' also accepts some other, not widely useful, options. Run
++`configure --help' for more details.
+
+-NOTE: You MUST make install Edje for it to run properly.
+diff --git a/Makefile.in b/Makefile.in
+index 12504c5..b28c28f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -137,6 +137,7 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ NMEDIT = @NMEDIT@
+@@ -253,7 +254,7 @@ all: config.h
+ .SUFFIXES:
+ am--refresh:
+ @:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+@@ -280,9 +281,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(srcdir) && $(AUTOCONF)
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+ config.h: stamp-h1
+@@ -294,7 +295,7 @@ config.h: stamp-h1
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in: $(am__configure_deps)
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h1
+ touch $@
+diff --git a/aclocal.m4 b/aclocal.m4
+index e119fcb..e6cc981 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -7353,6 +7353,35 @@ fi
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
++# From Jim Meyering
++
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 4
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++ dnl maintainer-mode is disabled by default
++ AC_ARG_ENABLE(maintainer-mode,
++[ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ USE_MAINTAINER_MODE=$enableval,
++ USE_MAINTAINER_MODE=no)
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST(MAINT)dnl
++]
++)
++
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++
+ # Check to see how 'make' treats includes. -*- Autoconf -*-
+
+ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+diff --git a/configure b/configure
+index 6747a0b..f3f1853 100755
+--- a/configure
++++ b/configure
+@@ -848,6 +848,9 @@ AMDEPBACKSLASH
+ CCDEPMODE
+ am__fastdepCC_TRUE
+ am__fastdepCC_FALSE
++MAINTAINER_MODE_TRUE
++MAINTAINER_MODE_FALSE
++MAINT
+ SED
+ GREP
+ EGREP
+@@ -1503,6 +1506,8 @@ Optional Features:
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors
++ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer
+ --enable-shared[=PKGS] build shared libraries [default=yes]
+ --enable-static[=PKGS] build static libraries [default=yes]
+ --enable-fast-install[=PKGS]
+@@ -3721,6 +3726,28 @@ fi
+
+
+
++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
++ # Check whether --enable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
++else
++ USE_MAINTAINER_MODE=no
++fi
++
++ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
++ if test $USE_MAINTAINER_MODE = yes; then
++ MAINTAINER_MODE_TRUE=
++ MAINTAINER_MODE_FALSE='#'
++else
++ MAINTAINER_MODE_TRUE='#'
++ MAINTAINER_MODE_FALSE=
++fi
++
++ MAINT=$MAINTAINER_MODE_TRUE
++
++
+ ac_config_headers="$ac_config_headers config.h"
+
+
+@@ -4450,7 +4477,7 @@ ia64-*-hpux*)
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 4453 "configure"' > conftest.$ac_ext
++ echo '#line 4480 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -6830,11 +6857,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:6833: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:6860: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:6837: \$? = $ac_status" >&5
++ echo "$as_me:6864: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -7120,11 +7147,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:7123: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7150: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:7127: \$? = $ac_status" >&5
++ echo "$as_me:7154: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -7224,11 +7251,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:7227: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7254: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:7231: \$? = $ac_status" >&5
++ echo "$as_me:7258: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -9601,7 +9628,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 9604 "configure"
++#line 9631 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -9701,7 +9728,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 9704 "configure"
++#line 9731 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -10501,11 +10528,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:10504: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10531: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:10508: \$? = $ac_status" >&5
++ echo "$as_me:10535: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -10791,11 +10818,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:10794: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10821: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:10798: \$? = $ac_status" >&5
++ echo "$as_me:10825: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -10895,11 +10922,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:10898: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10925: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:10902: \$? = $ac_status" >&5
++ echo "$as_me:10929: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -16997,6 +17024,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
+ if test -z "${BUILD_EDJE_CC_TRUE}" && test -z "${BUILD_EDJE_CC_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BUILD_EDJE_CC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -17657,6 +17691,9 @@ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+ CCDEPMODE!$CCDEPMODE$ac_delim
+ am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+ am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
++MAINT!$MAINT$ac_delim
+ SED!$SED$ac_delim
+ GREP!$GREP$ac_delim
+ EGREP!$EGREP$ac_delim
+@@ -17668,9 +17705,6 @@ DSYMUTIL!$DSYMUTIL$ac_delim
+ NMEDIT!$NMEDIT$ac_delim
+ DLLTOOL!$DLLTOOL$ac_delim
+ AS!$AS$ac_delim
+-OBJDUMP!$OBJDUMP$ac_delim
+-CPP!$CPP$ac_delim
+-LIBTOOL!$LIBTOOL$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -17712,6 +17746,9 @@ _ACEOF
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++OBJDUMP!$OBJDUMP$ac_delim
++CPP!$CPP$ac_delim
++LIBTOOL!$LIBTOOL$ac_delim
+ version_info!$version_info$ac_delim
+ BUILD_EDJE_CC_TRUE!$BUILD_EDJE_CC_TRUE$ac_delim
+ BUILD_EDJE_CC_FALSE!$BUILD_EDJE_CC_FALSE$ac_delim
+@@ -17755,7 +17792,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+diff --git a/data/Makefile.in b/data/Makefile.in
+index 742b844..d277d64 100644
+--- a/data/Makefile.in
++++ b/data/Makefile.in
+@@ -107,6 +107,7 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ NMEDIT = @NMEDIT@
+@@ -194,7 +195,7 @@ EXTRA_DIST = edc.vim edje-mode.el
+ all: all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+@@ -219,9 +220,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+diff --git a/data/include/Makefile.in b/data/include/Makefile.in
+index 6f59e07..d61967f 100644
+--- a/data/include/Makefile.in
++++ b/data/include/Makefile.in
+@@ -105,6 +105,7 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ NMEDIT = @NMEDIT@
+@@ -194,7 +195,7 @@ EXTRA_DIST = $(FILES)
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+@@ -219,9 +220,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index 3f3796d..1e3c112 100644
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -96,6 +96,7 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ NMEDIT = @NMEDIT@
+@@ -183,7 +184,7 @@ EXTRA_DIST = Doxyfile e.css foot.html head.html img/ edje.dox.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+@@ -208,9 +209,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ edje.dox: $(top_builddir)/config.status $(srcdir)/edje.dox.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index a52c049..490853b 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -107,6 +107,7 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ NMEDIT = @NMEDIT@
+@@ -192,7 +193,7 @@ SUBDIRS = lib bin
+ all: all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+@@ -217,9 +218,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in
+index 7e8e7eb..5f36615 100644
+--- a/src/bin/Makefile.in
++++ b/src/bin/Makefile.in
+@@ -139,6 +139,7 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ NMEDIT = @NMEDIT@
+@@ -265,7 +266,7 @@ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+@@ -290,9 +291,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
+index 5be1235..9017a81 100644
+--- a/src/lib/Makefile.in
++++ b/src/lib/Makefile.in
+@@ -134,6 +134,7 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ NMEDIT = @NMEDIT@
+@@ -255,12 +256,12 @@ edje_script_only.c \
+ edje_entry.c
+
+ libedje_la_LIBADD = @EDJE_LIBS@ -lm
+-libedje_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
++libedje_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -release @PACKAGE_VERSION@$(DEBIAN_MINOR)
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+@@ -285,9 +286,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff --git a/utils/Makefile.in b/utils/Makefile.in
+index 37c204c..91b0ef3 100644
+--- a/utils/Makefile.in
++++ b/utils/Makefile.in
+@@ -99,6 +99,7 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ NMEDIT = @NMEDIT@
+@@ -186,7 +187,7 @@ EXTRA_DIST = gimp-edje-export.py inkscape2edc
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+@@ -211,9 +212,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+--
+1.5.6.5
+
diff --git a/debian/patches/series b/debian/patches/series
index 2ddc315..ae80aca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
0001-Add-libtool-Wl-as-needed-reordering-workaround.patch
+0002-fix-library-soname.patch
+0003-reapply-autofoo.patch
diff --git a/debian/rules b/debian/rules
index c242e76..15cb6c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
LDFLAGS += -Wl,--as-needed
+DEB_MAKE_ENVVARS += DEBIAN_MINOR='a'
+
+build/libedje-doc::
+ $(MAKE) doc
install/libedje-doc::
cp -R $(DEB_SRCDIR)/doc/html debian/libedje-doc/usr/share/doc/libedje-doc/
@@ -21,4 +25,3 @@ refresh-patches:
@cd '$(CURDIR)'/debian/patches && git format-patch upstream..upstream-$(DEB_UPSTREAM_VERSION)+patches | tee series
@sed -i s:^debian/patches/:: '$(CURDIR)'/debian/patches/series
@echo .
-
--
Enlightenment DR17 graphical layout and animation library
More information about the Pkg-e-commits
mailing list