r14883 - in /packages/unstable: gnome-user-share/debian/changelog gnome-user-share/debian/control gnome-user-share/debian/rules shared-mime-info/

[slomo at users.alioth.debian.org]

Author: slomo
Date: Sat Mar  8 09:21:44 2008
New Revision: 14883

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14883
Log:
* remove here, this is in pkg-freedesktop now

Removed:
    packages/unstable/shared-mime-info/
Modified:
    packages/unstable/gnome-user-share/debian/changelog
    packages/unstable/gnome-user-share/debian/control
    packages/unstable/gnome-user-share/debian/rules

Modified: packages/unstable/gnome-user-share/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-user-share/debian/changelog?rev=14883&op=diff
==============================================================================
--- packages/unstable/gnome-user-share/debian/changelog (original)
+++ packages/unstable/gnome-user-share/debian/changelog Sat Mar  8 09:21:44 2008
@@ -1,3 +1,12 @@
+gnome-user-share (0.11-3) unstable; urgency=low
+
+  * debian/control:
+    + Update to Standards-Version 3.7.3, no additional changes needed.
+  * debian/rules:
+    + Use LDFLAGS for linking the gnome-user-share-session helper too.
+
+ -- Sebastian Dröge <slomo at debian.org>  Sun, 06 Jan 2008 19:52:14 +0100
+
 gnome-user-share (0.11-2) unstable; urgency=low
 
   * Upload to unstable

Modified: packages/unstable/gnome-user-share/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-user-share/debian/control?rev=14883&op=diff
==============================================================================
--- packages/unstable/gnome-user-share/debian/control (original)
+++ packages/unstable/gnome-user-share/debian/control Sat Mar  8 09:21:44 2008
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Sebastian Dröge <slomo 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>, 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>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Build-Depends: cdbs, debhelper (>= 5), gnome-pkg-tools, libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libglib2.0-dev (>= 2.2.0), libx11-dev, libxt-dev, libgtk2.0-dev (>= 2.4.0), libglade2-dev, libgconf2-dev, libavahi-client-dev (>= 0.6), libavahi-glib-dev (>= 0.6), libdbus-1-dev, libxml-parser-perl
 Standards-Version: 3.7.2
 

Modified: packages/unstable/gnome-user-share/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-user-share/debian/rules?rev=14883&op=diff
==============================================================================
--- packages/unstable/gnome-user-share/debian/rules (original)
+++ packages/unstable/gnome-user-share/debian/rules Sat Mar  8 09:21:44 2008
@@ -6,13 +6,15 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_CONFIGURE_SCRIPT_ENV += HTTPD="/usr/sbin/apache2" LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+DEB_CONFIGURE_SCRIPT_ENV += HTTPD="/usr/sbin/apache2"
 DEB_CONFIGURE_EXTRA_FLAGS += --with-httpd-version=2.2
 
 build/gnome-user-share::
-	gcc $(CFLAGS) -o debian/gnome-user-share-session \
-		`pkg-config --libs --cflags glib-2.0 gconf-2.0` \
-		debian/gnome-user-share-session.c
+	$(CC) $(CFLAGS) \
+	    `pkg-config --libs --cflags glib-2.0 gconf-2.0 gobject-2.0` \
+	    $(LDFLAGS) -o debian/gnome-user-share-session \
+	    debian/gnome-user-share-session.c
 
 install/gnome-user-share::
 	dh_install debian/gnome-user-share-session \