[Pkg-gtkpod-devel] r309 - libgpod/trunk/debian

[djpig at alioth.debian.org]

Author: djpig
Date: 2008-04-18 20:27:11 +0000 (Fri, 18 Apr 2008)
New Revision: 309

Modified:
   libgpod/trunk/debian/changelog
   libgpod/trunk/debian/control
   libgpod/trunk/debian/libgpod-common.install
   libgpod/trunk/debian/rules
Log:
Don't try to build the hal callout on kfreebsd, because it fails
to build there.


Modified: libgpod/trunk/debian/changelog
===================================================================
--- libgpod/trunk/debian/changelog	2008-04-17 19:18:55 UTC (rev 308)
+++ libgpod/trunk/debian/changelog	2008-04-18 20:27:11 UTC (rev 309)
@@ -2,8 +2,10 @@
 
   * Add build-dependency on xsltproc to include API documentation in
     the gpod.py file.
+  * Don't try to build the hal callout on kfreebsd, because it fails
+    to build there.
 
- -- Frank Lichtenheld <djpig at debian.org>  Fri, 25 Jan 2008 18:36:15 +0100
+ -- Frank Lichtenheld <djpig at debian.org>  Fri, 18 Apr 2008 22:09:23 +0200
 
 libgpod (0.6.0-3) unstable; urgency=medium
 

Modified: libgpod/trunk/debian/control
===================================================================
--- libgpod/trunk/debian/control	2008-04-17 19:18:55 UTC (rev 308)
+++ libgpod/trunk/debian/control	2008-04-18 20:27:11 UTC (rev 309)
@@ -3,7 +3,7 @@
 Section: libs
 Maintainer: gtkpod Maintainers <pkg-gtkpod-devel at lists.alioth.debian.org>
 Uploaders: Frank Lichtenheld <djpig at debian.org>, Nico Golde <nion at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, libglib2.0-dev (>= 2.8), libgtk2.0-dev, libhal-dev, libsgutils1-dev, intltool, pkg-config,
+Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, libglib2.0-dev (>= 2.8), libgtk2.0-dev, libhal-dev [!kfreebsd-i386 !kfreebsd-amd64], libsgutils1-dev, intltool, pkg-config,
  swig, python (>= 2.3.5-7), python-all-dev, python-central (>= 0.5), python-mutagen, python-gobject-dev, xsltproc, dpatch
 Homepage: http://www.gtkpod.org/libgpod.html
 Standards-Version: 3.7.2

Modified: libgpod/trunk/debian/libgpod-common.install
===================================================================
--- libgpod/trunk/debian/libgpod-common.install	2008-04-17 19:18:55 UTC (rev 308)
+++ libgpod/trunk/debian/libgpod-common.install	2008-04-18 20:27:11 UTC (rev 309)
@@ -1,3 +1,2 @@
 debian/tmp/usr/share
 debian/tmp/usr/bin
-debian/tmp/usr/lib/hal

Modified: libgpod/trunk/debian/rules
===================================================================
--- libgpod/trunk/debian/rules	2008-04-17 19:18:55 UTC (rev 308)
+++ libgpod/trunk/debian/rules	2008-04-18 20:27:11 UTC (rev 309)
@@ -8,6 +8,7 @@
 
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 
+export DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -17,6 +18,11 @@
 else
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
+with_hal = yes
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+  with_hal = no
+  confflags += --without-hal
+endif
 
 DEB_CONFIGURE_INVOKE=$(CURDIR)/configure $(confflags) --prefix=/usr --includedir="\$${prefix}/include" --mandir="\$${prefix}/share/man" --infodir="\$${prefix}/share/info" --sysconfdir=/etc --localstatedir=/var --libexecdir="\$${prefix}/lib/libgpod" --disable-maintainer-mode --disable-dependency-tracking --srcdir=$(CURDIR)
 
@@ -76,7 +82,12 @@
 	dh_installexamples -a
 	sed 's#debian/tmp/##' debian/libgpod$(SONAME).install > debian/libgpod$(SONAME)-nogtk.install
 	sed 's#debian/tmp/##' debian/libgpod-dev.install > debian/libgpod-nogtk-dev.install
-	dh_install -a -Nlibgpod$(SONAME)-nogtk -Nlibgpod-nogtk-dev
+	dh_install -a -Nlibgpod-common -Nlibgpod$(SONAME)-nogtk -Nlibgpod-nogtk-dev
+ifeq ($(with_hal), yes)
+	dh_install -plibgpod-common --autodest debian/tmp/usr/lib/hal
+else
+	dh_install -plibgpod-common
+endif
 	dh_install -plibgpod$(SONAME)-nogtk -plibgpod-nogtk-dev  --sourcedir=debian/tmp-nogtk
 	install -D -m 0644 debian/libgpod$(SONAME)-nogtk.lintian-overrides debian/libgpod$(SONAME)-nogtk/usr/share/lintian/overrides/libgpod$(SONAME)-nogtk
 	dh_pycentral -ppython-gpod