lagertonne/nut
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Install all development files under /usr

Browse source
This commit is contained in:
Laurent Bigonville 2012-08-13 01:11:45 +02:00
parent b8b31887a5
commit 2904bfac3c
6 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

@ -13,8 +13,9 @@ nut (2.6.5-1) UNRELEASED; urgency=low
* debian/nut-server.install: Drop newmge-shut, renamed upstream to mge-shut * debian/nut-server.install: Drop newmge-shut, renamed upstream to mge-shut
and install the old implementation (oldmge-shut) instead and install the old implementation (oldmge-shut) instead
* debian/control: Drop ancient Conflicts/Provides/Replaces * debian/control: Drop ancient Conflicts/Provides/Replaces
* Install all development files under /usr
-- Laurent Bigonville <bigon@debian.org> Mon, 13 Aug 2012 00:56:42 +0200 -- Laurent Bigonville <bigon@debian.org> Mon, 13 Aug 2012 01:11:26 +0200
nut (2.6.4-2) unstable; urgency=low nut (2.6.4-2) unstable; urgency=low

1
debian/libupsclient1-dev.dirs vendored
View file

@ -1 +0,0 @@
/lib

5
debian/libupsclient1-dev.install vendored
View file

@ -1,5 +1,4 @@
lib/*/libupsclient.so
usr/lib/*/libupsclient.so usr/lib/*/libupsclient.so
lib/*/libupsclient.a usr/lib/*/libupsclient.a
usr/lib/*/pkgconfig/ usr/lib/*/pkgconfig/libupsclient.pc
usr/include usr/include

20
debian/patches/0003-install-dev-files-in-usr.patch vendored Normal file
View file

@ -0,0 +1,20 @@
Description: Adjust .pc paths to install development files to /usr
Author: Laurent Bigonville <bigon@debian.org>
Forwarded: not-needed
--- a/lib/libnutscan.pc.in
+++ b/lib/libnutscan.pc.in
@@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=/usr
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
--- a/lib/libupsclient.pc.in
+++ b/lib/libupsclient.pc.in
@@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=/usr
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

1
debian/patches/series vendored
View file

@ -1 +1,2 @@
0003-install-dev-files-in-usr.patch
0002-nut-monitor-paths.patch 0002-nut-monitor-paths.patch

7
debian/rules vendored
View file

@ -62,8 +62,11 @@ common-install-arch::
mv $${f} $(CURDIR)/debian/tmp/etc/nut/$${nf}; \ mv $${f} $(CURDIR)/debian/tmp/etc/nut/$${nf}; \
done done
# Create -dev symlink under /usr # Move -dev file to /usr
ln -s /lib/$(DEB_HOST_MULTIARCH)/libupsclient.so.1.1.0 \ mv $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libupsclient.a \
$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libupsclient.a
rm -f $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libupsclient.so
ln -s /lib/$(DEB_HOST_MULTIARCH)/libupsclient.so.1 \
$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libupsclient.so $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libupsclient.so
# Install systemd files only on systems where it's supported # Install systemd files only on systems where it's supported