[Pkg-e-commits] [SCM] Enlightenment DR17 support for freedesktop.org specs branch, master, updated. debian/0.5.0.050+svn20081114-1-353-gda626d0
Albin Tonnerre
albin.tonnerre at gmail.com
Wed May 27 10:47:46 UTC 2009
The following commit has been merged in the master branch:
commit 1514a056f54100aa6d72372e5040195aa6031504
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date: Sat Apr 18 13:17:26 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 90a0b24..b740e20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+efreet (0.5.0.050+svn2009????) UNRELEASED; urgency=low
+
+ * New SVN snapshot
+ - Drop patches, no longer needed:
+ + 02-fix-library-soname.diff
+ + 03-reapply-autofoo.diff
+ - Drop 04_fix_signedness_issues.diff, applied upstream
+ - Package enaming due to upstream SONAME change.
+ + Update shlibs and .install files
+
+ -- Albin Tonnerre <albin.tonnerre at gmail.com> Sat, 18 Apr 2009 13:09:52 +0200
+
efreet (0.5.0.050+svn20090203-2) experimental; urgency=low
* Add debian/patches/04_fix_signedness_issues.diff:
diff --git a/debian/control b/debian/control
index 5ee9794..f839e45 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Git: git://git.debian.org/pkg-e/libs/efreet.git
Vcs-Browser: http://git.debian.org/?p=pkg-e/libs/efreet.git
Homepage: http://www.enlightenment.org
-Package: libefreet-0.5.0.050a
+Package: libefreet-svn-00
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libefreet0
@@ -31,7 +31,7 @@ Description: Library that implements freedesktop.org specs for use with E17/EFL
Package: libefreet-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libefreet-0.5.0.050a (= ${binary:Version}), libecore-dev (>= 0.9.9.050+svn20081201), libeina-dev
+Depends: ${misc:Depends}, libefreet-svn-00 (= ${binary:Version}), libecore-dev (>= 0.9.9.050+svn20081201), libeina-dev
Suggests: libefreet-doc
Description: Development files for libefreet and libefreet-mime
An implementation of several specifications from freedesktop.org intended for
diff --git a/debian/libefreet-0.5.0.050a.install b/debian/libefreet-0.5.0.050a.install
deleted file mode 100644
index 15ac7be..0000000
--- a/debian/libefreet-0.5.0.050a.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/libefreet-*.so
-debian/tmp/usr/lib/libefreet_mime.so.*
-debian/tmp/usr/lib/libefreet_trash.so.*
diff --git a/debian/libefreet-0.5.0.050a.shlibs b/debian/libefreet-0.5.0.050a.shlibs
deleted file mode 100644
index 086699e..0000000
--- a/debian/libefreet-0.5.0.050a.shlibs
+++ /dev/null
@@ -1,3 +0,0 @@
-libefreet 0.5.0.050a libefreet-0.5.0.050a (>= 0.5.0.050+svn20090203)
-libefreet_mime 0 libefreet-0.5.0.050a
-libefreet_trash 0 libefreet-0.5.0.050a
diff --git a/debian/libefreet-svn-00.install b/debian/libefreet-svn-00.install
new file mode 100644
index 0000000..38c496a
--- /dev/null
+++ b/debian/libefreet-svn-00.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/libefreet-*.so.*
+debian/tmp/usr/lib/libefreet_mime-*.so.*
+debian/tmp/usr/lib/libefreet_trash-*.so.*
diff --git a/debian/libefreet-svn-00.shlibs b/debian/libefreet-svn-00.shlibs
new file mode 100644
index 0000000..37b3b84
--- /dev/null
+++ b/debian/libefreet-svn-00.shlibs
@@ -0,0 +1,3 @@
+libefreet-ver-pre-svn-00 0 libefreet-svn-00
+libefreet_mime-ver-pre-svn-00 0 libefreet-svn-00
+libefreet_trash-ver-pre-00 0 libefreet-svn-00
diff --git a/debian/patches/02-fix-library-soname.diff b/debian/patches/02-fix-library-soname.diff
deleted file mode 100644
index e6b68f2..0000000
--- a/debian/patches/02-fix-library-soname.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index c856fca..0a69a99 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_ISC_POSIX
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
-index 72ba741..e2674fb 100644
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -63,7 +63,7 @@ installed_headersdir = $(prefix)/include/efreet
- installed_headers_DATA = $(EFREETHEADERS) $(EFREETMIMEHEADERS) $(EFREETTRASHHEADERS)
-
- libefreet_la_LIBADD = @ECORE_LIBS@ @EINA_LIBS@
--libefreet_la_LDFLAGS = -version-info @version_info@
-+libefreet_la_LDFLAGS = -release @PACKAGE_VERSION@$(DEBIAN_MINOR)
-
- libefreet_mime_la_LIBADD = @ECORE_LIBS@ @EINA_LIBS@ libefreet.la
- libefreet_trash_la_LIBADD = @ECORE_LIBS@ @EINA_LIBS@ libefreet.la
diff --git a/debian/patches/03-reapply-autofoo.diff b/debian/patches/03-reapply-autofoo.diff
deleted file mode 100644
index db03bd5..0000000
--- a/debian/patches/03-reapply-autofoo.diff
+++ /dev/null
@@ -1,560 +0,0 @@
-diff --git a/INSTALL b/INSTALL
-index 5458714..d3c5b40 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -2,7 +2,7 @@ Installation Instructions
- *************************
-
- Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
--2006 Free Software Foundation, Inc.
-+2006, 2007 Free Software Foundation, Inc.
-
- This file is free documentation; the Free Software Foundation gives
- unlimited permission to copy, distribute and modify it.
-@@ -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
- =====================
-
-diff --git a/Makefile.in b/Makefile.in
-index ba068ee..f243401 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -126,6 +126,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NMEDIT = @NMEDIT@
-@@ -231,7 +232,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*) \
-@@ -258,9 +259,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
-@@ -272,7 +273,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 563d5e5..2950ba0 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -7376,6 +7376,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 1111d4a..8b71c3c 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
-@@ -1472,6 +1475,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]
-@@ -2511,6 +2516,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"
-
-
-@@ -6581,7 +6608,7 @@ ia64-*-hpux*)
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 6584 "configure"' > conftest.$ac_ext
-+ echo '#line 6611 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -8556,11 +8583,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:8559: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8586: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8563: \$? = $ac_status" >&5
-+ echo "$as_me:8590: \$? = $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.
-@@ -8846,11 +8873,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:8849: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8876: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8853: \$? = $ac_status" >&5
-+ echo "$as_me:8880: \$? = $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.
-@@ -8950,11 +8977,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:8953: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8980: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8957: \$? = $ac_status" >&5
-+ echo "$as_me:8984: \$? = $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
-@@ -11327,7 +11354,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11330 "configure"
-+#line 11357 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11427,7 +11454,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11430 "configure"
-+#line 11457 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -12227,11 +12254,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:12230: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12257: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:12234: \$? = $ac_status" >&5
-+ echo "$as_me:12261: \$? = $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.
-@@ -12517,11 +12544,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:12520: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12547: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:12524: \$? = $ac_status" >&5
-+ echo "$as_me:12551: \$? = $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.
-@@ -12621,11 +12648,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:12624: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12651: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:12628: \$? = $ac_status" >&5
-+ echo "$as_me:12655: \$? = $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
-@@ -16328,6 +16355,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
-@@ -16982,6 +17016,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
-@@ -17009,9 +17046,6 @@ RANLIB!$RANLIB$ac_delim
- DSYMUTIL!$DSYMUTIL$ac_delim
- NMEDIT!$NMEDIT$ac_delim
- DLLTOOL!$DLLTOOL$ac_delim
--AS!$AS$ac_delim
--OBJDUMP!$OBJDUMP$ac_delim
--LIBTOOL!$LIBTOOL$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -17053,6 +17087,9 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+AS!$AS$ac_delim
-+OBJDUMP!$OBJDUMP$ac_delim
-+LIBTOOL!$LIBTOOL$ac_delim
- version_info!$version_info$ac_delim
- ALLOCA!$ALLOCA$ac_delim
- PKG_CONFIG!$PKG_CONFIG$ac_delim
-@@ -17071,7 +17108,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` = 16; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index d8c8ece..0f7c956 100644
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -86,6 +86,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NMEDIT = @NMEDIT@
-@@ -164,7 +165,7 @@ EXTRA_DIST = Doxyfile.in images e.css head.html foot.html
- 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*) \
-@@ -189,9 +190,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
- Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-diff --git a/src/Makefile.in b/src/Makefile.in
-index a731ce6..8cb8b90 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@
-@@ -174,7 +175,7 @@ MAINTAINERCLEANFILES = Makefile.in
- 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*) \
-@@ -199,9 +200,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 578e228..1054885 100644
---- a/src/bin/Makefile.in
-+++ b/src/bin/Makefile.in
-@@ -133,6 +133,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NMEDIT = @NMEDIT@
-@@ -240,7 +241,7 @@ all: all-recursive
-
- .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*) \
-@@ -265,9 +266,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/bin/compare/Makefile.in b/src/bin/compare/Makefile.in
-index be2116a..737996c 100644
---- a/src/bin/compare/Makefile.in
-+++ b/src/bin/compare/Makefile.in
-@@ -108,6 +108,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NMEDIT = @NMEDIT@
-@@ -197,7 +198,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*) \
-@@ -222,9 +223,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/bin/data/Makefile.in b/src/bin/data/Makefile.in
-index 076c75b..f7c99d2 100644
---- a/src/bin/data/Makefile.in
-+++ b/src/bin/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@
-@@ -198,7 +199,7 @@ EXTRA_DIST = $(test_DATA)
- 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*) \
-@@ -223,9 +224,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/data/sub/Makefile.in b/src/bin/data/sub/Makefile.in
-index 9cc8cfe..2308d76 100644
---- a/src/bin/data/sub/Makefile.in
-+++ b/src/bin/data/sub/Makefile.in
-@@ -95,6 +95,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NMEDIT = @NMEDIT@
-@@ -176,7 +177,7 @@ EXTRA_DIST = $(test_DATA)
- 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*) \
-@@ -201,9 +202,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/Makefile.in b/src/lib/Makefile.in
-index bcbaa0a..4c34a6b 100644
---- a/src/lib/Makefile.in
-+++ b/src/lib/Makefile.in
-@@ -133,6 +133,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NMEDIT = @NMEDIT@
-@@ -264,14 +265,14 @@ $(EFREETTRASHSOURCES)
- installed_headersdir = $(prefix)/include/efreet
- installed_headers_DATA = $(EFREETHEADERS) $(EFREETMIMEHEADERS) $(EFREETTRASHHEADERS)
- libefreet_la_LIBADD = @ECORE_LIBS@ @EINA_LIBS@
--libefreet_la_LDFLAGS = -version-info @version_info@
-+libefreet_la_LDFLAGS = -release @PACKAGE_VERSION@$(DEBIAN_MINOR)
- libefreet_mime_la_LIBADD = @ECORE_LIBS@ @EINA_LIBS@ libefreet.la
- libefreet_trash_la_LIBADD = @ECORE_LIBS@ @EINA_LIBS@ libefreet.la
- 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*) \
-@@ -296,9 +297,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/patches/04_fix_signedness_issues.diff b/debian/patches/04_fix_signedness_issues.diff
deleted file mode 100644
index 6b76717..0000000
--- a/debian/patches/04_fix_signedness_issues.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/src/lib/efreet_menu.c b/src/lib/efreet_menu.c
-index 35994fb..b8d0fef 100644
---- a/src/lib/efreet_menu.c
-+++ b/src/lib/efreet_menu.c
-@@ -61,11 +61,11 @@ struct Efreet_Menu_Internal
-
- Ecore_List *layout; /**< This menus layout */
- Ecore_List *default_layout; /**< Default layout */
-- char show_empty; /**< Whether to show empty menus */
-- char in_line; /**< Whether this meny can be inlined */
-- char inline_limit; /**< Number of elements which triggers inline */
-- char inline_header; /**< Whether we should use the header name when this menu is inlined */
-- char inline_alias; /**< Whether we should use the menu name when inlining */
-+ signed char show_empty; /**< Whether to show empty menus */
-+ signed char in_line; /**< Whether this meny can be inlined */
-+ signed char inline_limit; /**< Number of elements which triggers inline */
-+ signed char inline_header; /**< Whether we should use the header name when this menu is inlined */
-+ signed char inline_alias; /**< Whether we should use the menu name when inlining */
-
- unsigned char seen_allocated:1; /**< have we set the only_unallocated */
- unsigned char only_unallocated:1; /**< Show only unallocated .desktops */
-@@ -184,11 +184,11 @@ struct Efreet_Menu_Layout
- char *name; /**< The name of the element */
-
- /* The items below are for Menuname Layout elements */
-- char show_empty; /**< Whether to show empty menus */
-- char in_line; /**< Whether this meny can be inlined */
-- char inline_limit; /**< Number of elements which triggers inline */
-- char inline_header; /**< Whether we should use the header name when this menu is inlined */
-- char inline_alias; /**< Whether we should use the menu name when inlining */
-+ signed char show_empty; /**< Whether to show empty menus */
-+ signed char in_line; /**< Whether this meny can be inlined */
-+ signed char inline_limit; /**< Number of elements which triggers inline */
-+ signed char inline_header; /**< Whether we should use the header name when this menu is inlined */
-+ signed char inline_alias; /**< Whether we should use the menu name when inlining */
- };
-
- /**
diff --git a/debian/rules b/debian/rules
index 601522b..5929c1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@ 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='a'
-
build/libefreet-doc::
$(MAKE) doc
--
Enlightenment DR17 support for freedesktop.org specs
More information about the Pkg-e-commits
mailing list