Browse Source

Add support for multi-arch to the library-packages.

tags/debian/3.3-3
Bernd Zeimetz 9 years ago
parent
commit
750f664e4a
7 changed files with 25 additions and 15 deletions
  1. +1
    -1
      debian/compat
  2. +5
    -1
      debian/control
  3. +3
    -3
      debian/libgps-dev.install
  4. +2
    -2
      debian/libgps20.install
  5. +3
    -3
      debian/libqgpsmm-dev.install
  6. +2
    -2
      debian/libqgpsmm20.install
  7. +9
    -3
      debian/rules

+ 1
- 1
debian/compat View File

@@ -1 +1 @@
7
9

+ 5
- 1
debian/control View File

@@ -2,7 +2,7 @@ Source: gpsd
Section: misc
Priority: optional
Maintainer: Bernd Zeimetz <bzed@debian.org>
Build-Depends: debhelper (>= 7), po-debconf, dpkg-dev (>= 1.14.8),
Build-Depends: debhelper (>= 8.1.3~), po-debconf, dpkg-dev (>= 1.14.8),
quilt,
python-all-dev (>= 2.6.6-3),
python-all-dbg (>= 2.6.6-3),
@@ -92,6 +92,8 @@ Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: fso-gpsd
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: Global Positioning System - library
The gpsd service daemon can monitor one or more GPS devices connected to
a host computer, making all data on the location and movements of the
@@ -120,6 +122,8 @@ Package: libqgpsmm20
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: Global Positioning System - QT wrapper for libgps
The gpsd service daemon can monitor one or more GPS devices connected to
a host computer, making all data on the location and movements of the


+ 3
- 3
debian/libgps-dev.install View File

@@ -3,6 +3,6 @@ usr/include/gps.h
usr/share/man/man3/libgps.3
usr/share/man/man3/libgpsmm.3
usr/share/man/man5/*
usr/lib/pkgconfig/libgps.pc
usr/lib/libgps.so
usr/lib/libgps.a
usr/lib/*/pkgconfig/libgps.pc
usr/lib/*/libgps.so
usr/lib/*/libgps.a

+ 2
- 2
debian/libgps20.install View File

@@ -1,2 +1,2 @@
usr/lib/libg*.so.20
usr/lib/libg*.so.20.*
usr/lib/*/libg*.so.20
usr/lib/*/libg*.so.20.*

+ 3
- 3
debian/libqgpsmm-dev.install View File

@@ -1,4 +1,4 @@
usr/lib/pkgconfig/Qgpsmm.pc
usr/lib/libQgpsmm.prl
usr/lib/libQgpsmm.so
usr/lib/*/pkgconfig/Qgpsmm.pc
usr/lib/*/libQgpsmm.prl
usr/lib/*/libQgpsmm.so
usr/share/man/man3/libQgpsmm.3

+ 2
- 2
debian/libqgpsmm20.install View File

@@ -1,2 +1,2 @@
usr/lib/libQgpsmm.so.20
usr/lib/libQgpsmm.so.20.*
usr/lib/*/libQgpsmm.so.20
usr/lib/*/libQgpsmm.so.20.*

+ 9
- 3
debian/rules View File

@@ -29,12 +29,15 @@ endif ## ubuntu ##
endif ## debian ##


DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

SCONSOPTS = \
prefix=/usr \
systemd=yes \
strip=no \
dbus_export=yes \
docdir=/usr/share/doc/gpsd
docdir=/usr/share/doc/gpsd \
libdir=/usr/lib/$(DEB_HOST_MULTIARCH)

ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
SCONSOPTS += debug=yes
@@ -130,7 +133,7 @@ install-stamp: build-stamp build-static-stamp
$(SCONS_ENV) DESTDIR=`pwd`/debian/tmp python$${py}-dbg /usr/bin/scons install $(SCONSOPTS) ;\
done
# install static lib
cp static_lib/libgps.a debian/tmp/usr/lib
cp static_lib/libgps.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
# install hotplug wrapper
mkdir -p debian/tmp/lib/udev
cp gpsd.hotplug debian/tmp/lib/udev
@@ -151,7 +154,10 @@ install-stamp: build-stamp build-static-stamp
ln -s gps.1 debian/tmp/usr/share/man/man1/$$i ;\
done
# remove libgpsd development files - we don't want people to use the internal library
for i in usr/share/man/man3/libgpsd.3 usr/lib/libgpsd.so usr/lib/pkgconfig/libgpsd.pc; do \
for i in usr/share/man/man3/libgpsd.3 \
usr/lib/$(DEB_HOST_MULTIARCH)/libgpsd.so \
usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libgpsd.pc ;\
do \
rm debian/tmp/$$i ;\
done
# install everything


Loading…
Cancel
Save