Source: geoclue Version: 0.11.1-1 I suggest --libexecdir points to /usr/lib/geoclue. This should also fix Lintian's binary-without-manpage warning.
There are two patches attached. geoclue_fixlibexcdir.diff will fix all debian/*.install and the debian/rules file, the other one will also make use of CDBS for easy maintenance. Both patches also fix a typo in debian/control and bump build-dep on gtk-doc-tools.
diff --git a/debian/control b/debian/control index 08ccb5b..ae0752d 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,14 @@ Source: geoclue Section: utils Priority: optional Maintainer: Craig Andrews <[email protected]> -Build-Depends: debhelper (>= 4), libtool, libgconf2-dev, libgtk2.0-dev, libdbus-glib-1-dev, libgps-dev, libsoup2.2-dev, libxml2-dev, network-manager-dev, libgammu-dev, xsltproc +Build-Depends: debhelper (>= 5), libtool, libgconf2-dev, libgtk2.0-dev, libdbus-glib-1-dev, libgps-dev, libsoup2.2-dev, libxml2-dev, network-manager-dev, libgammu-dev, xsltproc, gtk-doc-tools Standards-Version: 3.8.0 +Homepage: http://www.freedesktop.org/wiki/Software/GeoClue Package: geoclue Section: utils Architecture: any Depends: ${shlibs:Depends} -Homepage: http://www.freedesktop.org/wiki/Software/GeoClue Description: Geographic information framework GeoClue provides applications access to various geographical information sources using a D-Bus api or a C library. @@ -28,11 +28,11 @@ Description: C API for GeoClue Package: libgeoclue-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, libgeoclue0 (= ${binary:Version}) +Depends: ${shlibs:Depends}, libgeoclue0 (= ${binary:Version}), pkg-config, libglib2.0-dev, libxml2-dev Description: C API for GeoClue (development files) libgeoclue is a convenience wrapper for the GeoClue service, and the recommended way to use GeoClue in the C language. - + Package: geoclue-manual Section: utils Architecture: any @@ -105,7 +105,7 @@ Package: geoclue-localnet Section: utils Architecture: any Depends: ${shlibs:Depends}, geoclue -Description: Position server for GeoClue (GPS) +Description: Position server for GeoClue (localnet) GeoClue provides applications access to various geographical information sources using a D-Bus api or a C library. . diff --git a/debian/geoclue-examples.install b/debian/geoclue-examples.install index 0f93310..637ca8e 100644 --- a/debian/geoclue-examples.install +++ b/debian/geoclue-examples.install @@ -1,3 +1,3 @@ -/usr/bin/geoclue-example -/usr/share/geoclue-providers/geoclue-example.provider -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Example.service +debian/tmp/usr/lib/geoclue/geoclue-example +debian/tmp/usr/share/geoclue-providers/geoclue-example.provider +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Example.service diff --git a/debian/geoclue-geonames.install b/debian/geoclue-geonames.install index 5b1ddd4..6b7c9c5 100644 --- a/debian/geoclue-geonames.install +++ b/debian/geoclue-geonames.install @@ -1,3 +1,3 @@ -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Geonames.service -/usr/share/geoclue-providers/geoclue-geonames.provider -/usr/bin/geoclue-geonames +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Geonames.service +debian/tmp/usr/share/geoclue-providers/geoclue-geonames.provider +debian/tmp/usr/lib/geoclue/geoclue-geonames diff --git a/debian/geoclue-gpsd.install b/debian/geoclue-gpsd.install index 2cf8fe4..20693e5 100644 --- a/debian/geoclue-gpsd.install +++ b/debian/geoclue-gpsd.install @@ -1,3 +1,3 @@ -/usr/bin/geoclue-gpsd -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service -/usr/share/geoclue-providers/geoclue-gpsd.provider +debian/tmp/usr/lib/geoclue/geoclue-gpsd +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service +debian/tmp/usr/share/geoclue-providers/geoclue-gpsd.provider diff --git a/debian/geoclue-gsmloc.install b/debian/geoclue-gsmloc.install index 37b5bda..1000e59 100644 --- a/debian/geoclue-gsmloc.install +++ b/debian/geoclue-gsmloc.install @@ -1,3 +1,3 @@ -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service -/usr/share/geoclue-providers/geoclue-gsmloc.provider -/usr/bin/geoclue-gsmloc +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service +debian/tmp/usr/share/geoclue-providers/geoclue-gsmloc.provider +debian/tmp/usr/lib/geoclue/geoclue-gsmloc diff --git a/debian/geoclue-hostip.install b/debian/geoclue-hostip.install index c69eb66..6216676 100644 --- a/debian/geoclue-hostip.install +++ b/debian/geoclue-hostip.install @@ -1,4 +1,3 @@ -/usr/bin/geoclue-hostip -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Hostip.service -/usr/share/geoclue-providers/geoclue-hostip.provider - +debian/tmp/usr/lib/geoclue/geoclue-hostip +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Hostip.service +debian/tmp/usr/share/geoclue-providers/geoclue-hostip.provider diff --git a/debian/geoclue-localnet.install b/debian/geoclue-localnet.install index 18dbf8a..04de821 100644 --- a/debian/geoclue-localnet.install +++ b/debian/geoclue-localnet.install @@ -1,4 +1,3 @@ -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Localnet.service -/usr/share/geoclue-providers/geoclue-localnet.provider -/usr/bin/geoclue-localnet - +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Localnet.service +debian/tmp/usr/share/geoclue-providers/geoclue-localnet.provider +debian/tmp/usr/lib/geoclue/geoclue-localnet diff --git a/debian/geoclue-manual.install b/debian/geoclue-manual.install index be19bde..07004fe 100644 --- a/debian/geoclue-manual.install +++ b/debian/geoclue-manual.install @@ -1,3 +1,3 @@ -/usr/bin/geoclue-manual -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service -/usr/share/geoclue-providers/geoclue-manual.provider +debian/tmp/usr/lib/geoclue/geoclue-manual +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service +debian/tmp/usr/share/geoclue-providers/geoclue-manual.provider diff --git a/debian/geoclue-plazes.install b/debian/geoclue-plazes.install index e8cbd7e..8940b6e 100644 --- a/debian/geoclue-plazes.install +++ b/debian/geoclue-plazes.install @@ -1,3 +1,3 @@ -/usr/bin/geoclue-plazes -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service -/usr/share/geoclue-providers/geoclue-plazes.provider +debian/tmp/usr/lib/geoclue/geoclue-plazes +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service +debian/tmp/usr/share/geoclue-providers/geoclue-plazes.provider diff --git a/debian/geoclue-yahoo.install b/debian/geoclue-yahoo.install index cfa8e02..e8bc7c9 100644 --- a/debian/geoclue-yahoo.install +++ b/debian/geoclue-yahoo.install @@ -1,3 +1,3 @@ -/usr/bin/geoclue-yahoo -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service -/usr/share/geoclue-providers/geoclue-yahoo.provider +debian/tmp/usr/lib/geoclue/geoclue-yahoo +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service +debian/tmp/usr/share/geoclue-providers/geoclue-yahoo.provider diff --git a/debian/geoclue.install b/debian/geoclue.install index 67e6334..2b29b96 100644 --- a/debian/geoclue.install +++ b/debian/geoclue.install @@ -1,3 +1,3 @@ -/usr/bin/geoclue-master -/usr/bin/geoclue-test-gui -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Master.service +debian/tmp/usr/bin/geoclue-test-gui +debian/tmp/usr/lib/geoclue/geoclue-master +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Master.service diff --git a/debian/libgeoclue-dev.install b/debian/libgeoclue-dev.install index bfc557a..963fdb9 100644 --- a/debian/libgeoclue-dev.install +++ b/debian/libgeoclue-dev.install @@ -1,6 +1,5 @@ -/usr/share/gtk-doc/* -/usr/include -/usr/lib/pkgconfig -/usr/lib/*.a -/usr/lib/*.la -/usr/lib/libgeoclue.so +debian/tmp/usr/include/* +debian/tmp/usr/lib/pkgconfig/* +debian/tmp/usr/lib/libgeoclue.*a +debian/tmp/usr/lib/libgeoclue.so +debian/tmp/usr/share/gtk-doc/* diff --git a/debian/libgeoclue0.install b/debian/libgeoclue0.install index 1b2ee9d..79bbe2f 100644 --- a/debian/libgeoclue0.install +++ b/debian/libgeoclue0.install @@ -1 +1 @@ -/usr/lib/libgeoclue.so.* +debian/tmp/usr/lib/*.so.* diff --git a/debian/rules b/debian/rules index b2ade0c..f059f0b 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,7 @@ configure-stamp: dh_testdir ln -sf /usr/share/misc/config.sub config.sub ln -sf /usr/share/misc/config.guess config.guess - ./configure --libexecdir=/usr/bin/ --enable-gpsd --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) + ./configure --libexecdir=/usr/lib/geoclue/ --enable-gpsd --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) touch configure-stamp build: build-stamp
diff --git a/debian/control b/debian/control index 08ccb5b..9310ca0 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,14 @@ Source: geoclue Section: utils Priority: optional Maintainer: Craig Andrews <[email protected]> -Build-Depends: debhelper (>= 4), libtool, libgconf2-dev, libgtk2.0-dev, libdbus-glib-1-dev, libgps-dev, libsoup2.2-dev, libxml2-dev, network-manager-dev, libgammu-dev, xsltproc +Build-Depends: debhelper (>= 5), libtool, libgconf2-dev, libgtk2.0-dev, libdbus-glib-1-dev, libgps-dev, libsoup2.2-dev, libxml2-dev, network-manager-dev, libgammu-dev, xsltproc, cdbs, gtk-doc-tools Standards-Version: 3.8.0 +Homepage: http://www.freedesktop.org/wiki/Software/GeoClue Package: geoclue Section: utils Architecture: any Depends: ${shlibs:Depends} -Homepage: http://www.freedesktop.org/wiki/Software/GeoClue Description: Geographic information framework GeoClue provides applications access to various geographical information sources using a D-Bus api or a C library. @@ -28,11 +28,11 @@ Description: C API for GeoClue Package: libgeoclue-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, libgeoclue0 (= ${binary:Version}) +Depends: ${shlibs:Depends}, libgeoclue0 (= ${binary:Version}), pkg-config, libglib2.0-dev, libxml2-dev Description: C API for GeoClue (development files) libgeoclue is a convenience wrapper for the GeoClue service, and the recommended way to use GeoClue in the C language. - + Package: geoclue-manual Section: utils Architecture: any @@ -105,7 +105,7 @@ Package: geoclue-localnet Section: utils Architecture: any Depends: ${shlibs:Depends}, geoclue -Description: Position server for GeoClue (GPS) +Description: Position server for GeoClue (localnet) GeoClue provides applications access to various geographical information sources using a D-Bus api or a C library. . diff --git a/debian/geoclue-examples.install b/debian/geoclue-examples.install index 0f93310..637ca8e 100644 --- a/debian/geoclue-examples.install +++ b/debian/geoclue-examples.install @@ -1,3 +1,3 @@ -/usr/bin/geoclue-example -/usr/share/geoclue-providers/geoclue-example.provider -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Example.service +debian/tmp/usr/lib/geoclue/geoclue-example +debian/tmp/usr/share/geoclue-providers/geoclue-example.provider +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Example.service diff --git a/debian/geoclue-geonames.install b/debian/geoclue-geonames.install index 5b1ddd4..6b7c9c5 100644 --- a/debian/geoclue-geonames.install +++ b/debian/geoclue-geonames.install @@ -1,3 +1,3 @@ -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Geonames.service -/usr/share/geoclue-providers/geoclue-geonames.provider -/usr/bin/geoclue-geonames +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Geonames.service +debian/tmp/usr/share/geoclue-providers/geoclue-geonames.provider +debian/tmp/usr/lib/geoclue/geoclue-geonames diff --git a/debian/geoclue-gpsd.install b/debian/geoclue-gpsd.install index 2cf8fe4..20693e5 100644 --- a/debian/geoclue-gpsd.install +++ b/debian/geoclue-gpsd.install @@ -1,3 +1,3 @@ -/usr/bin/geoclue-gpsd -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service -/usr/share/geoclue-providers/geoclue-gpsd.provider +debian/tmp/usr/lib/geoclue/geoclue-gpsd +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service +debian/tmp/usr/share/geoclue-providers/geoclue-gpsd.provider diff --git a/debian/geoclue-gsmloc.install b/debian/geoclue-gsmloc.install index 37b5bda..1000e59 100644 --- a/debian/geoclue-gsmloc.install +++ b/debian/geoclue-gsmloc.install @@ -1,3 +1,3 @@ -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service -/usr/share/geoclue-providers/geoclue-gsmloc.provider -/usr/bin/geoclue-gsmloc +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service +debian/tmp/usr/share/geoclue-providers/geoclue-gsmloc.provider +debian/tmp/usr/lib/geoclue/geoclue-gsmloc diff --git a/debian/geoclue-hostip.install b/debian/geoclue-hostip.install index c69eb66..6216676 100644 --- a/debian/geoclue-hostip.install +++ b/debian/geoclue-hostip.install @@ -1,4 +1,3 @@ -/usr/bin/geoclue-hostip -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Hostip.service -/usr/share/geoclue-providers/geoclue-hostip.provider - +debian/tmp/usr/lib/geoclue/geoclue-hostip +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Hostip.service +debian/tmp/usr/share/geoclue-providers/geoclue-hostip.provider diff --git a/debian/geoclue-localnet.install b/debian/geoclue-localnet.install index 18dbf8a..04de821 100644 --- a/debian/geoclue-localnet.install +++ b/debian/geoclue-localnet.install @@ -1,4 +1,3 @@ -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Localnet.service -/usr/share/geoclue-providers/geoclue-localnet.provider -/usr/bin/geoclue-localnet - +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Localnet.service +debian/tmp/usr/share/geoclue-providers/geoclue-localnet.provider +debian/tmp/usr/lib/geoclue/geoclue-localnet diff --git a/debian/geoclue-manual.install b/debian/geoclue-manual.install index be19bde..07004fe 100644 --- a/debian/geoclue-manual.install +++ b/debian/geoclue-manual.install @@ -1,3 +1,3 @@ -/usr/bin/geoclue-manual -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service -/usr/share/geoclue-providers/geoclue-manual.provider +debian/tmp/usr/lib/geoclue/geoclue-manual +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service +debian/tmp/usr/share/geoclue-providers/geoclue-manual.provider diff --git a/debian/geoclue-plazes.install b/debian/geoclue-plazes.install index e8cbd7e..8940b6e 100644 --- a/debian/geoclue-plazes.install +++ b/debian/geoclue-plazes.install @@ -1,3 +1,3 @@ -/usr/bin/geoclue-plazes -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service -/usr/share/geoclue-providers/geoclue-plazes.provider +debian/tmp/usr/lib/geoclue/geoclue-plazes +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service +debian/tmp/usr/share/geoclue-providers/geoclue-plazes.provider diff --git a/debian/geoclue-yahoo.install b/debian/geoclue-yahoo.install index cfa8e02..e8bc7c9 100644 --- a/debian/geoclue-yahoo.install +++ b/debian/geoclue-yahoo.install @@ -1,3 +1,3 @@ -/usr/bin/geoclue-yahoo -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service -/usr/share/geoclue-providers/geoclue-yahoo.provider +debian/tmp/usr/lib/geoclue/geoclue-yahoo +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service +debian/tmp/usr/share/geoclue-providers/geoclue-yahoo.provider diff --git a/debian/geoclue.install b/debian/geoclue.install index 67e6334..2b29b96 100644 --- a/debian/geoclue.install +++ b/debian/geoclue.install @@ -1,3 +1,3 @@ -/usr/bin/geoclue-master -/usr/bin/geoclue-test-gui -/usr/share/dbus-1/services/org.freedesktop.Geoclue.Master.service +debian/tmp/usr/bin/geoclue-test-gui +debian/tmp/usr/lib/geoclue/geoclue-master +debian/tmp/usr/share/dbus-1/services/org.freedesktop.Geoclue.Master.service diff --git a/debian/libgeoclue-dev.install b/debian/libgeoclue-dev.install index bfc557a..963fdb9 100644 --- a/debian/libgeoclue-dev.install +++ b/debian/libgeoclue-dev.install @@ -1,6 +1,5 @@ -/usr/share/gtk-doc/* -/usr/include -/usr/lib/pkgconfig -/usr/lib/*.a -/usr/lib/*.la -/usr/lib/libgeoclue.so +debian/tmp/usr/include/* +debian/tmp/usr/lib/pkgconfig/* +debian/tmp/usr/lib/libgeoclue.*a +debian/tmp/usr/lib/libgeoclue.so +debian/tmp/usr/share/gtk-doc/* diff --git a/debian/libgeoclue0.install b/debian/libgeoclue0.install index 1b2ee9d..79bbe2f 100644 --- a/debian/libgeoclue0.install +++ b/debian/libgeoclue0.install @@ -1 +1 @@ -/usr/lib/libgeoclue.so.* +debian/tmp/usr/lib/*.so.* diff --git a/debian/rules b/debian/rules index b2ade0c..46edad2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,73 +1,7 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/utils.mk -package = geoclue - -CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -# no need to guess the platform in configure: -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -configure: configure-stamp -configure-stamp: - dh_testdir - ln -sf /usr/share/misc/config.sub config.sub - ln -sf /usr/share/misc/config.guess config.guess - ./configure --libexecdir=/usr/bin/ --enable-gpsd --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) - touch configure-stamp - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - $(MAKE) CFLAGS="$(CFLAGS)" - touch build-stamp - -clean: - dh_testdir - dh_testroot - if [ -f Makefile ]; then $(MAKE) -i distclean; fi; - rm -f build-stamp configure-stamp - rm -f config.sub config.guess - dh_clean - rm -rf debian/geoclue-tmp - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - $(MAKE) DESTDIR=$(CURDIR)/debian/geoclue-tmp install - -binary-indep: build install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_install --sourcedir=debian/geoclue-tmp --fail-missing - dh_link - dh_strip - dh_compress - dh_fixperms - dh_gconf - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_makeshlibs - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +common-binary-predeb-arch:: list-missing
