[Pkg-e-commits] [SCM] Core abstraction layer for enlightenment DR 0.17 branch, new-svn-snapshot, updated. 0.9.9.050+svn20081201-1-2519-gb2340b1
Albin Tonnerre
albin.tonnerre at gmail.com
Sun Aug 2 15:32:58 UTC 2009
The following commit has been merged in the new-svn-snapshot branch:
commit 98a3ad667413a749c52e95350c7d21a8ddf47cee
Merge: a3da79caf7e1af099e3417703f06c04b013bb210 a247d7ac49d2b3b17cdc55042fa6bded5a7a0239
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date: Tue Jul 14 20:43:18 2009 +0200
Merge branch 'new-svn-snapshot'
Conflicts:
debian/control
diff --combined debian/control
index 7fa5b5e,291021d..2ccf2ea
--- a/debian/control
+++ b/debian/control
@@@ -5,16 -5,16 +5,16 @@@ Maintainer: Debian Pkg-e Team <pkg-e-de
Uploaders: Albin Tonnerre <albin.tonnerre at gmail.com>, Niv Sardi <xaiki at debian.org>,
Xavier Oswald <x.oswald at free.fr>, Jan Lübbe <jluebbe at debian.org>
Build-Depends: dpkg-dev (>= 1.14.8), debhelper (>= 6), cdbs, libeina-dev (>= 0.0.2.060),
- libeet-dev (>= 1.0.0), libevas-dev (>= 0.9.9.060), libgnutls-dev
- libeet-dev (>= 1.0.0), libevas-dev (>= 0.9.9.061), libssl-dev,
- libcurl4-openssl-dev, libxcursor-dev, libxss-dev, libxrender-dev, libxinerama-dev,
++ libeet-dev (>= 1.0.0), libevas-dev (>= 0.9.9.061), libgnutls-dev,
+ libcurl4-gnutls-dev, libxcursor-dev, libxss-dev, libxrender-dev, libxinerama-dev,
libxrandr-dev, libxext-dev, libxp-dev, libxcomposite-dev, libjpeg62-dev,
libxdamage-dev, x11proto-xext-dev, libxtst-dev, doxygen
- Standards-Version: 3.8.1
+ Standards-Version: 3.8.2
Homepage: http://enlightenment.org
Vcs-Git: git://git.debian.org/pkg-e/libs/ecore.git
Vcs-Browser: http://git.debian.org/?p=pkg-e/libs/ecore.git
- Package: libecore-svn-01
+ Package: libecore-svn-02
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Core abstraction layer for enlightenment DR 0.17
@@@ -24,7 -24,7 +24,7 @@@
can make use of the work put into Ecore to make this job easy for
applications.
- Package: libecore-con-svn-01
+ Package: libecore-con-svn-02
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Ecore Connection Library
@@@ -36,7 -36,7 +36,7 @@@
.
This package contains the Ecore Connection Library.
- Package: libecore-config-svn-01
+ Package: libecore-config-svn-02
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Ecore Enlightened Property Library
@@@ -48,7 -48,7 +48,7 @@@
.
This package contains the Enlightened Property Library.
- Package: libecore-evas-svn-01
+ Package: libecore-evas-svn-02
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Ecore Evas Wrapper Library
@@@ -60,7 -60,7 +60,7 @@@
.
This package contains the Ecore Evas wrapper functions.
- Package: libecore-fb-svn-01
+ Package: libecore-fb-svn-02
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Ecore frame buffer system functions
@@@ -72,7 -72,7 +72,7 @@@
.
This package contains the Ecore frame buffer system functions.
- Package: libecore-file-svn-01
+ Package: libecore-file-svn-02
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Ecore File Library
@@@ -84,7 -84,7 +84,7 @@@
.
This package contains the Ecore File Library.
- Package: libecore-imf-svn-01
+ Package: libecore-imf-svn-02
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Ecore Input Method Framework module
@@@ -97,7 -97,7 +97,7 @@@
This package contains the Ecore Input Method Framework module, and the Evas
helper functions for it.
- Package: libecore-input-svn-01
+ Package: libecore-input-svn-02
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Ecore input module
@@@ -109,7 -109,7 +109,7 @@@
.
This package contains the Ecore input module.
- Package: libecore-ipc-svn-01
+ Package: libecore-ipc-svn-02
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Ecore inter-process communication functions
@@@ -121,7 -121,7 +121,7 @@@
.
This package contains the Ecore inter-process communication functions.
- Package: libecore-job-svn-01
+ Package: libecore-job-svn-02
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Ecore job dealing functions
@@@ -133,7 -133,7 +133,7 @@@
.
This package contains functions for dealing with Ecore jobs.
- Package: libecore-txt-svn-01
+ Package: libecore-txt-svn-02
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Ecore text encoding conversion functions
@@@ -145,7 -145,7 +145,7 @@@
.
This package contains the Ecore text encoding conversion functions.
- Package: libecore-x-svn-01
+ Package: libecore-x-svn-02
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Ecore functions for dealing with the X Windows System
@@@ -162,19 -162,19 +162,19 @@@ Package: libecore-de
Architecture: any
Section: libdevel
Suggests: libecore-doc
- Depends: ${misc:Depends}, libecore-svn-01 (= ${binary:Version}),
- libecore-con-svn-01 (= ${binary:Version}),
- libecore-config-svn-01 (= ${binary:Version}),
- libecore-evas-svn-01 (= ${binary:Version}),
- libecore-fb-svn-01 (= ${binary:Version}),
- libecore-file-svn-01 (= ${binary:Version}),
- libecore-imf-svn-01 (= ${binary:Version}),
- libecore-ipc-svn-01 (= ${binary:Version}),
- libecore-job-svn-01 (= ${binary:Version}),
- libecore-txt-svn-01 (= ${binary:Version}),
- libecore-x-svn-01 (= ${binary:Version}),
- libeet-dev, libevas-dev (>= 0.9.9.060), libeina-dev (>= 0.0.2.060), pkg-config,
+ Depends: ${misc:Depends}, libecore-svn-02 (= ${binary:Version}),
+ libecore-con-svn-02 (= ${binary:Version}),
+ libecore-config-svn-02 (= ${binary:Version}),
+ libecore-evas-svn-02 (= ${binary:Version}),
+ libecore-fb-svn-02 (= ${binary:Version}),
+ libecore-file-svn-02 (= ${binary:Version}),
+ libecore-imf-svn-02 (= ${binary:Version}),
+ libecore-ipc-svn-02 (= ${binary:Version}),
+ libecore-job-svn-02 (= ${binary:Version}),
+ libecore-txt-svn-02 (= ${binary:Version}),
+ libecore-x-svn-02 (= ${binary:Version}),
+ libeet-dev, libevas-dev (>= 0.9.9.061), libeina-dev (>= 0.0.2.060), pkg-config,
- libssl-dev, libcurl4-openssl-dev, libxcursor-dev, libxss-dev,
+ libgnutls-dev, libcurl4-gnutls-dev, libxcursor-dev, libxss-dev,
libxrender-dev, libxinerama-dev, libxrandr-dev, libxext-dev,
libxp-dev, libxcomposite-dev, libxdamage-dev, x11proto-xext-dev, libxtst-dev
Description: Ecore headers and static libraries
@@@ -219,17 -219,17 +219,17 @@@ Package: libecore-db
Architecture: any
Section: debug
Priority: extra
- Depends: ${misc:Depends}, libecore-svn-01 (= ${binary:Version})
- Recommends: libecore-con-svn-01 (= ${binary:Version}),
- libecore-config-svn-01 (= ${binary:Version}),
- libecore-evas-svn-01 (= ${binary:Version}),
- libecore-fb-svn-01 (= ${binary:Version}),
- libecore-file-svn-01 (= ${binary:Version}),
- libecore-imf-svn-01 (= ${binary:Version}),
- libecore-ipc-svn-01 (= ${binary:Version}),
- libecore-job-svn-01 (= ${binary:Version}),
- libecore-txt-svn-01 (= ${binary:Version}),
- libecore-x-svn-01 (= ${binary:Version})
+ Depends: ${misc:Depends}, libecore-svn-02 (= ${binary:Version})
+ Recommends: libecore-con-svn-02 (= ${binary:Version}),
+ libecore-config-svn-02 (= ${binary:Version}),
+ libecore-evas-svn-02 (= ${binary:Version}),
+ libecore-fb-svn-02 (= ${binary:Version}),
+ libecore-file-svn-02 (= ${binary:Version}),
+ libecore-imf-svn-02 (= ${binary:Version}),
+ libecore-ipc-svn-02 (= ${binary:Version}),
+ libecore-job-svn-02 (= ${binary:Version}),
+ libecore-txt-svn-02 (= ${binary:Version}),
+ libecore-x-svn-02 (= ${binary:Version})
Description: Debugging symbols for libecore
This is the core event abstraction layer and X abstraction layer that makes
doing selections, Xdnd, general X stuff, and event loops, timeouts and idle
diff --combined debian/rules
index eed6023,eabe403..9612f37
--- a/debian/rules
+++ b/debian/rules
@@@ -5,7 -5,6 +5,7 @@@ include /usr/share/cdbs/1/rules/debhelp
include /usr/share/cdbs/1/rules/simple-patchsys.mk
CFLAGS += -fvisibility=hidden
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed
build/libecore-doc::
$(MAKE) doc
@@@ -14,7 -13,7 +14,7 @@@ install/libecore-doc:
mkdir -p debian/libecore-doc/usr/share/doc/libecore-doc/
cp -R $(DEB_SRCDIR)/doc/html debian/libecore-doc/usr/share/doc/libecore-doc/
- $(patsubst %,install/%,$(filter %-svn-01, $(DEB_ALL_PACKAGES))) ::
+ $(patsubst %,install/%,$(filter %-svn-02, $(DEB_ALL_PACKAGES))) ::
sed "s/PACKAGE/$(cdbs_curpkg)/" debian/pkg-name-soname.lintian-overrides.in > debian/$(cdbs_curpkg).lintian-overrides
clean::
@@@ -28,6 -27,5 +28,6 @@@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-e
--disable-ecore-evas-dfb \
--enable-ecore-evas-fb \
--disable-rpath \
- --enable-openssl \
+ --disable-openssl \
+ --enable-gnutls \
--enable-doc
--
Core abstraction layer for enlightenment DR 0.17
More information about the Pkg-e-commits
mailing list