[Pkg-e-commits] [SCM] D-Bus integration for EFL based applications branch, master, updated. debian/0.5.0.050+svn20081126-1-170-g28b7dba
Albin Tonnerre
albin.tonnerre at gmail.com
Wed May 27 10:45:31 UTC 2009
The following commit has been merged in the master branch:
commit 4d6fc15888c7e1e23e72076b62ca463894d71fca
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date: Sat Apr 18 19:19:42 2009 +0200
Prepare the upload of the next snapshot. package rename due to upstream SONAME change
diff --git a/debian/changelog b/debian/changelog
index b7fa497..a3b7451 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+edbus (0.5.0.050+svn?????) UNRELEASED; urgency=low
+
+ * New SVN snapshot
+ - Drop patches, no longer needed
+ - Package renaming due to upstream SONAME change.
+ + Update shlibs and .install files
+ * Update Standards-Version
+
+ -- Albin Tonnerre <albin.tonnerre at gmail.com> Sat, 18 Apr 2009 19:16:57 +0200
+
edbus (0.5.0.050+svn20090130-1) experimental; urgency=low
* New SVN snapshot
diff --git a/debian/control b/debian/control
index 6cc2667..e379592 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Albin Tonnerre <albin.tonnerre at gmail.com>, Niv Sardi <xaiki at debian.or
Xavier Oswald <x.oswald at free.fr>, Jan Lübbe <jluebbe at debian.org>
Build-Depends: debhelper (>= 6), cdbs, libecore-dev, libdbus-1-dev,
libevas-dev, libeina-dev (>= 0.0.1~svn20090128)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://enlightenment.org
Vcs-Git: git://git.debian.org/pkg-e/libs/edbus.git
Vcs-Browser: http://git.debian.org/?p=pkg-e/libs/edbus.git
@@ -14,7 +14,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-e/libs/edbus.git
Package: libedbus-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libedbus-0.5.0.050b (= ${binary:Version}), libdbus-1-dev,
+Depends: ${misc:Depends}, libedbus-svn-00 (= ${binary:Version}), libdbus-1-dev,
libeina-dev, libecore-dev, libevas-dev
Description: D-Bus and HAL wrapper libraries for use with the EFL - Development files
Wrappers around D-Bus to ease integrating D-Bus with EFL based applications.
@@ -22,7 +22,7 @@ Description: D-Bus and HAL wrapper libraries for use with the EFL - Development
This packages contains headers and static libraries for libedbus, libehal and
libenotify
-Package: libedbus-0.5.0.050b
+Package: libedbus-svn-00
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: D-Bus and HAL wrapper libraries for use with the EFL
diff --git a/debian/libedbus-0.5.0.050b.install b/debian/libedbus-0.5.0.050b.install
deleted file mode 100644
index da7cacd..0000000
--- a/debian/libedbus-0.5.0.050b.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/libedbus-*.so
-debian/tmp/usr/lib/libehal-*.so
-debian/tmp/usr/lib/libenotify-*.so
diff --git a/debian/libedbus-svn-00.install b/debian/libedbus-svn-00.install
new file mode 100644
index 0000000..8b5e8ed
--- /dev/null
+++ b/debian/libedbus-svn-00.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/libedbus-*.so.*
+debian/tmp/usr/lib/libehal-*.so.*
+debian/tmp/usr/lib/libenotify-*.so.*
diff --git a/debian/libedbus-svn-00.shlibs b/debian/libedbus-svn-00.shlibs
new file mode 100644
index 0000000..df9e75a
--- /dev/null
+++ b/debian/libedbus-svn-00.shlibs
@@ -0,0 +1,3 @@
+libedbus-ver-pre-svn-00 0 libedbus-svn-00 (>= 0.9.9.050+svn??????)
+libehal-ver-pre-svn-00 0 libedbus-svn-00 (>= 0.9.9.050+svn??????)
+libenotify-ver-pre-svn-00 0 libedbus-svn-00 (>= 0.9.9.050+svn??????)
diff --git a/debian/patches/01-fix-library-soname.diff b/debian/patches/01-fix-library-soname.diff
deleted file mode 100644
index 973c8ef..0000000
--- a/debian/patches/01-fix-library-soname.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index cb97e73..60ea993 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,6 +8,7 @@ AC_CANONICAL_BUILD
- AC_CANONICAL_HOST
-
- AM_INIT_AUTOMAKE(1.6 dist-bzip2)
-+AM_MAINTAINER_MODE
- AM_CONFIG_HEADER(config.h)
-
- AC_PROG_CC
-diff --git a/src/lib/dbus/Makefile.am b/src/lib/dbus/Makefile.am
-index d010eb6..ad94e3b 100644
---- a/src/lib/dbus/Makefile.am
-+++ b/src/lib/dbus/Makefile.am
-@@ -19,5 +19,5 @@ libedbus_la_SOURCES = \
-
- libedbus_la_LIBADD = \
- @EDBUS_LIBS@ @EINA_LIBS@
--libedbus_la_LDFLAGS = -version-info @version_info@
-+libedbus_la_LDFLAGS = -release @PACKAGE_VERSION@$(DEBIAN_MINOR)
-
-diff --git a/src/lib/hal/Makefile.am b/src/lib/hal/Makefile.am
-index 3080239..a586956 100644
---- a/src/lib/hal/Makefile.am
-+++ b/src/lib/hal/Makefile.am
-@@ -19,6 +19,6 @@ libehal_la_LIBADD = \
- @EDBUS_LIBS@ \
- $(top_builddir)/src/lib/dbus/libedbus.la \
- @EINA_LIBS@
--libehal_la_LDFLAGS = -version-info @version_info@
-+libehal_la_LDFLAGS = -release @PACKAGE_VERSION@$(DEBIAN_MINOR)
-
- endif
-diff --git a/src/lib/notification/Makefile.am b/src/lib/notification/Makefile.am
-index 6e4b664..4d13ba5 100644
---- a/src/lib/notification/Makefile.am
-+++ b/src/lib/notification/Makefile.am
-@@ -22,6 +22,6 @@ libenotify_la_LIBADD = \
- @EDBUS_LIBS@ @EVAS_LIBS@ \
- $(top_builddir)/src/lib/dbus/libedbus.la \
- @EINA_LIBS@
--libenotify_la_LDFLAGS = -version-info @version_info@
-+libenotify_la_LDFLAGS = -release @PACKAGE_VERSION@$(DEBIAN_MINOR)
-
- endif
diff --git a/debian/patches/02-reapply-autofoo.diff b/debian/patches/02-reapply-autofoo.diff
deleted file mode 100644
index c316610..0000000
--- a/debian/patches/02-reapply-autofoo.diff
+++ /dev/null
@@ -1,672 +0,0 @@
-diff --git a/INSTALL b/INSTALL
-index 23e5f25..d3c5b40 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -1,8 +1,8 @@
- Installation Instructions
- *************************
-
--Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
--Software Foundation, Inc.
-+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-+2006, 2007 Free Software Foundation, Inc.
-
- This file is free documentation; the Free Software Foundation gives
- unlimited permission to copy, distribute and modify it.
-@@ -10,7 +10,10 @@ unlimited permission to copy, distribute and modify it.
- Basic Installation
- ==================
-
--These are generic installation instructions.
-+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
-@@ -23,9 +26,9 @@ 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
-+the results of its tests to speed up reconfiguring. Caching is
- disabled by default to prevent problems with accidental use of stale
--cache files.)
-+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
-@@ -35,20 +38,17 @@ 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 only need
--`configure.ac' if you want to change it or regenerate `configure' using
--a newer version of `autoconf'.
-+`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. If you're
-- using `csh' on an old version of System V, you might need to type
-- `sh ./configure' instead to prevent `csh' from trying to execute
-- `configure' itself.
-+ `./configure' to configure the package for your system.
-
-- Running `configure' takes awhile. While running, it prints some
-- messages telling which features it is checking for.
-+ 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.
-
-@@ -67,6 +67,9 @@ The simplest way to compile this package is:
- 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
- =====================
-
-@@ -78,7 +81,7 @@ details on some of the pertinent environment variables.
- by setting variables in the command line or in the environment. Here
- is an example:
-
-- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-@@ -87,17 +90,15 @@ 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 must use a version of `make' that
--supports the `VPATH' variable, such as GNU `make'. `cd' to the
-+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 `..'.
-
-- If you have to use a `make' that does not support the `VPATH'
--variable, you have 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.
-+ 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
- ==================
-@@ -190,12 +191,12 @@ 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). Here is a another example:
-+overridden in the site shell script).
-
-- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-+an Autoconf bug. Until the bug is fixed you can use this workaround:
-
--Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
--configuration-related scripts to be executed by `/bin/bash'.
-+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
- `configure' Invocation
- ======================
-diff --git a/Makefile.in b/Makefile.in
-index ceeae5a..d8c2cd7 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -125,6 +125,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NMEDIT = @NMEDIT@
-@@ -209,7 +210,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*) \
-@@ -236,9 +237,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
-@@ -250,7 +251,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 cf0badb..cc442ca 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 1cd0a61..e777a1e 100755
---- a/configure
-+++ b/configure
-@@ -832,6 +832,9 @@ am__leading_dot
- AMTAR
- am__tar
- am__untar
-+MAINTAINER_MODE_TRUE
-+MAINTAINER_MODE_FALSE
-+MAINT
- CC
- CFLAGS
- LDFLAGS
-@@ -1475,6 +1478,8 @@ if test -n "$ac_init_help"; then
- Optional Features:
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
-+ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
- --enable-shared[=PKGS] build shared libraries [default=yes]
-@@ -2517,6 +2522,28 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-+{ 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"
-
-
-@@ -4866,7 +4893,7 @@ ia64-*-hpux*)
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 4869 "configure"' > conftest.$ac_ext
-+ echo '#line 4896 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -6551,11 +6578,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:6554: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:6581: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:6558: \$? = $ac_status" >&5
-+ echo "$as_me:6585: \$? = $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.
-@@ -6841,11 +6868,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:6844: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:6871: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:6848: \$? = $ac_status" >&5
-+ echo "$as_me:6875: \$? = $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.
-@@ -6945,11 +6972,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:6948: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:6975: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:6952: \$? = $ac_status" >&5
-+ echo "$as_me:6979: \$? = $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
-@@ -9322,7 +9349,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 9325 "configure"
-+#line 9352 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -9422,7 +9449,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 9425 "configure"
-+#line 9452 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -10222,11 +10249,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:10225: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10252: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:10229: \$? = $ac_status" >&5
-+ echo "$as_me:10256: \$? = $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.
-@@ -10512,11 +10539,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:10515: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10542: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:10519: \$? = $ac_status" >&5
-+ echo "$as_me:10546: \$? = $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.
-@@ -10616,11 +10643,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:10619: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10646: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:10623: \$? = $ac_status" >&5
-+ echo "$as_me:10650: \$? = $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
-@@ -14016,6 +14043,13 @@ LIBOBJS=$ac_libobjs
- LTLIBOBJS=$ac_ltlibobjs
-
-
-+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 "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -14662,6 +14696,9 @@ am__leading_dot!$am__leading_dot$ac_delim
- AMTAR!$AMTAR$ac_delim
- am__tar!$am__tar$ac_delim
- am__untar!$am__untar$ac_delim
-+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-+MAINT!$MAINT$ac_delim
- CC!$CC$ac_delim
- CFLAGS!$CFLAGS$ac_delim
- LDFLAGS!$LDFLAGS$ac_delim
-@@ -14689,9 +14726,6 @@ RANLIB!$RANLIB$ac_delim
- DSYMUTIL!$DSYMUTIL$ac_delim
- NMEDIT!$NMEDIT$ac_delim
- LIBTOOL!$LIBTOOL$ac_delim
--version_info!$version_info$ac_delim
--PKG_CONFIG!$PKG_CONFIG$ac_delim
--EINA_CFLAGS!$EINA_CFLAGS$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -14733,6 +14767,9 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+version_info!$version_info$ac_delim
-+PKG_CONFIG!$PKG_CONFIG$ac_delim
-+EINA_CFLAGS!$EINA_CFLAGS$ac_delim
- EINA_LIBS!$EINA_LIBS$ac_delim
- EDBUS_CFLAGS!$EDBUS_CFLAGS$ac_delim
- EDBUS_LIBS!$EDBUS_LIBS$ac_delim
-@@ -14750,7 +14787,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` = 15; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 096e9e7..6228f7c 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -97,6 +97,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NMEDIT = @NMEDIT@
-@@ -170,7 +171,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*) \
-@@ -195,9 +196,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 696f17a..1d29375 100644
---- a/src/bin/Makefile.in
-+++ b/src/bin/Makefile.in
-@@ -148,6 +148,7 @@ LIBS = \
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NMEDIT = @NMEDIT@
-@@ -288,7 +289,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*) \
-@@ -313,9 +314,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 12908e2..f9e739f 100644
---- a/src/lib/Makefile.in
-+++ b/src/lib/Makefile.in
-@@ -97,6 +97,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NMEDIT = @NMEDIT@
-@@ -170,7 +171,7 @@ SUBDIRS = dbus hal nm notification
- 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*) \
-@@ -195,9 +196,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/lib/dbus/Makefile.in b/src/lib/dbus/Makefile.in
-index 553e195..5a4d644 100644
---- a/src/lib/dbus/Makefile.in
-+++ b/src/lib/dbus/Makefile.in
-@@ -121,6 +121,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NMEDIT = @NMEDIT@
-@@ -208,12 +209,12 @@ libedbus_la_SOURCES = \
- libedbus_la_LIBADD = \
- @EDBUS_LIBS@ @EINA_LIBS@
-
--libedbus_la_LDFLAGS = -version-info @version_info@
-+libedbus_la_LDFLAGS = -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*) \
-@@ -238,9 +239,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/src/lib/hal/Makefile.in b/src/lib/hal/Makefile.in
-index 99c35a2..4e3e819 100644
---- a/src/lib/hal/Makefile.in
-+++ b/src/lib/hal/Makefile.in
-@@ -125,6 +125,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NMEDIT = @NMEDIT@
-@@ -211,12 +212,12 @@ AM_CPPFLAGS = \
- @BUILD_EHAL_TRUE@$(top_builddir)/src/lib/dbus/libedbus.la \
- @BUILD_EHAL_TRUE@@EINA_LIBS@
-
-- at BUILD_EHAL_TRUE@libehal_la_LDFLAGS = -version-info @version_info@
-+ at BUILD_EHAL_TRUE@libehal_la_LDFLAGS = -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*) \
-@@ -241,9 +242,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/src/lib/nm/Makefile.in b/src/lib/nm/Makefile.in
-index 02624fd..f58e618 100644
---- a/src/lib/nm/Makefile.in
-+++ b/src/lib/nm/Makefile.in
-@@ -127,6 +127,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NMEDIT = @NMEDIT@
-@@ -227,7 +228,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*) \
-@@ -252,9 +253,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/src/lib/notification/Makefile.in b/src/lib/notification/Makefile.in
-index 567898f..29568c7 100644
---- a/src/lib/notification/Makefile.in
-+++ b/src/lib/notification/Makefile.in
-@@ -125,6 +125,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NMEDIT = @NMEDIT@
-@@ -214,12 +215,12 @@ AM_CPPFLAGS = \
- @BUILD_ENOTIFY_TRUE@$(top_builddir)/src/lib/dbus/libedbus.la \
- @BUILD_ENOTIFY_TRUE@@EINA_LIBS@
-
-- at BUILD_ENOTIFY_TRUE@libenotify_la_LDFLAGS = -version-info @version_info@
-+ at BUILD_ENOTIFY_TRUE@libenotify_la_LDFLAGS = -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*) \
-@@ -244,9 +245,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/debian/rules b/debian/rules
index 917ac4a..502d60c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,5 +3,3 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-DEB_MAKE_ENVVARS += DEBIAN_MINOR='b'
--
D-Bus integration for EFL based applications
More information about the Pkg-e-commits
mailing list