diff --git a/debian/changelog b/debian/changelog index 72f68fe..531012a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,13 +2,16 @@ nut (2.7.1-1) UNRELEASED; urgency=low * New upstream release (Closes: #730183) - Refresh debian/patches/0004-fix-systemd-service.patch + - Rename libupsclient1 to libupsclient3 following the soname bump, rename + libupsclient1-dev to libupsclient-dev, the package is not co-installable + anyway * debian/rules, debian/control: Enable SSL support using libnss3 * d/p/0005-Provide-retry-options-for-upsdrvctl-and-drivers.patch, d/p/0006-ups-conf-maxretry.patch: By default, retry to start the drivers up-to three times, this should mitigate races with slow devices (Closes: #694717) - -- Laurent Bigonville Sun, 24 Nov 2013 16:26:05 +0100 + -- Laurent Bigonville Sun, 24 Nov 2013 16:59:49 +0100 nut (2.6.5-4) unstable; urgency=low diff --git a/debian/control b/debian/control index ec39863..b8cf451 100644 --- a/debian/control +++ b/debian/control @@ -164,7 +164,7 @@ Description: network UPS tools - documentation . This package contains FAQ, user, developer and packager documentation. -Package: libupsclient1 +Package: libupsclient3 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -179,10 +179,12 @@ Description: network UPS tools - client library . This package provides the shared client library. -Package: libupsclient1-dev +Package: libupsclient-dev Section: libdevel Architecture: any -Depends: libupsclient1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libupsclient3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Conflicts: libupsclient1-dev +Replaces: libupsclient1-dev Description: network UPS tools - development files Network UPS Tools (NUT) is a client/server monitoring system that allows computers to share uninterruptible power supply (UPS) and diff --git a/debian/libupsclient-dev.install b/debian/libupsclient-dev.install new file mode 100644 index 0000000..42e1e8a --- /dev/null +++ b/debian/libupsclient-dev.install @@ -0,0 +1,9 @@ +usr/lib/*/libupsclient.so +usr/lib/*/libupsclient.a +usr/lib/*/pkgconfig/libupsclient.pc +usr/include/nut-scan.h +usr/include/nutscan-device.h +usr/include/nutscan-init.h +usr/include/nutscan-ip.h +usr/include/parseconf.h +usr/include/upsclient.h diff --git a/debian/libupsclient-dev.manpages b/debian/libupsclient-dev.manpages new file mode 100644 index 0000000..141a1b1 --- /dev/null +++ b/debian/libupsclient-dev.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/man3/nutscan*.3 +debian/tmp/usr/share/man/man3/upscli*.3 diff --git a/debian/libupsclient1-dev.install b/debian/libupsclient1-dev.install deleted file mode 100644 index 5b3120a..0000000 --- a/debian/libupsclient1-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/*/libupsclient.so -usr/lib/*/libupsclient.a -usr/lib/*/pkgconfig/libupsclient.pc -usr/include diff --git a/debian/libupsclient1-dev.manpages b/debian/libupsclient1-dev.manpages deleted file mode 100644 index 242943a..0000000 --- a/debian/libupsclient1-dev.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/share/man/man3/*.3 diff --git a/debian/libupsclient1.symbols b/debian/libupsclient1.symbols deleted file mode 100644 index 85e4066..0000000 --- a/debian/libupsclient1.symbols +++ /dev/null @@ -1,25 +0,0 @@ -libupsclient.so.1 libupsclient1 #MINVER# - pconf_char@Base 2.4.1 - pconf_encode@Base 2.4.1 - pconf_file_begin@Base 2.4.1 - pconf_file_next@Base 2.4.1 - pconf_finish@Base 2.4.1 - pconf_init@Base 2.4.1 - pconf_line@Base 2.4.1 - pconf_parse_error@Base 2.4.1 - upscli_connect@Base 2.4.1 - upscli_disconnect@Base 2.4.1 - upscli_errlist@Base 2.4.1 - upscli_fd@Base 2.4.1 - upscli_get@Base 2.4.1 - upscli_list_next@Base 2.4.1 - upscli_list_start@Base 2.4.1 - upscli_readline@Base 2.4.1 - upscli_sendline@Base 2.4.1 - upscli_splitaddr@Base 2.4.1 - upscli_splitname@Base 2.4.1 - upscli_ssl@Base 2.4.1 - upscli_sslcert@Base 2.4.1 - upscli_strerror@Base 2.4.1 - upscli_upserror@Base 2.4.1 - upscli_tryconnect@Base 2.6.2 diff --git a/debian/libupsclient1.install b/debian/libupsclient3.install similarity index 100% rename from debian/libupsclient1.install rename to debian/libupsclient3.install diff --git a/debian/libupsclient3.symbols b/debian/libupsclient3.symbols new file mode 100644 index 0000000..4fc0a9f --- /dev/null +++ b/debian/libupsclient3.symbols @@ -0,0 +1,27 @@ +libupsclient.so.3 libupsclient3 #MINVER# + pconf_char@Base 2.7.1 + pconf_encode@Base 2.7.1 + pconf_file_begin@Base 2.7.1 + pconf_file_next@Base 2.7.1 + pconf_finish@Base 2.7.1 + pconf_init@Base 2.7.1 + pconf_line@Base 2.7.1 + pconf_parse_error@Base 2.7.1 + upscli_add_host_cert@Base 2.7.1 + upscli_cleanup@Base 2.7.1 + upscli_connect@Base 2.7.1 + upscli_disconnect@Base 2.7.1 + upscli_errlist@Base 2.7.1 + upscli_fd@Base 2.7.1 + upscli_get@Base 2.7.1 + upscli_init@Base 2.7.1 + upscli_list_next@Base 2.7.1 + upscli_list_start@Base 2.7.1 + upscli_readline@Base 2.7.1 + upscli_sendline@Base 2.7.1 + upscli_splitaddr@Base 2.7.1 + upscli_splitname@Base 2.7.1 + upscli_ssl@Base 2.7.1 + upscli_strerror@Base 2.7.1 + upscli_upserror@Base 2.7.1 + upscli_tryconnect@Base 2.7.1 diff --git a/debian/rules b/debian/rules index 3c286a1..c72e21f 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,7 @@ common-install-arch:: 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 \ + ln -s /lib/$(DEB_HOST_MULTIARCH)/libupsclient.so.3 \ $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libupsclient.so # Install systemd files only on systems where it's supported