control: tags -1 fixed-upstream patch pending On Sun, 2 Mar 2014 13:50:35 +0100 Julien Cristau <jcris...@debian.org> wrote: > db5.1 is being replaced by 5.3, but libetpan doesn't seem to want to > build against the latter (configure checks for a list of versions > explicitly, not including 5.3, and chooses 5.1 if it finds it before it > checks for the unversioned libdb.so).
It's just because upstream doesn't know about 5.3, I've pull requested it to upstream and merged. see https://github.com/dinhviethoa/libetpan/pull/115 So I'll upload updated package to 10-days delayed queue. > $ LANG=C dpkg --info ../build/libetpan16_1.1-2.1_amd64.deb > (snip) > Version: 1.1-2.1 > Architecture: amd64 > Maintainer: Ricardo Mones <mo...@debian.org> > Installed-Size: 875 > Depends: libc6 (>= 2.15), libcurl3-gnutls (>= 7.16.2), libdb5.3, libexpat1 > (>= 2.0.1), libgcc1 (>= 1:4.1.1), libgcrypt11 (>= 1.4.5), libgnutls26 (>= > 2.12.17-0), libgpg-error0 (>= 1.10), liblockfile1 (>= 1.0), libsasl2-2, > libstdc++6 (>= 4.1.1), zlib1g (>= 1:1.1.4) > Section: libs > (snip) NMU package depends to libdb5.3 :) Also, upstream has already shipped version 1.3pre2, we should update our package version before jessie release, IMHO. -- Regards, Hideki Yamane henrich @ debian.or.jp/org http://wiki.debian.org/HidekiYamane
diff -Nru libetpan-1.1/debian/changelog libetpan-1.1/debian/changelog --- libetpan-1.1/debian/changelog 2012-06-28 17:49:43.000000000 +0900 +++ libetpan-1.1/debian/changelog 2014-03-08 09:10:07.000000000 +0900 @@ -1,3 +1,17 @@ +libetpan (1.1-2.1) experimental; urgency=medium + + * Non-maintainer upload. + * debian/patches + - add add-db5.3.patch (Closes: #740506) + * debian/rules + - use autoreconf to apply above patch + * debian/control + - add "Build-Depends: dh-autoreconf" to use autoreconf + (Maybe it's overkill but it's okay sicne make it DH7 style in near + future) + + -- Hideki Yamane <henr...@debian.org> Sat, 08 Mar 2014 09:10:03 +0900 + libetpan (1.1-2) experimental; urgency=low * debian/libetpan16.symbols diff -Nru libetpan-1.1/debian/control libetpan-1.1/debian/control --- libetpan-1.1/debian/control 2012-06-28 17:49:43.000000000 +0900 +++ libetpan-1.1/debian/control 2014-03-08 09:08:09.000000000 +0900 @@ -4,7 +4,7 @@ Homepage: http://libetpan.sourceforge.net/libetpan Maintainer: Ricardo Mones <mo...@debian.org> Uploaders: Nikita V. Youshchenko <yo...@debian.org> -Build-Depends: dpkg-dev (>= 1.14.8), debhelper (>> 5), libdb-dev, libgnutls-dev, liblockfile-dev, libsasl2-dev, libexpat1-dev, libcurl4-gnutls-dev (>= 7.16.4-5) +Build-Depends: dpkg-dev (>= 1.14.8), debhelper (>> 5), libdb-dev, libgnutls-dev, liblockfile-dev, libsasl2-dev, libexpat1-dev, libcurl4-gnutls-dev (>= 7.16.4-5), dh-autoreconf Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/users/mones/libetpan.git Vcs-Browser: http://git.debian.org/?p=users/mones/libetpan.git diff -Nru libetpan-1.1/debian/patches/add-db5.3.patch libetpan-1.1/debian/patches/add-db5.3.patch --- libetpan-1.1/debian/patches/add-db5.3.patch 1970-01-01 09:00:00.000000000 +0900 +++ libetpan-1.1/debian/patches/add-db5.3.patch 2014-03-08 09:06:25.000000000 +0900 @@ -0,0 +1,15 @@ +Origin: upstream +Bug-Debian: http://bugs.debian.org/740506 +Last-Update: 2014-03-08 + +--- libetpan-1.1.orig/configure.ac ++++ libetpan-1.1/configure.ac +@@ -385,7 +385,7 @@ dnl Look for db3 or superior with db_cre + case "$DBVERS" in + 3) + AC_MSG_RESULT([version 3.x or above]) +- for lib in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db-3.2 db-3 db3 db; do ++ for lib in db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db-3.2 db-3 db3 db; do + if test "x$DBLINKED" = "x0"; then + dnl AC_CHECK_LIB($lib, db_create, [DBLIB="-l$lib"; DBLINKED=1], []) + dnl installations of libdb4 function names are defined in db.h diff -Nru libetpan-1.1/debian/patches/series libetpan-1.1/debian/patches/series --- libetpan-1.1/debian/patches/series 2012-06-28 17:49:43.000000000 +0900 +++ libetpan-1.1/debian/patches/series 2014-03-08 09:05:46.000000000 +0900 @@ -0,0 +1 @@ +add-db5.3.patch diff -Nru libetpan-1.1/debian/rules libetpan-1.1/debian/rules --- libetpan-1.1/debian/rules 2012-06-28 17:49:43.000000000 +0900 +++ libetpan-1.1/debian/rules 2014-03-08 09:07:40.000000000 +0900 @@ -31,6 +31,7 @@ # Ensure that 'config.h.in' and 'configure' are more recent than # 'configure.in', to avoid attempts to run autotools at build time sleep 1 + autoreconf -fi touch config.h.in configure CFLAGS="$(CFLAGS)" ./configure \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
