Wed Sep 3 17:14:14 UTC 2014

This is an automated email from the git hooks/post-receive script.

joostvb pushed a commit to branch master
in repository timblserver.

commit 6d3a8f1a9b6d6310356f132068fc00a4de2abead
Author: Joost van Baal-Ilić <joostvb at debian.org>
Date:   Thu Aug 1 19:05:15 2013 +0000

    * 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.
    * 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/changelog                   | 16 +++++++++++++++-
 debian/control                     | 10 +++++-----
 debian/libtimblserver-dev.install  |  6 ------
 debian/libtimblserver3-dev.install |  6 ++++++
 debian/libtimblserver3.install     |  4 ++--
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cad16ca..e3b9aeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,24 @@
 timblserver (1.7-4) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * 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.
+  * 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ć <joostvb at debian.org>  Sat, 15 Jun 2013 13:43:10 +0200
+ -- Joost van Baal-Ilić <joostvb at debian.org>  Thu, 01 Aug 2013 21:05:04 +0200
 
 timblserver (1.7-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8978011..d636984 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Joost van Baal-Ilić <joostvb at debian.org>, Ko van der Sloot <ko.vandersloot at uvt.nl>
-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 @@ Description: Server extensions for Timbl - runtime
  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 --git a/debian/libtimblserver-dev.install b/debian/libtimblserver-dev.install
deleted file mode 100644
index 9714409..0000000
--- a/debian/libtimblserver-dev.install
+++ /dev/null
@@ -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 --git a/debian/libtimblserver3-dev.install b/debian/libtimblserver3-dev.install
new file mode 100644
index 0000000..dfc854d
--- /dev/null
+++ b/debian/libtimblserver3-dev.install
@@ -0,0 +1,6 @@
+# $Id$
+# $URL$
+usr/lib/*.a
+usr/lib/libtimblserver.so
+usr/lib/pkgconfig
+usr/include/timblserver
diff --git a/debian/libtimblserver3.install b/debian/libtimblserver3.install
index ef17379..f30e3c9 100644
--- a/debian/libtimblserver3.install
+++ b/debian/libtimblserver3.install
@@ -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$
+# $URL$
 /usr/lib/libtimblserver.so.3*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/timblserver.git

