Ubuntu dpkg 1.18.2ubuntu5
This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes. It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
Format: 1.8
Date: Sat, 17 Oct 2015 12:47:12 -0600
Source: dpkg
Binary: libdpkg-dev dpkg dpkg-dev libdpkg-perl dselect
Architecture: source
Version: 1.18.2ubuntu5
Distribution: wily
Urgency: medium
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Changed-By: Adam Conrad <adconrad@ubuntu.com>
Description:
dpkg - Debian package management system
dpkg-dev - Debian package development tools
dselect - Debian package management front-end
libdpkg-dev - Debian package management static library
libdpkg-perl - Dpkg perl modules
Launchpad-Bugs-Fixed: 1504761
Changes:
dpkg (1.18.2ubuntu5) wily; urgency=medium
.
* Pull packaging changes from 1.18.3 to fix libdir issues (LP: #1504761)
* Fix an off-by-one write access in dpkg-deb when parsing the deb magic.
* Fix a segfault when using «dpkg --no-act» with a synthetic --admindir.
Checksums-Sha1:
94bca4f1a1631483bc84ff4d5c1911bf5f863704 2128 dpkg_1.18.2ubuntu5.dsc
90a1ee846d913297b9e87c3f1b4046c44f42d74d 4336180 dpkg_1.18.2ubuntu5.tar.xz
Checksums-Sha256:
9df4d40dd96ed515d6485232af0f13079a018814d5cb102ac49ab63342f8e91a 2128 dpkg_1.18.2ubuntu5.dsc
8c1981b9edd8369a6dd0ff338a8edda11e02913e4f60b65a7612265b5b10fa59 4336180 dpkg_1.18.2ubuntu5.tar.xz
Files:
1ae2ded3fa5b0dec76fbfcead8c53573 2128 admin required dpkg_1.18.2ubuntu5.dsc
97d99bdf9d839615c9a9b80374535b1f 4336180 admin required dpkg_1.18.2ubuntu5.tar.xz
Original-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
diff -pruN 1.18.2ubuntu4/configure 1.18.2ubuntu5/configure
--- 1.18.2ubuntu4/configure 2015-08-05 00:14:10.000000000 +0000
+++ 1.18.2ubuntu5/configure 2015-10-17 19:48:15.000000000 +0000
@@ -710,6 +710,7 @@ TAR
logdir
admindir
pkgconfdir
+devlibdir
BUILD_UPDATE_ALTERNATIVES_FALSE
BUILD_UPDATE_ALTERNATIVES_TRUE
BUILD_START_STOP_DAEMON_FALSE
@@ -869,6 +870,7 @@ enable_libtool_lock
enable_dselect
enable_start_stop_daemon
enable_update_alternatives
+with_devlibdir
with_pkgconfdir
with_admindir
with_logdir
@@ -1571,6 +1573,7 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot=DIR Search for dependent libraries within DIR
(or the compiler's sysroot if not specified).
+ --with-devlibdir=DIR dpkg development library directory [LIBDIR]
--with-pkgconfdir=DIR dpkg configuration directory [SYSCONFDIR/dpkg]
--with-admindir=DIR dpkg database directory [LOCALSTATEDIR/lib/dpkg]
--with-logdir=DIR system logging directory [LOCALSTATEDIR/log]
@@ -14628,6 +14631,24 @@ $as_echo "$build_update_alternatives" >&
# Allow alternate directories
+ devlibdir="${libdir}"
+
+# Check whether --with-devlibdir was given.
+if test "${with_devlibdir+set}" = set; then :
+ withval=$with_devlibdir; case $with_devlibdir in #(
+ "") :
+ as_fn_error $? "invalid devlibdir specified" "$LINENO" 5 ;; #(
+ *) :
+ devlibdir="$with_devlibdir" ;;
+esac
+
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: using directory devlibdir = '$devlibdir'" >&5
+$as_echo "$as_me: using directory devlibdir = '$devlibdir'" >&6;}
+
+
pkgconfdir="${sysconfdir}/${PACKAGE_NAME}"
# Check whether --with-pkgconfdir was given.
diff -pruN 1.18.2ubuntu4/configure.ac 1.18.2ubuntu5/configure.ac
--- 1.18.2ubuntu4/configure.ac 2015-07-13 02:38:47.000000000 +0000
+++ 1.18.2ubuntu5/configure.ac 2015-10-17 19:21:42.000000000 +0000
@@ -33,6 +33,8 @@ DPKG_BUILD_PROG([start-stop-daemon])
DPKG_BUILD_PROG([update-alternatives])
# Allow alternate directories
+DPKG_WITH_DIR([devlibdir], [${libdir}],
+ [dpkg development library directory [LIBDIR]])
DPKG_WITH_DIR([pkgconfdir], [${sysconfdir}/${PACKAGE_NAME}],
[dpkg configuration directory [SYSCONFDIR/dpkg]])
DPKG_WITH_DIR([admindir], [${localstatedir}/lib/${PACKAGE_NAME}],
diff -pruN 1.18.2ubuntu4/debian/changelog 1.18.2ubuntu5/debian/changelog
--- 1.18.2ubuntu4/debian/changelog 2015-09-11 17:12:01.000000000 +0000
+++ 1.18.2ubuntu5/debian/changelog 2015-10-17 19:21:42.000000000 +0000
@@ -1,3 +1,11 @@
+dpkg (1.18.2ubuntu5) wily; urgency=medium
+
+ * Pull packaging changes from 1.18.3 to fix libdir issues (LP: #1504761)
+ * Fix an off-by-one write access in dpkg-deb when parsing the deb magic.
+ * Fix a segfault when using «dpkg --no-act» with a synthetic --admindir.
+
+ -- Adam Conrad <adconrad@ubuntu.com> Sat, 17 Oct 2015 12:47:12 -0600
+
dpkg (1.18.2ubuntu4) wily; urgency=medium
* Add a Breaks on software-center (<< 13.10-0ubuntu9~) for trigger loops.
diff -pruN 1.18.2ubuntu4/debian/dselect.install 1.18.2ubuntu5/debian/dselect.install
--- 1.18.2ubuntu4/debian/dselect.install 2015-07-30 04:39:24.000000000 +0000
+++ 1.18.2ubuntu5/debian/dselect.install 2015-10-17 19:21:42.000000000 +0000
@@ -2,7 +2,7 @@
etc/dpkg/dselect.cfg.d
usr/bin/dselect
-usr/lib/*/dpkg/methods usr/lib/dpkg
+usr/lib/dpkg/methods usr/lib/dpkg
usr/share/locale/*/LC_MESSAGES/dselect.mo
usr/share/perl5/Dselect
var/lib/dpkg/methods
diff -pruN 1.18.2ubuntu4/debian/libdpkg-perl.install 1.18.2ubuntu5/debian/libdpkg-perl.install
--- 1.18.2ubuntu4/debian/libdpkg-perl.install 2015-07-30 04:39:24.000000000 +0000
+++ 1.18.2ubuntu5/debian/libdpkg-perl.install 2015-10-17 19:21:42.000000000 +0000
@@ -1,4 +1,4 @@
-usr/lib/*/dpkg/parsechangelog usr/lib/dpkg
+usr/lib/dpkg/parsechangelog usr/lib/dpkg
usr/share/locale/*/LC_MESSAGES/dpkg-dev.mo
usr/share/man/man3/Dpkg*.3
usr/share/perl5/Dpkg*
diff -pruN 1.18.2ubuntu4/debian/rules 1.18.2ubuntu5/debian/rules
--- 1.18.2ubuntu4/debian/rules 2015-07-30 04:39:24.000000000 +0000
+++ 1.18.2ubuntu5/debian/rules 2015-10-17 19:21:42.000000000 +0000
@@ -37,6 +37,8 @@ ifeq (,$(filter maintainer-build,$(DEB_B
confflags += --disable-silent-rules
endif
+D := $(CURDIR)/debian/tmp
+
# Create configure script if necessary, automake handles rebuilding it.
configure:
dh_testdir
@@ -55,8 +57,8 @@ build-tree/config.status: configure
--infodir=\$${datadir}/info \
--sysconfdir=/etc \
--sbindir=/sbin \
- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--localstatedir=/var \
+ --with-devlibdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--with-zlib \
--with-liblzma \
--with-bz2
@@ -82,13 +84,13 @@ install: check
dh_prep
dh_installdirs
- cd build-tree && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
+ cd build-tree && $(MAKE) DESTDIR=$(D) install
ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
# Ubuntu's «i386» architecture is built for i686 (the Debian default
# is i586).
sed -ri 's/^(i386[[:space:]]+)[^[:space:]]+/\1i686/' \
- $(CURDIR)/debian/tmp/usr/share/dpkg/cputable
+ $(D)/usr/share/dpkg/cputable
endif
define dpkg-installmanl10n
diff -pruN 1.18.2ubuntu4/dpkg-deb/extract.c 1.18.2ubuntu5/dpkg-deb/extract.c
--- 1.18.2ubuntu4/dpkg-deb/extract.c 2015-07-30 04:44:56.000000000 +0000
+++ 1.18.2ubuntu5/dpkg-deb/extract.c 2015-10-17 19:21:42.000000000 +0000
@@ -131,7 +131,7 @@ extracthalf(const char *debar, const cha
if (fstat(arfd, &stab))
ohshite(_("failed to fstat archive"));
- r = read_line(arfd, versionbuf, strlen(DPKG_AR_MAGIC), sizeof(versionbuf));
+ r = read_line(arfd, versionbuf, strlen(DPKG_AR_MAGIC), sizeof(versionbuf) - 1);
if (r < 0)
read_fail(r, debar, _("archive magic version number"));
diff -pruN 1.18.2ubuntu4/dpkg-deb/Makefile.in 1.18.2ubuntu5/dpkg-deb/Makefile.in
--- 1.18.2ubuntu4/dpkg-deb/Makefile.in 2015-08-05 00:14:13.000000000 +0000
+++ 1.18.2ubuntu5/dpkg-deb/Makefile.in 2015-10-17 19:48:15.000000000 +0000
@@ -323,6 +323,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+devlibdir = @devlibdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff -pruN 1.18.2ubuntu4/dpkg-split/Makefile.in 1.18.2ubuntu5/dpkg-split/Makefile.in
--- 1.18.2ubuntu4/dpkg-split/Makefile.in 2015-08-05 00:14:13.000000000 +0000
+++ 1.18.2ubuntu5/dpkg-split/Makefile.in 2015-10-17 19:48:15.000000000 +0000
@@ -321,6 +321,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+devlibdir = @devlibdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff -pruN 1.18.2ubuntu4/dselect/Makefile.in 1.18.2ubuntu5/dselect/Makefile.in
--- 1.18.2ubuntu4/dselect/Makefile.in 2015-08-05 00:14:13.000000000 +0000
+++ 1.18.2ubuntu5/dselect/Makefile.in 2015-10-17 19:48:15.000000000 +0000
@@ -387,6 +387,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+devlibdir = @devlibdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff -pruN 1.18.2ubuntu4/dselect/methods/Makefile.in 1.18.2ubuntu5/dselect/methods/Makefile.in
--- 1.18.2ubuntu4/dselect/methods/Makefile.in 2015-08-05 00:14:13.000000000 +0000
+++ 1.18.2ubuntu5/dselect/methods/Makefile.in 2015-10-17 19:48:15.000000000 +0000
@@ -302,6 +302,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+devlibdir = @devlibdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff -pruN 1.18.2ubuntu4/lib/compat/Makefile.in 1.18.2ubuntu5/lib/compat/Makefile.in
--- 1.18.2ubuntu4/lib/compat/Makefile.in 2015-08-05 00:14:13.000000000 +0000
+++ 1.18.2ubuntu5/lib/compat/Makefile.in 2015-10-17 19:48:15.000000000 +0000
@@ -372,6 +372,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+devlibdir = @devlibdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff -pruN 1.18.2ubuntu4/lib/dpkg/libdpkg.pc.in 1.18.2ubuntu5/lib/dpkg/libdpkg.pc.in
--- 1.18.2ubuntu4/lib/dpkg/libdpkg.pc.in 2015-07-13 02:38:47.000000000 +0000
+++ 1.18.2ubuntu5/lib/dpkg/libdpkg.pc.in 2015-10-17 19:21:42.000000000 +0000
@@ -1,6 +1,6 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
+libdir=@devlibdir@
includedir=@includedir@
Name: libdpkg
diff -pruN 1.18.2ubuntu4/lib/dpkg/Makefile.am 1.18.2ubuntu5/lib/dpkg/Makefile.am
--- 1.18.2ubuntu4/lib/dpkg/Makefile.am 2015-07-13 13:53:35.000000000 +0000
+++ 1.18.2ubuntu5/lib/dpkg/Makefile.am 2015-10-17 19:21:42.000000000 +0000
@@ -18,10 +18,10 @@ EXTRA_DIST = \
libdpkg.map \
libdpkg.pc.in
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(devlibdir)/pkgconfig
pkgconfig_DATA = libdpkg.pc
-lib_LTLIBRARIES = libdpkg.la
+devlib_LTLIBRARIES = libdpkg.la
libdpkg_la_LDFLAGS =
if HAVE_LINKER_VERSION_SCRIPT
diff -pruN 1.18.2ubuntu4/lib/dpkg/Makefile.in 1.18.2ubuntu5/lib/dpkg/Makefile.in
--- 1.18.2ubuntu4/lib/dpkg/Makefile.in 2015-08-05 00:14:13.000000000 +0000
+++ 1.18.2ubuntu5/lib/dpkg/Makefile.in 2015-10-17 19:48:15.000000000 +0000
@@ -151,9 +151,9 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
+am__installdirs = "$(DESTDIR)$(devlibdir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(pkgincludedir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
+LTLIBRARIES = $(devlib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@BUILD_SHARED_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
@BUILD_SHARED_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -428,6 +428,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+devlibdir = @devlibdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@@ -475,9 +476,9 @@ EXTRA_DIST = \
libdpkg.map \
libdpkg.pc.in
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(devlibdir)/pkgconfig
pkgconfig_DATA = libdpkg.pc
-lib_LTLIBRARIES = libdpkg.la
+devlib_LTLIBRARIES = libdpkg.la
libdpkg_la_LDFLAGS = $(am__append_1) $(MD_LIBS)
libdpkg_la_LIBADD = ../compat/libcompat.la $(am__append_2)
libdpkg_la_DEPENDENCIES = \
@@ -622,33 +623,33 @@ $(am__aclocal_m4_deps):
libdpkg.pc: $(top_builddir)/config.status $(srcdir)/libdpkg.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+install-devlibLTLIBRARIES: $(devlib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ @list='$(devlib_LTLIBRARIES)'; test -n "$(devlibdir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
list2="$$list2 $$p"; \
else :; fi; \
done; \
test -z "$$list2" || { \
- echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(devlibdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(devlibdir)" || exit 1; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(devlibdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(devlibdir)"; \
}
-uninstall-libLTLIBRARIES:
+uninstall-devlibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ @list='$(devlib_LTLIBRARIES)'; test -n "$(devlibdir)" || list=; \
for p in $$list; do \
$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(devlibdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(devlibdir)/$$f"; \
done
-clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; \
+clean-devlibLTLIBRARIES:
+ -test -z "$(devlib_LTLIBRARIES)" || rm -f $(devlib_LTLIBRARIES)
+ @list='$(devlib_LTLIBRARIES)'; \
locs=`for p in $$list; do echo $$p; done | \
sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
sort -u`; \
@@ -658,7 +659,7 @@ clean-libLTLIBRARIES:
}
libdpkg.la: $(libdpkg_la_OBJECTS) $(libdpkg_la_DEPENDENCIES) $(EXTRA_libdpkg_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libdpkg_la_LINK) -rpath $(libdir) $(libdpkg_la_OBJECTS) $(libdpkg_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(libdpkg_la_LINK) -rpath $(devlibdir) $(libdpkg_la_OBJECTS) $(libdpkg_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -955,7 +956,7 @@ check: check-recursive
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
+ for dir in "$(DESTDIR)$(devlibdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -991,7 +992,7 @@ maintainer-clean-generic:
-rm -f trigdeferred.c
clean: clean-recursive
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-devlibLTLIBRARIES clean-generic clean-libtool \
mostlyclean-am
distclean: distclean-recursive
@@ -1012,13 +1013,14 @@ info: info-recursive
info-am:
-install-data-am: install-pkgconfigDATA install-pkgincludeHEADERS
+install-data-am: install-devlibLTLIBRARIES install-pkgconfigDATA \
+ install-pkgincludeHEADERS
install-dvi: install-dvi-recursive
install-dvi-am:
-install-exec-am: install-libLTLIBRARIES
+install-exec-am:
install-html: install-html-recursive
@@ -1058,27 +1060,28 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
+uninstall-am: uninstall-devlibLTLIBRARIES uninstall-pkgconfigDATA \
uninstall-pkgincludeHEADERS
.MAKE: $(am__recursive_targets) install-am install-strip
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
- check-am clean clean-generic clean-libLTLIBRARIES \
+ check-am clean clean-devlibLTLIBRARIES clean-generic \
clean-libtool cscopelist-am ctags ctags-am distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am \
- install-libLTLIBRARIES install-man install-pdf install-pdf-am \
- install-pkgconfigDATA install-pkgincludeHEADERS install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
+ install install-am install-data install-data-am \
+ install-devlibLTLIBRARIES install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-pkgconfigDATA install-pkgincludeHEADERS \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
- uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS
+ tags tags-am uninstall uninstall-am \
+ uninstall-devlibLTLIBRARIES uninstall-pkgconfigDATA \
+ uninstall-pkgincludeHEADERS
.PRECIOUS: Makefile
diff -pruN 1.18.2ubuntu4/lib/dpkg/t/Makefile.in 1.18.2ubuntu5/lib/dpkg/t/Makefile.in
--- 1.18.2ubuntu4/lib/dpkg/t/Makefile.in 2015-08-05 00:14:13.000000000 +0000
+++ 1.18.2ubuntu5/lib/dpkg/t/Makefile.in 2015-10-17 19:48:15.000000000 +0000
@@ -449,6 +449,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+devlibdir = @devlibdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff -pruN 1.18.2ubuntu4/lib/dpkg/trigdeferred.l 1.18.2ubuntu5/lib/dpkg/trigdeferred.l
--- 1.18.2ubuntu4/lib/dpkg/trigdeferred.l 2015-07-13 02:38:47.000000000 +0000
+++ 1.18.2ubuntu5/lib/dpkg/trigdeferred.l 2015-10-17 19:21:42.000000000 +0000
@@ -139,9 +139,6 @@ trigdef_update_start(enum trigdef_update
}
file_lock(&lock_fd, FILE_LOCK_WAIT, fn.buf, _("triggers area"));
- } else {
- /* Dummy for pop_cleanups. */
- push_cleanup(NULL, 0, NULL, 0, 0);
}
constructfn(&fn, triggersdir, TRIGGERSDEFERREDFILE);
@@ -154,7 +151,8 @@ trigdef_update_start(enum trigdef_update
ohshite(_("unable to open triggers deferred file '%.250s'"),
fn.buf);
if (!(uf & TDUF_WRITE_IF_ENOENT)) {
- pop_cleanup(ehflag_normaltidy);
+ if (uf & TDUF_WRITE)
+ pop_cleanup(ehflag_normaltidy);
return TDUS_ERROR_NO_DEFERRED;
}
} else {
@@ -169,7 +167,8 @@ trigdef_update_start(enum trigdef_update
fn.buf);
if (stab.st_size == 0 && !(uf & TDUF_WRITE_IF_EMPTY)) {
- pop_cleanup(ehflag_normaltidy);
+ if (uf & TDUF_WRITE)
+ pop_cleanup(ehflag_normaltidy);
return TDUS_ERROR_EMPTY_DEFERRED;
}
}
@@ -245,5 +244,6 @@ trigdef_process_done(void)
triggersdir = NULL;
/* Unlock. */
- pop_cleanup(ehflag_normaltidy);
+ if (lock_fd >= 0)
+ pop_cleanup(ehflag_normaltidy);
}
diff -pruN 1.18.2ubuntu4/lib/Makefile.in 1.18.2ubuntu5/lib/Makefile.in
--- 1.18.2ubuntu4/lib/Makefile.in 2015-08-05 00:14:13.000000000 +0000
+++ 1.18.2ubuntu5/lib/Makefile.in 2015-10-17 19:48:15.000000000 +0000
@@ -327,6 +327,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+devlibdir = @devlibdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff -pruN 1.18.2ubuntu4/Makefile.in 1.18.2ubuntu5/Makefile.in
--- 1.18.2ubuntu4/Makefile.in 2015-08-05 00:14:13.000000000 +0000
+++ 1.18.2ubuntu5/Makefile.in 2015-10-17 19:48:15.000000000 +0000
@@ -401,6 +401,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+devlibdir = @devlibdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff -pruN 1.18.2ubuntu4/man/Makefile.in 1.18.2ubuntu5/man/Makefile.in
--- 1.18.2ubuntu4/man/Makefile.in 2015-08-05 00:14:14.000000000 +0000
+++ 1.18.2ubuntu5/man/Makefile.in 2015-10-17 19:48:15.000000000 +0000
@@ -311,6 +311,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+devlibdir = @devlibdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff -pruN 1.18.2ubuntu4/scripts/Makefile.in 1.18.2ubuntu5/scripts/Makefile.in
--- 1.18.2ubuntu4/scripts/Makefile.in 2015-08-05 00:14:14.000000000 +0000
+++ 1.18.2ubuntu5/scripts/Makefile.in 2015-10-17 19:48:15.000000000 +0000
@@ -374,6 +374,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+devlibdir = @devlibdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff -pruN 1.18.2ubuntu4/scripts/mk/Makefile.in 1.18.2ubuntu5/scripts/mk/Makefile.in
--- 1.18.2ubuntu4/scripts/mk/Makefile.in 2015-08-05 00:14:14.000000000 +0000
+++ 1.18.2ubuntu5/scripts/mk/Makefile.in 2015-10-17 19:48:15.000000000 +0000
@@ -298,6 +298,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+devlibdir = @devlibdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff -pruN 1.18.2ubuntu4/src/Makefile.in 1.18.2ubuntu5/src/Makefile.in
--- 1.18.2ubuntu4/src/Makefile.in 2015-08-05 00:14:14.000000000 +0000
+++ 1.18.2ubuntu5/src/Makefile.in 2015-10-17 19:48:15.000000000 +0000
@@ -369,6 +369,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+devlibdir = @devlibdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff -pruN 1.18.2ubuntu4/utils/Makefile.in 1.18.2ubuntu5/utils/Makefile.in
--- 1.18.2ubuntu4/utils/Makefile.in 2015-08-05 00:14:14.000000000 +0000
+++ 1.18.2ubuntu5/utils/Makefile.in 2015-10-17 19:48:15.000000000 +0000
@@ -346,6 +346,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
+devlibdir = @devlibdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
Reply to: