Control: tags - 1 + patch pending NMU uploaded to experimental
diff -Nru xapian-core-1.2.21/debian/changelog xapian-core-1.2.21/debian/changelog --- xapian-core-1.2.21/debian/changelog 2015-05-21 14:19:21.000000000 +0200 +++ xapian-core-1.2.21/debian/changelog 2015-07-29 15:29:51.000000000 +0200 @@ -1,3 +1,19 @@ +xapian-core (1.2.21-1.1) experimental; urgency=medium + + * Non maintainer upload. + * Build using GCC 5. Closes: #791312. + * Rename libxapian22-dbg to libxapian22v5-dbg. + * Rename libxapian22 to libxapian22v5. + * Add Conflict/Replaces. + + -- Matthias Klose <[email protected]> Tue, 28 Jul 2015 20:58:38 +0200 + +xapian-core (1.2.21-1ubuntu1) wily; urgency=medium + + * Build using GCC 5. + + -- Matthias Klose <[email protected]> Wed, 08 Jul 2015 19:52:25 +0200 + xapian-core (1.2.21-1) unstable; urgency=medium * New upstream release: diff -Nru xapian-core-1.2.21/debian/control xapian-core-1.2.21/debian/control --- xapian-core-1.2.21/debian/control 2015-05-21 12:58:18.000000000 +0200 +++ xapian-core-1.2.21/debian/control 2015-07-29 15:31:16.000000000 +0200 @@ -3,16 +3,18 @@ Priority: important Maintainer: Olly Betts <[email protected]> Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 7), autotools-dev, zlib1g-dev, uuid-dev, dpkg (>= 1.16.1~) +Build-Depends: debhelper (>= 7), autotools-dev, zlib1g-dev, uuid-dev, dpkg (>= 1.16.1~), g++ (>= 4:5) Homepage: http://xapian.org/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/xapian-core.git Vcs-git: git://anonscm.debian.org/collab-maint/xapian-core.git -Package: libxapian22 +Package: libxapian22v5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: xapian-tools +Conflicts: libxapian22 +Replaces: libxapian22 Description: Search engine library This package contains the core Xapian runtime library. . @@ -24,12 +26,14 @@ update and searching. It is highly scalable, and is capable of working with collections containing hundreds of millions of documents. -Package: libxapian22-dbg +Package: libxapian22v5-dbg Architecture: any Section: debug Priority: extra -Depends: libxapian22 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libxapian22v5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: libc6-dbg, libgcc1-dbg, zlib1g-dbg, libstdc++6-4.6-dbg +Conflicts: libxapian22-dbg +Replaces: libxapian22-dbg Description: Debugging symbols for the Xapian Search engine library This package contains debugging symbols for the core Xapian library. . @@ -45,7 +49,7 @@ Architecture: any Section: libdevel Priority: optional -Depends: libxapian22 (= ${binary:Version}), libc6-dev | libc-dev, ${misc:Depends} +Depends: libxapian22v5 (= ${binary:Version}), libc6-dev | libc-dev, ${misc:Depends} Suggests: xapian-doc (= ${binary:Version}), xapian-examples (= ${binary:Version}) Description: Development files for Xapian search engine library This package contains development libraries and headers for the core Xapian @@ -63,7 +67,7 @@ Architecture: any Section: utils Priority: optional -Depends: libxapian22 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libxapian22v5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Basic tools for Xapian search engine library This package contains several tools related to Xapian. - copydatabase: Copy one or more Xapian databases. diff -Nru xapian-core-1.2.21/debian/control.in xapian-core-1.2.21/debian/control.in --- xapian-core-1.2.21/debian/control.in 2015-05-21 12:51:01.000000000 +0200 +++ xapian-core-1.2.21/debian/control.in 2015-07-29 15:30:28.000000000 +0200 @@ -3,7 +3,7 @@ Priority: important Maintainer: Olly Betts <[email protected]> Standards-Version: 3.9.6 -Build-Depends: @BUILD_DEPS@ autotools-dev, zlib1g-dev, uuid-dev, dpkg (>= 1.16.1~) +Build-Depends: @BUILD_DEPS@ autotools-dev, zlib1g-dev, uuid-dev, dpkg (>= 1.16.1~), g++ (>= 4:5) Homepage: http://xapian.org/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/xapian-core.git Vcs-git: git://anonscm.debian.org/collab-maint/xapian-core.git @@ -13,6 +13,8 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: xapian-tools +Conflicts: libxapian22 +Replaces: libxapian22 Description: Search engine library This package contains the core Xapian runtime library. . @@ -30,6 +32,8 @@ Priority: extra Depends: libxapian@LIBXAPIAN_SOVERSION@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: libc6-dbg, libgcc1-dbg, zlib1g-dbg, libstdc++6-4.6-dbg +Conflicts: libxapian22-dbg +Replaces: libxapian22-dbg Description: Debugging symbols for the Xapian Search engine library This package contains debugging symbols for the core Xapian library. . diff -Nru xapian-core-1.2.21/debian/libxapian22v5.install xapian-core-1.2.21/debian/libxapian22v5.install --- xapian-core-1.2.21/debian/libxapian22v5.install 1970-01-01 01:00:00.000000000 +0100 +++ xapian-core-1.2.21/debian/libxapian22v5.install 2015-07-28 21:02:18.000000000 +0200 @@ -0,0 +1 @@ +usr/lib/libxapian.so.* diff -Nru xapian-core-1.2.21/debian/libxapian-dev.install xapian-core-1.2.21/debian/libxapian-dev.install --- xapian-core-1.2.21/debian/libxapian-dev.install 2015-05-21 12:58:28.000000000 +0200 +++ xapian-core-1.2.21/debian/libxapian-dev.install 2015-07-28 21:02:18.000000000 +0200 @@ -4,5 +4,6 @@ usr/lib/libxapian.a usr/lib/libxapian.la usr/lib/libxapian.so +usr/lib/pkgconfig/xapian-core.pc usr/share/aclocal usr/share/man/man1/xapian-config.1 diff -Nru xapian-core-1.2.21/debian/rules xapian-core-1.2.21/debian/rules --- xapian-core-1.2.21/debian/rules 2015-05-21 12:54:12.000000000 +0200 +++ xapian-core-1.2.21/debian/rules 2015-07-28 21:02:12.000000000 +0200 @@ -34,7 +34,7 @@ # supported by the library. This should correspond to the soversion assigned # to the library by libtool. (This isn't documented, and is system dependent, # so we need to check it doesn't break with future versions of libtool.) -libxapian_soversion:=$(shell awk -F'[=:]' '($$1 == "LIBRARY_VERSION_INFO") {print $$2 - $$4}' configure.ac) +libxapian_soversion:=$(shell awk -F'[=:]' '($$1 == "LIBRARY_VERSION_INFO") {print $$2 - $$4}' configure.ac)v5 # For now, we don't support installation of development files for multiple # versions concurrently. Incompatible ABI changes should be rare, so this

