[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/2.91.4.3-1-5-gcab7d46
Emilio Pozuelo Monfort
emilio.pozuelo at collabora.co.uk
Thu Jan 13 11:39:49 UTC 2011
The following commit has been merged in the debian branch:
commit cab7d46ee731c03680c5e75436690fea94c0cb7c
Author: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
Date: Tue Jan 11 14:25:23 2011 +0000
Reuse $(DEB_BUILD_ARCH_OS) from CDBS.
diff --git a/debian/changelog b/debian/changelog
index 0b4e3eb..0a64326 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ empathy (2.91.5-1) UNRELEASED; urgency=low
* New upstream release.
+ d/p/0001-Simplify-filter-adding-code-by-just-using-gdk_x11-fu.patch:
- Removed, included upstream.
+ * debian/rules:
+ + Reuse $(DEB_BUILD_ARCH_OS) from CDBS.
-- Emilio Pozuelo Monfort <pochu at debian.org> Tue, 11 Jan 2011 13:45:17 +0000
diff --git a/debian/rules b/debian/rules
index 605f3fe..3ea4ad5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \
DEB_DBG_PACKAGE_empathy = empathy-dbg
-DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-
ifeq ($(DEB_BUILD_ARCH_OS),linux)
DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=nm --enable-location=yes
else ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
--
Empathy packaging
More information about the Pkg-telepathy-commits
mailing list