diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2014-10-15 02:41:42 +0100 |
|---|---|---|
| committer | Reuben Thomas <rrt@sc3d.org> | 2014-10-15 02:41:42 +0100 |
| commit | 7cccbd28c9d33054ad69bb70af406e44bc996abb (patch) | |
| tree | 5c3c175efe2e757d5fe477a5248ac326b38cf403 | |
| parent | 0ae35a63ea4973e3b3347dbcf9d454f578a4dadf (diff) | |
| download | plptools-7cccbd28c9d33054ad69bb70af406e44bc996abb.tar.gz plptools-7cccbd28c9d33054ad69bb70af406e44bc996abb.tar.bz2 plptools-7cccbd28c9d33054ad69bb70af406e44bc996abb.zip | |
Fix various bugs in Debian packaging
| -rw-r--r-- | debian/plptools.lintian-overrides | 4 | ||||
| -rwxr-xr-x | debian/rules | 9 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/debian/plptools.lintian-overrides b/debian/plptools.lintian-overrides index 0d838fb..b32b673 100644 --- a/debian/plptools.lintian-overrides +++ b/debian/plptools.lintian-overrides @@ -1,4 +1,4 @@ # Use this template only as a prompt plptools: unused-debconf-template plptools/customize -plptools: package-name-doesnt-match-sonames libplp0 -plptools: no-symbols-control-file usr/lib/*/libplp.so.* +plptools: postinst-has-useless-call-to-ldconfig +plptools: postrm-has-useless-call-to-ldconfig diff --git a/debian/rules b/debian/rules index 2fc9454..4429730 100755 --- a/debian/rules +++ b/debian/rules @@ -1,12 +1,17 @@ #!/usr/bin/make -f -DEB_CONFIGURE_EXTRA_FLAGS = --with-serial=/dev/ttyS0 - %: dh $@ --with autoreconf +override_dh_auto_configure: + dh_auto_configure -- --with-serial=/dev/ttyS0 --with-initdir=/etc/init.d + override_dh_auto_install: dh_auto_install + for file in debian/plptools/usr/lib/*/plptools/*.la; do \ + sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \ + done + rm debian/plptools/usr/lib/*/plptools/*.so install -T -D -m 644 debian/plptools.conf debian/plptools/etc/default/plptools override_dh_clean: diff --git a/lib/Makefile.am b/lib/Makefile.am index 2fb8b08..a7b3b13 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/intl AM_CFLAGS = $(THREADED_CFLAGS) AM_CXXFLAGS = $(THREADED_CXXFLAGS) -lib_LTLIBRARIES = libplp.la +pkglib_LTLIBRARIES = libplp.la libplp_la_SOURCES = bufferarray.cc bufferstore.cc iowatch.cc ppsocket.cc \ rfsv16.cc rfsv32.cc rfsvfactory.cc log.cc rfsv.cc rpcs32.cc rpcs16.cc \ |