[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/3.1.4-1-1-g1d9a43a
Laurent Bigonville
bigon at bigon.be
Thu Jul 28 09:31:40 UTC 2011
The following commit has been merged in the debian branch:
commit 1d9a43ab0fb98859a60482b0ac681837db8db4bc
Author: Laurent Bigonville <bigon at bigon.be>
Date: Thu Jul 28 11:28:15 2011 +0200
Only enable gudev support on linux architectures
* debian/control:
- Only require libgudev-1.0-dev on linux architectures
* debian/rules:
- Only enable gudev support on linux architectures
diff --git a/debian/changelog b/debian/changelog
index a1e0c54..2f88920 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+empathy (3.1.4-2) UNRELEASED; urgency=low
+
+ * debian/control:
+ - Only require libgudev-1.0-dev on linux architectures
+ * debian/rules:
+ - Only enable gudev support on linux architectures
+
+ -- Laurent Bigonville <bigon at debian.org> Thu, 28 Jul 2011 11:27:01 +0200
+
empathy (3.1.4-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 2d831e9..cedd29a 100644
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,7 @@ Build-Depends: cdbs (>= 0.4.90),
libclutter-gtk-1.0-dev,
libclutter-gst-dev,
libtelepathy-farstream-dev,
- libgudev-1.0-dev
+ libgudev-1.0-dev [linux-any]
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-telepathy/empathy.git
Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/empathy.git
diff --git a/debian/rules b/debian/rules
index 26fa399..587a19f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,18 +16,17 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \
--enable-map=yes \
--enable-geocode=yes \
--with-cheese \
- --enable-gudev \
--with-eds \
--enable-call \
--enable-call-logs \
--disable-schemas-compile
ifeq ($(DEB_BUILD_ARCH_OS),linux)
- DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=nm --enable-location=yes
+ DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=nm --enable-location=yes --enable-gudev=yes
else ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
- DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=no --enable-location=yes
+ DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=no --enable-location=yes --enable-gudev=no
else
- DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=no --enable-location=no
+ DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=no --enable-location=no --enable-gudev=no
endif
DEB_DH_MAKESHLIBS_ARGS_empathy = --no-act
--
Empathy packaging
More information about the Pkg-telepathy-commits
mailing list