r11006 - in /packages/unstable/mozilla-bonobo/debian: changelog control control.in rules

[lool at users.alioth.debian.org]

Author: lool
Date: Wed May 16 13:54:46 2007
New Revision: 11006

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11006
Log:
* Cleanups.
* Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on
  cdbs >= 0.4.41.

Modified:
    packages/unstable/mozilla-bonobo/debian/changelog
    packages/unstable/mozilla-bonobo/debian/control
    packages/unstable/mozilla-bonobo/debian/control.in
    packages/unstable/mozilla-bonobo/debian/rules

Modified: packages/unstable/mozilla-bonobo/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mozilla-bonobo/debian/changelog?rev=11006&op=diff
==============================================================================
--- packages/unstable/mozilla-bonobo/debian/changelog (original)
+++ packages/unstable/mozilla-bonobo/debian/changelog Wed May 16 13:54:46 2007
@@ -3,8 +3,11 @@
   * New patch, 15_am-maintainer-mode, adds AM_MAINTAINER_MODE to configure.in;
     update patch 70_mandatory-relibtoolize; fixes FTBFS when built twice in a
     row; closes: #424579.
+  * Cleanups.
+  * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on
+    cdbs >= 0.4.41.
 
- -- Loic Minier <lool at dooz.org>  Wed, 16 May 2007 15:51:55 +0200
+ -- Loic Minier <lool at dooz.org>  Wed, 16 May 2007 15:54:10 +0200
 
 mozilla-bonobo (0.4.2.1-5) unstable; urgency=low
 

Modified: packages/unstable/mozilla-bonobo/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mozilla-bonobo/debian/control?rev=11006&op=diff
==============================================================================
--- packages/unstable/mozilla-bonobo/debian/control (original)
+++ packages/unstable/mozilla-bonobo/debian/control Wed May 16 13:54:46 2007
@@ -2,8 +2,8 @@
 Section: gnome
 Priority: optional
 Maintainer: Andrew Lau <netsnipe at users.sourceforge.net>
-Build-Depends: autotools-dev, cdbs, debhelper (>= 5), dh-buildinfo, gnome-pkg-tools, libgnomeui-dev, libgnomeprint2.2-dev, libxul-dev, libnspr4-dev
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Build-Depends: autotools-dev, cdbs (>= 0.4.41), debhelper (>= 5), dh-buildinfo, gnome-pkg-tools, libgnomeui-dev, libgnomeprint2.2-dev, libxul-dev, libnspr4-dev
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
 Standards-Version: 3.7.2
 
 Package: mozilla-bonobo

Modified: packages/unstable/mozilla-bonobo/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mozilla-bonobo/debian/control.in?rev=11006&op=diff
==============================================================================
--- packages/unstable/mozilla-bonobo/debian/control.in (original)
+++ packages/unstable/mozilla-bonobo/debian/control.in Wed May 16 13:54:46 2007
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Andrew Lau <netsnipe at users.sourceforge.net>
-Build-Depends: autotools-dev, cdbs, debhelper (>= 5), dh-buildinfo, gnome-pkg-tools, libgnomeui-dev, libgnomeprint2.2-dev, libxul-dev, libnspr4-dev
+Build-Depends: autotools-dev, cdbs (>= 0.4.41), debhelper (>= 5), dh-buildinfo, gnome-pkg-tools, libgnomeui-dev, libgnomeprint2.2-dev, libxul-dev, libnspr4-dev
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.7.2
 

Modified: packages/unstable/mozilla-bonobo/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mozilla-bonobo/debian/rules?rev=11006&op=diff
==============================================================================
--- packages/unstable/mozilla-bonobo/debian/rules (original)
+++ packages/unstable/mozilla-bonobo/debian/rules Wed May 16 13:54:46 2007
@@ -1,12 +1,4 @@
 #!/usr/bin/make -f
-
-# ====================================================================
-# debian/rules for Mozilla Bonobo
-# Common Debian Build System: (C) 2002 Colin Walters
-#
-# Author: Andrew Lau <netsnipe at users.sourceforge.net>
-# $Id$
-# ====================================================================
 
 GNOME_DOWNLOAD_URL = http://download.savannah.gnu.org/releases/moz-bonobo/$(GNOME_TARBALL)
 
@@ -18,12 +10,12 @@
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 # Compilation options
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-DEB_CONFIGURE_EXTRA_FLAGS := \
-	--with-plugin-install-dir=\$${libdir}/mozilla-bonobo
+LDFLAGS += -Wl,-O1 -Wl,--as-needed
+DEB_CONFIGURE_EXTRA_FLAGS += \
+			--with-plugin-install-dir=\$${libdir}/mozilla-bonobo
 
 binary-post-install/mozilla-bonobo::
-# FHS compliance
+	# FHS compliance
 	-rm -rf debian/mozilla-bonobo/usr/doc
-# Record build-time version information
+	# Record build-time version information
 	dh_buildinfo