diff -Nru timblserver-1.7/debian/changelog timblserver-1.7/debian/changelog --- timblserver-1.7/debian/changelog 2013-06-15 11:39:24.000000000 +0000 +++ timblserver-1.7/debian/changelog 2013-09-08 10:34:42.000000000 +0000 @@ -1,3 +1,27 @@ +timblserver (1.7-4) unstable; urgency=low + + * debian/control: change Build-Depends "libtimbl4-dev | libtimbl-dev" + in "libtimbl4-dev": on second thought, we decided not to go for + unversioned libtimbl-dev. See also Bug#718503: "release.debian.org: + transition: timbl". + * debian/control: change Build-Depends "libticcutils2-dev | + libticcutils-dev" in "libticcutils2-dev (>=0.3)": on second thought, we + decided not to go for unversioned libticcutils-dev. See also Bug#718501: + "release.debian.org: transition: ticcutils". + * debian/libtimblserver3-dev.install, debian/libtimblserver-dev.install, + debian/control: rename libtimblserver-dev to libtimblserver3-dev. Upstream + cannot guarantee strong compatibility yet. This fixes (part of) "mbtserver: + FTBFS: unsatisfiable build-dependencies: libtimblserver3-dev, libmbt1-dev". + Thanks Lucas Nussbaum (Closes: #713119). It fixes "Bug#721495: mbtserver: + Wrong order of build-depends". Thanks Kurt Roeckx (Closes: #721495). + * debian/control: Standards-Version upgraded from policy 3.9.3 to 3.9.4 (no + other changes needed: section 8.6 is mostly not applicable to us: we keep + using shlibs files, not symbols, since we build from C++ sources). + * debian/watch: make sure no longer matches "*-latest.tar.gz", thanks + Bart Martens. + + -- Joost van Baal-Ilić Sun, 08 Sep 2013 12:34:29 +0200 + timblserver (1.7-3) unstable; urgency=low * debian/libtimblserver-dev.install, debian/libtimblserver3-dev.install, @@ -93,7 +117,7 @@ timblserver (1.3-3) unstable; urgency=low - * changed debian/control to build timblserver, libtimblserver + * changed debian/control to build timblserver, libtimblserver and libtimblserver-dev * added debian/timblserver.install debian/libtimblserver.install and debian/libtimblserver-dev.install @@ -109,7 +133,7 @@ timblserver (1.3-1) unstable; urgency=low - * release a TiCC internal lenny version + * release a TiCC internal lenny version -- Ko van der Sloot Wed, 19 Oct 2011 17:24:39 +0200 @@ -136,7 +160,7 @@ * New upstream release. - usr/bin/TimblServer is renamed to usr/bin/timblserver - * debian/lintian-overrides: s/TimblServer/timblserver/ + * debian/lintian-overrides: s/TimblServer/timblserver/ * debian/NEWS updated -- Ko van der Sloot Tue, 28 Mar 2011 10:54:56 +0100 @@ -200,5 +224,5 @@ -- Ko van der Sloot Wed, 10 Mar 2010 10:47:44 +0200 -# $Id: changelog 46020 2013-06-15 11:39:24Z joostvb $ +# $Id: changelog 46248 2013-09-08 10:34:41Z joostvb $ # $URL: svn+ssh://svn.debian.org/svn/debian-science/packages/timblserver/trunk/debian/changelog $ diff -Nru timblserver-1.7/debian/control timblserver-1.7/debian/control --- timblserver-1.7/debian/control 2013-06-15 11:23:51.000000000 +0000 +++ timblserver-1.7/debian/control 2013-08-03 16:43:29.000000000 +0000 @@ -3,8 +3,8 @@ Priority: extra Maintainer: Debian Science Team Uploaders: Joost van Baal-Ilić , Ko van der Sloot -Build-Depends: cdbs, debhelper (>= 7), pkg-config, libtimbl4-dev | libtimbl-dev, libxml2-dev, libticcutils2-dev | libticcutils-dev -Standards-Version: 3.9.3 +Build-Depends: cdbs, debhelper (>= 7), pkg-config, libtimbl4-dev, libxml2-dev, libticcutils2-dev (>= 0.3) +Standards-Version: 3.9.4 Homepage: http://ilk.uvt.nl/timbl/ Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/timblserver/trunk Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/timblserver/trunk/ @@ -43,12 +43,12 @@ This package provides the runtime files required to run programs that use timblserver -Package: libtimblserver-dev +Package: libtimblserver3-dev Section: libdevel Architecture: any Depends: libtimblserver3 (= ${binary:Version}), ${misc:Depends} -Conflicts: libtimblserver2-dev -Replaces: libtimblserver2-dev +Conflicts: libtimblserver2-dev, libtimblserver-dev +Replaces: libtimblserver2-dev, libtimblserver-dev Description: Server extensions for Timbl - development timblserver is a TiMBL wrapper; it adds server functionality to TiMBL. It allows TiMBL to run multiple experiments as a TCP server, optionally via HTTP. diff -Nru timblserver-1.7/debian/libtimblserver-dev.install timblserver-1.7/debian/libtimblserver-dev.install --- timblserver-1.7/debian/libtimblserver-dev.install 2013-06-15 11:18:48.000000000 +0000 +++ timblserver-1.7/debian/libtimblserver-dev.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# $Id: libtimblserver2-dev.install 44269 2011-12-29 08:33:11Z joostvb $ -# $URL: svn+ssh://sloot-guest@svn.debian.org/svn/debian-science/packages/timblserver/trunk/debian/libtimblserver2-dev.install $ -usr/lib/*.a -usr/lib/libtimblserver.so -usr/lib/pkgconfig -usr/include/timblserver diff -Nru timblserver-1.7/debian/libtimblserver3-dev.install timblserver-1.7/debian/libtimblserver3-dev.install --- timblserver-1.7/debian/libtimblserver3-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ timblserver-1.7/debian/libtimblserver3-dev.install 2013-08-03 16:43:29.000000000 +0000 @@ -0,0 +1,6 @@ +# $Id: libtimblserver3-dev.install 46160 2013-08-01 19:05:15Z joostvb $ +# $URL: svn+ssh://svn.debian.org/svn/debian-science/packages/timblserver/trunk/debian/libtimblserver3-dev.install $ +usr/lib/*.a +usr/lib/libtimblserver.so +usr/lib/pkgconfig +usr/include/timblserver diff -Nru timblserver-1.7/debian/libtimblserver3.install timblserver-1.7/debian/libtimblserver3.install --- timblserver-1.7/debian/libtimblserver3.install 2013-04-06 08:41:40.000000000 +0000 +++ timblserver-1.7/debian/libtimblserver3.install 2013-08-03 16:43:29.000000000 +0000 @@ -1,3 +1,3 @@ -# $Id: libtimblserver2.install 44269 2011-12-29 08:33:11Z joostvb $ -# $URL: svn+ssh://sloot-guest@svn.debian.org/svn/debian-science/packages/timblserver/trunk/debian/libtimblserver2.install $ +# $Id: libtimblserver3.install 46160 2013-08-01 19:05:15Z joostvb $ +# $URL: svn+ssh://svn.debian.org/svn/debian-science/packages/timblserver/trunk/debian/libtimblserver3.install $ /usr/lib/libtimblserver.so.3* diff -Nru timblserver-1.7/debian/watch timblserver-1.7/debian/watch --- timblserver-1.7/debian/watch 2012-03-21 05:19:12.000000000 +0000 +++ timblserver-1.7/debian/watch 2013-08-03 16:43:29.000000000 +0000 @@ -1,7 +1,8 @@ -# $Id: watch 44543 2012-03-01 14:09:49Z sloot-guest $ +# $Id: watch 46075 2013-06-16 08:57:40Z joostvb $ # $URL: svn+ssh://svn.debian.org/svn/debian-science/packages/timblserver/trunk/debian/watch $ # See uscan(1) for format version=3 -http://software.ticc.uvt.nl/timblserver-(.*)\.tar\.gz +http://software.ticc.uvt.nl/timblserver-(\d.*)\.(?:tgz|tbz2|tar\.(?:gz|bz2|xz)) +# Bart Martens Sat, 15 Dec 2012 06:37:01 +0000