r9832 - in /desktop/unstable/libwnck/debian: changelog control control.in rules

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Apr 12 16:16:05 2007
New Revision: 9832

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

Modified:
    desktop/unstable/libwnck/debian/changelog
    desktop/unstable/libwnck/debian/control
    desktop/unstable/libwnck/debian/control.in
    desktop/unstable/libwnck/debian/rules

Modified: desktop/unstable/libwnck/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck/debian/changelog?rev=9832&op=diff
==============================================================================
--- desktop/unstable/libwnck/debian/changelog (original)
+++ desktop/unstable/libwnck/debian/changelog Thu Apr 12 16:16:05 2007
@@ -1,8 +1,10 @@
 libwnck (2.18.0-2) UNRELEASED; urgency=low
 
   * Upload to unstable; drop check-dist include.
-
- -- Loic Minier <lool at dooz.org>  Thu, 12 Apr 2007 18:07:59 +0200
+  * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-depend
+    on cdbs >= 0.4.41; cleanups.
+
+ -- Loic Minier <lool at dooz.org>  Thu, 12 Apr 2007 18:15:45 +0200
 
 libwnck (2.18.0-1) experimental; urgency=low
 

Modified: desktop/unstable/libwnck/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck/debian/control?rev=9832&op=diff
==============================================================================
--- desktop/unstable/libwnck/debian/control (original)
+++ desktop/unstable/libwnck/debian/control Thu Apr 12 16:16:05 2007
@@ -2,9 +2,9 @@
 Section: libs
 Priority: optional
 Maintainer: Ondřej Surý <ondrej at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, 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>, Kilian Krause <kilian 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>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marco Cabizza <marco87 at gmail.com>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev (>= 2.8.17-1), gettext, libstartup-notification0-dev (>= 0.7-1), cdbs, gnome-pkg-tools (>= 0.10), docbook-xml, libxt-dev, libxres-dev, libxml-parser-perl
+Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev (>= 2.8.17-1), gettext, libstartup-notification0-dev (>= 0.7-1), cdbs (>= 0.4.41), gnome-pkg-tools (>= 0.10), docbook-xml, libxt-dev, libxres-dev, libxml-parser-perl
 
 Package: libwnck18
 Architecture: any

Modified: desktop/unstable/libwnck/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck/debian/control.in?rev=9832&op=diff
==============================================================================
--- desktop/unstable/libwnck/debian/control.in (original)
+++ desktop/unstable/libwnck/debian/control.in Thu Apr 12 16:16:05 2007
@@ -4,7 +4,7 @@
 Maintainer: Ondřej Surý <ondrej at debian.org>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev (>= 2.8.17-1), gettext, libstartup-notification0-dev (>= 0.7-1), cdbs, gnome-pkg-tools (>= 0.10), docbook-xml, libxt-dev, libxres-dev, libxml-parser-perl
+Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev (>= 2.8.17-1), gettext, libstartup-notification0-dev (>= 0.7-1), cdbs (>= 0.4.41), gnome-pkg-tools (>= 0.10), docbook-xml, libxt-dev, libxres-dev, libxml-parser-perl
 
 Package: libwnck18
 Architecture: any

Modified: desktop/unstable/libwnck/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck/debian/rules?rev=9832&op=diff
==============================================================================
--- desktop/unstable/libwnck/debian/rules (original)
+++ desktop/unstable/libwnck/debian/rules Thu Apr 12 16:16:05 2007
@@ -9,11 +9,11 @@
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1)
+version := $(shell sed -n 's/^Package: //p' debian/control | head -n 1)
 
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,-O1"
+LDFLAGS += -Wl,-z,defs -Wl,-O1
 
-DEB_CONFIGURE_EXTRA_FLAGS := \
+DEB_CONFIGURE_EXTRA_FLAGS += \
 	--disable-gtk-doc \
 	--with-html-dir=\$${prefix}/share/doc/libwnck-dev/html \
 	--libexecdir=\$${prefix}/lib/${version}