diff --git a/debian/changelog b/debian/changelog index 8ea2bc5..83671bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nut (2.6.2-1) UNRELEASED; urgency=low +nut (2.6.2-1) unstable; urgency=low * New upstream release (Closes: #594989) * debian/control: @@ -9,6 +9,10 @@ nut (2.6.2-1) UNRELEASED; urgency=low * debian/nut-server.init: - add udev as Required-Start/Stop (Closes: #642412) - remove legacy support for /etc/default/nut (Closes: #638021) + * debian/patches/0003-libupsclient-version.patch: added to fix the missing + libupsclient version info bump + * debian/libupsclient1-dev.links: update link name + * debian/libupsclient1.symbols: add with upscli_tryconnect * debian/nut.TODO.Debian: update and complete the TODO list -- Arnaud Quette Thu, 29 Sep 2011 18:39:16 +0200 diff --git a/debian/libupsclient1-dev.links b/debian/libupsclient1-dev.links index 107c217..0ac64c7 100644 --- a/debian/libupsclient1-dev.links +++ b/debian/libupsclient1-dev.links @@ -1 +1 @@ -/lib/libupsclient.so.1.0.0 /usr/lib/libupsclient.so +/lib/libupsclient.so.1.1.0 /usr/lib/libupsclient.so diff --git a/debian/libupsclient1.symbols b/debian/libupsclient1.symbols index f9cd39a..85e4066 100644 --- a/debian/libupsclient1.symbols +++ b/debian/libupsclient1.symbols @@ -22,3 +22,4 @@ libupsclient.so.1 libupsclient1 #MINVER# 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/patches/0003-libupsclient-version.patch b/debian/patches/0003-libupsclient-version.patch new file mode 100644 index 0000000..4b02835 --- /dev/null +++ b/debian/patches/0003-libupsclient-version.patch @@ -0,0 +1,20 @@ +--- a/clients/Makefile.am ++++ b/clients/Makefile.am +@@ -50,4 +50,4 @@ + if WITH_SSL + libupsclient_la_LIBADD += $(LIBSSL_LIBS) + endif +-libupsclient_la_LDFLAGS = -version-info 1:0:0 ++libupsclient_la_LDFLAGS = -version-info 2:0:1 +diff -ru nut-2.6.2.orig/clients/Makefile.in nut-2.6.2/clients/Makefile.in +--- a/clients/Makefile.in ++++ b/clients/Makefile.in +@@ -384,7 +384,7 @@ + # not LDADD. + libupsclient_la_SOURCES = upsclient.c upsclient.h + libupsclient_la_LIBADD = ../common/libparseconf.la $(am__append_4) +-libupsclient_la_LDFLAGS = -version-info 1:0:0 ++libupsclient_la_LDFLAGS = -version-info 2:0:1 + all: all-am + + .SUFFIXES: diff --git a/debian/patches/series b/debian/patches/series index 9e8eaf1..6ea723f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-fix_spelling_and_typo.patch 0002-nut-monitor-paths.patch +0003-libupsclient-version.patch diff --git a/debian/rules b/debian/rules index 8fa38f7..871ffb1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,5 @@ #!/usr/bin/make -f -DEB_AUTO_UPDATE_ACLOCAL := 1.11 -DEB_AUTO_UPDATE_LIBTOOL := pre -include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/class/python-module.mk