r16741 - in /desktop/unstable/epiphany-browser/debian: changelog control control.in rules

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Aug  8 13:36:20 2008
New Revision: 16741

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16741
Log:
Only enable network-manager integration on linux; thanks Petr Salinger;
  closes: #494312.
  - Don't build-dep on network-manager-dev on !hurd-i386 !kfreebsd-i386
    !kfreebsd-amd64.
  - Only pass --enable-network-manager to configure if DEB_HOST_ARCH_OS is
    linux.

Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/control
    desktop/unstable/epiphany-browser/debian/control.in
    desktop/unstable/epiphany-browser/debian/rules

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=16741&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Fri Aug  8 13:36:20 2008
@@ -8,6 +8,12 @@
   [ Loic Minier ]
   * Flip symlink source and target in debian/epiphany-browser.links; fixes
     broken symlink and missing man page.
+  * Only enable network-manager integration on linux; thanks Petr Salinger;
+    closes: #494312.
+    - Don't build-dep on network-manager-dev on !hurd-i386 !kfreebsd-i386
+      !kfreebsd-amd64.
+    - Only pass --enable-network-manager to configure if DEB_HOST_ARCH_OS is
+      linux.
 
  -- Josselin Mouette <joss at debian.org>  Wed, 16 Jul 2008 11:44:49 +0200
 

Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=16741&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control (original)
+++ desktop/unstable/epiphany-browser/debian/control Fri Aug  8 13:36:20 2008
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5),
                pkg-config,
                libglib2.0-dev (>= 2.16.0),
@@ -28,7 +28,7 @@
                gnome-doc-utils (>= 0.3.2),
                intltool (>= 0.35.0),
                x11proto-core-dev,
-               network-manager-dev,
+               network-manager-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
                quilt,
                libenchant-dev (>= 1.0),
                libavahi-gobject-dev (>= 0.6.22),

Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=16741&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in (original)
+++ desktop/unstable/epiphany-browser/debian/control.in Fri Aug  8 13:36:20 2008
@@ -28,7 +28,7 @@
                gnome-doc-utils (>= 0.3.2),
                intltool (>= 0.35.0),
                x11proto-core-dev,
-               network-manager-dev,
+               network-manager-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
                quilt,
                libenchant-dev (>= 1.0),
                libavahi-gobject-dev (>= 0.6.22),

Modified: desktop/unstable/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/rules?rev=16741&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/rules (original)
+++ desktop/unstable/epiphany-browser/debian/rules Fri Aug  8 13:36:20 2008
@@ -30,8 +30,12 @@
 		--enable-dbus \
 		--disable-scrollkeeper \
 		--enable-zeroconf \
-		--enable-python \
+		--enable-python
+
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+common_configure_flags += \
 		--enable-network-manager
+endif
 
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 	common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE)