debian/changelog | 8 ++++++++ debian/control | 2 -- debian/rules | 2 +- src/Makefile.am | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-)
New commits: commit bd99b7011b6d22504f75bb3f451a595565f793c6 Author: Julien Cristau <[email protected]> Date: Sun Apr 4 18:26:30 2010 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 6a4590b..0025e86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -libcompizconfig (0.8.4-2) UNRELEASED; urgency=low +libcompizconfig (0.8.4-2) unstable; urgency=medium + * Medium urgency to fix RC bug in testing. * Disable protobuf to work around #572923. * Link libcompizconfig with -ldl (closes: #558875) - -- Julien Cristau <[email protected]> Sun, 04 Apr 2010 18:16:35 +0200 + -- Julien Cristau <[email protected]> Sun, 04 Apr 2010 18:25:06 +0200 libcompizconfig (0.8.4-1) unstable; urgency=low commit f6c05d54020ae17d1c6e92fe4eb489055427bca1 Author: Julien Cristau <[email protected]> Date: Sun Apr 4 18:24:28 2010 +0200 Link libcompizconfig with -ldl (closes: #558875) diff --git a/debian/changelog b/debian/changelog index c194e1b..6a4590b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libcompizconfig (0.8.4-2) UNRELEASED; urgency=low * Disable protobuf to work around #572923. + * Link libcompizconfig with -ldl (closes: #558875) -- Julien Cristau <[email protected]> Sun, 04 Apr 2010 18:16:35 +0200 diff --git a/src/Makefile.am b/src/Makefile.am index 788bda2..92cd09f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,7 +46,7 @@ libcompizconfig_la_SOURCES = \ ccs-private.h \ iniparser.h -libcompizconfig_la_LIBADD = @LIBXML2_LIBS@ @LIBX11_LIBS@ $(PROTOBUF_LIB) +libcompizconfig_la_LIBADD = -ldl @LIBXML2_LIBS@ @LIBX11_LIBS@ $(PROTOBUF_LIB) lib_LTLIBRARIES=libcompizconfig.la commit 77ec06a85ed066621df42a964acf6a719bb0381e Author: Julien Cristau <[email protected]> Date: Sun Apr 4 18:17:31 2010 +0200 Disable protobuf to work around #572923. diff --git a/debian/changelog b/debian/changelog index fc60f96..c194e1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libcompizconfig (0.8.4-2) UNRELEASED; urgency=low + + * Disable protobuf to work around #572923. + + -- Julien Cristau <[email protected]> Sun, 04 Apr 2010 18:16:35 +0200 + libcompizconfig (0.8.4-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index d375c61..429b694 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,7 @@ Priority: extra Maintainer: Debian X Strike Force <[email protected]> Uploaders: Sean Finney <[email protected]> Build-Depends: debhelper (>= 5), autoconf, automake1.9, autotools-dev, compiz-dev (>= 0.8.4-1), intltool, libtool, libglib2.0-dev, - libprotobuf-dev, libxml2-dev, libxslt1-dev, - protobuf-compiler Standards-Version: 3.8.1 Section: libs Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/libcompizconfig.git diff --git a/debian/rules b/debian/rules index 4fb5069..d102b19 100755 --- a/debian/rules +++ b/debian/rules @@ -28,7 +28,7 @@ AUTOFOO_DELETE:=Makefile.in aclocal.m4 backend/Makefile.in config/Makefile.in \ configure: configure-stamp configure-stamp: dh_testdir - ./autogen.sh --prefix=/usr --sysconfdir=/etc + ./autogen.sh --prefix=/usr --sysconfdir=/etc --disable-protobuf touch configure-stamp build: build-stamp -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
