r9966 - in /desktop/unstable/file-roller/debian: changelog control control.in rules

[lool at users.alioth.debian.org]

Author: lool
Date: Sat Apr 14 20:51:35 2007
New Revision: 9966

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

Modified:
    desktop/unstable/file-roller/debian/changelog
    desktop/unstable/file-roller/debian/control
    desktop/unstable/file-roller/debian/control.in
    desktop/unstable/file-roller/debian/rules

Modified: desktop/unstable/file-roller/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/changelog?rev=9966&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/changelog (original)
+++ desktop/unstable/file-roller/debian/changelog Sat Apr 14 20:51:35 2007
@@ -1,10 +1,13 @@
-file-roller (2.18.0-3) UNRELEASED; urgency=low
+file-roller (2.18.0-3) unstable; urgency=low
 
   * Upload to unstable; drop check-dist include.
   * Wrap build-deps and deps.
   * Update URL in copyright.
-
- -- Loic Minier <lool at dooz.org>  Sat, 14 Apr 2007 22:26:31 +0200
+  * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on
+    cdbs >= 0.4.41.
+  * Cleanups.
+
+ -- Loic Minier <lool at dooz.org>  Sat, 14 Apr 2007 22:44:53 +0200
 
 file-roller (2.18.0-2) experimental; urgency=low
 

Modified: desktop/unstable/file-roller/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/control?rev=9966&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/control (original)
+++ desktop/unstable/file-roller/debian/control Sat Apr 14 20:51:35 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Clément Stenac <zorglub 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>
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.41),
                quilt,
                debhelper (>= 5),
                libglib2.0-dev (>= 2.12.0),

Modified: desktop/unstable/file-roller/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/control.in?rev=9966&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/control.in (original)
+++ desktop/unstable/file-roller/debian/control.in Sat Apr 14 20:51:35 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Clément Stenac <zorglub at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.41),
                quilt,
                debhelper (>= 5),
                libglib2.0-dev (>= 2.12.0),

Modified: desktop/unstable/file-roller/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/rules?rev=9966&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/rules (original)
+++ desktop/unstable/file-roller/debian/rules Sat Apr 14 20:51:35 2007
@@ -7,12 +7,13 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_INSTALL_MANPAGES_file-roller := debian/file-roller.1
+DEB_INSTALL_MANPAGES_file-roller += debian/file-roller.1
 
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,-O1 -Wl,--as-needed"
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS := -n
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
+
+DEB_DH_MAKESHLIBS_ARGS += -n
 
 binary-install/file-roller::
 	dh_installmime