diff -u pcre3-7.4/aclocal.m4 pcre3-7.4/aclocal.m4 --- pcre3-7.4/aclocal.m4 +++ pcre3-7.4/aclocal.m4 @@ -18,7 +18,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL +# serial 51 Debian 1.5.24-2ubuntu2 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) diff -u pcre3-7.4/debian/control pcre3-7.4/debian/control --- pcre3-7.4/debian/control +++ pcre3-7.4/debian/control @@ -1,7 +1,8 @@ Source: pcre3 Section: libs Priority: optional -Maintainer: Mark Baker +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Mark Baker Standards-Version: 3.7.3 Build-Depends: debhelper (>= 5.0.22) diff -u pcre3-7.4/debian/libpcre3.install pcre3-7.4/debian/libpcre3.install --- pcre3-7.4/debian/libpcre3.install +++ pcre3-7.4/debian/libpcre3.install @@ -1,5 +1,5 @@ -debian/tmp/usr/lib/libpcre.so.* -debian/tmp/usr/lib/libpcreposix.so.* +debian/tmp/usr/lib/libpcre.so.* lib +debian/tmp/usr/lib/libpcreposix.so.* lib debian/tmp/usr/bin/pcretest debian/tmp/usr/share/man/man1/pcretest.1 debian/tmp/usr/share/man/man3/pcrepattern.3 diff -u pcre3-7.4/debian/rules pcre3-7.4/debian/rules --- pcre3-7.4/debian/rules +++ pcre3-7.4/debian/rules @@ -85,7 +85,7 @@ # dh_installdebconf -a dh_installdocs -a -# dh_installexamples -a + dh_installexamples -a # dh_installmenu -a # dh_installlogrotate -a # dh_installemacsen -a @@ -104,7 +104,7 @@ dh_makeshlibs -plibpcrecpp0 -V 'libpcrecpp0' dh_installdeb -a # dh_perl -a - dh_shlibdeps -a -ldebian/libpcre3/usr/lib + dh_shlibdeps -a -ldebian/libpcre3/lib dh_gencontrol -a dh_md5sums -a dh_builddeb -a diff -u pcre3-7.4/debian/changelog pcre3-7.4/debian/changelog --- pcre3-7.4/debian/changelog +++ pcre3-7.4/debian/changelog @@ -1,3 +1,15 @@ +pcre3 (7.4-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #179669, #186187). + Remaining Ubuntu changes: + - debian/libpcre3-dev.examples, debian/rules: Install pcredemo.c example. + (Debian bug 377587) + - debian/control: Update Maintainer field + * debian/rules, debian/libpcre3*.install: + Move libpcre3 to /lib (LP: #15051) + + -- Daniel Hahler Sat, 26 Jan 2008 19:09:12 +0100 + pcre3 (7.4-1) unstable; urgency=low * Build a -dbg package with debug symbols @@ -26,6 +38,14 @@ -- Mark Baker Mon, 7 Jan 2008 21:03:34 +0000 +pcre3 (7.3-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/libpcre3-dev.examples, debian/rules: Install pcredemo.c example. + - debian/control: Update Maintainer field + + -- Gauvain Pocentek Fri, 26 Oct 2007 16:53:02 +0200 + pcre3 (7.3-2) unstable; urgency=low * Overloaded RE::Init(), for compatibility with PCRE 6.x API (Closes @@ -42,6 +62,23 @@ -- Mark Baker Tue, 28 Aug 2007 20:53:39 +0100 +pcre3 (7.2-1ubuntu2) gutsy; urgency=low + + * Work around an API change; in 7.0, the signature of + void RE::Init(const char *pat, const RE_Options* options) + did change to + void RE::Init(const string& pat, const RE_Options* options) + Re-add the old one and let it call the new one. LP: #130428. + + -- Matthias Klose Mon, 06 Aug 2007 10:49:23 +0200 + +pcre3 (7.2-1ubuntu1) gutsy; urgency=low + + * Merge from Debian, remaining changes: + - debian/libpcre3-dev.examples, debian/rules: Install pcredemo.c example. + + -- Matthias Klose Sat, 04 Aug 2007 12:50:59 +0000 + pcre3 (7.2-1) unstable; urgency=low * New upstream release (Closes: #420280) @@ -49,12 +86,33 @@ -- Mark Baker Fri, 3 Aug 2007 23:06:28 +0100 +pcre3 (6.7-1ubuntu2) feisty; urgency=low + + * Rebuild for changes in the amd64 toolchain. + * Set Ubuntu maintainer address. + + -- Matthias Klose Mon, 5 Mar 2007 01:24:24 +0000 + +pcre3 (6.7-1ubuntu1) feisty; urgency=low + + * Merge from debian unstable; remaining Ubuntu change: + - debian/libpcre3-dev.examples, debian/rules: Install pcredemo.c example. + + -- Martin Pitt Mon, 30 Oct 2006 12:37:53 +0100 + pcre3 (6.7-1) unstable; urgency=low * New upstream release (Closes: #389305) -- Mark Baker Mon, 25 Sep 2006 23:24:55 +0100 +pcre3 (6.4-2ubuntu1) edgy; urgency=low + + * Merge from debian unstable; remaining Ubuntu change: + - debian/libpcre3-dev.examples, debian/rules: Install pcredemo.c example. + + -- Martin Pitt Mon, 10 Jul 2006 10:52:29 +0200 + pcre3 (6.4-2) unstable; urgency=low * Makefile.in: Install pcrepartial.3 (Closes: #362011) @@ -66,6 +124,32 @@ -- Mark Baker Thu, 27 Apr 2006 22:32:06 +0100 +pcre3 (6.4-1.1ubuntu4) dapper; urgency=low + + * Install pcredemo.c example with the devel library (LP #37853) + + -- Jani Monoses Fri, 14 Apr 2006 13:03:32 +0300 + +pcre3 (6.4-1.1ubuntu3) dapper; urgency=low + + * Install the provided .pc file so packages looking for libpcre via + pkg-config find it (ex: thunar) + + -- Jani Monoses Fri, 14 Apr 2006 12:33:22 +0300 + +pcre3 (6.4-1.1ubuntu2) dapper; urgency=low + + * Don't build the libpcre3c2a package anymore. + + -- Matthias Klose Mon, 23 Jan 2006 21:36:37 +0000 + +pcre3 (6.4-1.1ubuntu1) dapper; urgency=low + + * Synchronise with unstable. + * Keep libpcre3c2a for a while until packages depend on libpcre3 again. + + -- Matthias Klose Fri, 25 Nov 2005 10:29:13 +0100 + pcre3 (6.4-1.1) unstable; urgency=low * Split out the C++ library into it's own package libpcrecpp0, as @@ -76,6 +160,12 @@ -- Matthias Klose Fri, 25 Nov 2005 07:59:14 +0100 +pcre3 (6.4-1ubuntu1) dapper; urgency=low + + * Rename libpcre3 to libpcre3c2a (libstdc++ allocator change). + + -- Matthias Klose Wed, 23 Nov 2005 21:31:18 +0100 + pcre3 (6.4-1) unstable; urgency=low * New upstream release (Closes: 333191) @@ -263,7 +353,6 @@ What follows is the changelog from pcre 3, up to the point where the pcre3 package was made. - pcre2 (2.08-1) unstable; urgency=low * new upstream version (#50386) @@ -325,10 +414,8 @@ What follows is the changelog from pcre 1, up to the point where the pcre2 package was made. - The changes are not that large but the API, and therefore the ABI, are changed so version 2 is not compatible. - pcre (1.09-2) unstable; urgency=low * pcreposix.c,pcreposix.h: prefixed function names with pcreposix_ @@ -424,0 +512 @@ + diff -u pcre3-7.4/debian/libpcre3-udeb.install pcre3-7.4/debian/libpcre3-udeb.install --- pcre3-7.4/debian/libpcre3-udeb.install +++ pcre3-7.4/debian/libpcre3-udeb.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/libpcre.so.* -debian/tmp/usr/lib/libpcreposix.so.* +debian/tmp/usr/lib/libpcre.so.* lib +debian/tmp/usr/lib/libpcreposix.so.* lib diff -u pcre3-7.4/debian/libpcre3-dev.install pcre3-7.4/debian/libpcre3-dev.install --- pcre3-7.4/debian/libpcre3-dev.install +++ pcre3-7.4/debian/libpcre3-dev.install @@ -1,6 +1,6 @@ debian/tmp/usr/include/* -debian/tmp/usr/lib/lib*.a -debian/tmp/usr/lib/lib*.so +debian/tmp/usr/lib/lib*.a lib +debian/tmp/usr/lib/lib*.so lib debian/tmp/usr/lib/pkgconfig/* debian/tmp/usr/bin/*-config debian/tmp/usr/share/man/man3/* only in patch2: unchanged: --- pcre3-7.4.orig/debian/libpcre3-dev.examples +++ pcre3-7.4/debian/libpcre3-dev.examples @@ -0,0 +1 @@ +pcredemo.c