protobuf (2.5.0-9ubuntu1) trusty; urgency=medium

  * Resynchronise with Debian.  Remaining changes:
    - Fix linking with -lpthread.
    - Move default-jdk to Build-Depends-Indep, also for cross-build
      compatibility.
    - Remove cpp_message.py from the python bindings package, since it
      requires the C++ module implementation that we're no longer shipping. 

 -- Colin Watson <cjwatson@ubuntu.com>  Thu, 13 Feb 2014 12:13:03 +0000

protobuf (2.5.0-9) unstable; urgency=medium

  * Upload to unstable.
  * Officially take over primary maintainership of the package, per Iustin.

 -- Robert S. Edmonds <edmonds@debian.org>  Wed, 05 Feb 2014 11:37:11 -0500

protobuf (2.5.0-8ubuntu1) trusty; urgency=high

  * Resynchronise with Debian experimental.  Remaining changes:
    - Fix linking with -lpthread.
    - Move default-jdk to Build-Depends-Indep, also for cross-build
      compatibility.
    - Remove cpp_message.py from the python bindings package, since it
      requires the C++ module implementation that we're no longer shipping. 

 -- Colin Watson <cjwatson@ubuntu.com>  Wed, 05 Feb 2014 09:30:03 +0000

protobuf (2.5.0-8) experimental; urgency=medium

  * Revert debian/patches/fix-ftbfs-upstream-issue-488.patch to use the
    version of this patch from 2.5.0-5.
  * Build-Depend on g++ >= 4:4.7 to ensure that the *default* compiler is new
    enough to support the gcc __atomic*() built-ins.

 -- Robert S. Edmonds <edmonds@debian.org>  Mon, 03 Feb 2014 19:42:23 -0500

protobuf (2.5.0-7ubuntu1) trusty; urgency=medium

  * Merge from Debian unstable, remaining changes:
    - Fix linking with -lpthread
    - Move default-jdk to Build-Depends-Indep, also for cross-build
      compatibility.
    - Remove cpp_message.py from the python bindings package, since it
      requires the C++ module implementation that we're no longer shipping. 

 -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 04 Feb 2014 13:43:06 -0800

protobuf (2.5.0-7) unstable; urgency=medium

  * Upload to unstable.
  * Closes: #736801.

 -- Robert S. Edmonds <edmonds@debian.org>  Wed, 29 Jan 2014 14:27:42 -0500

protobuf (2.5.0-6) experimental; urgency=medium

  * Use a different approach to fixing the FTBFS caused by upstream bug #488.
  * Revert the Build-Depends on a specific gcc/g++ version.

 -- Robert S. Edmonds <edmonds@debian.org>  Sun, 26 Jan 2014 23:56:47 -0500

protobuf (2.5.0-5ubuntu2) trusty; urgency=medium

  * Remove cpp_message.py from the python bindings package, since it requires
    the C++ module implementation that we're no longer shipping.
    LP: #1275826.

 -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 03 Feb 2014 20:17:09 +0000

protobuf (2.5.0-5ubuntu1) trusty; urgency=medium

  * Merge from Debian unstable, remaining changes:
    - Fix linking with -lpthread
    - Move default-jdk to Build-Depends-Indep, also for cross-build
      compatibility.
  * Dropped all other changes, included in Debian.

 -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 28 Jan 2014 17:57:39 +0000

protobuf (2.5.0-5) unstable; urgency=medium

  * Upload to unstable.
  * Note that the experimental C++ backend in python-protobuf has been
    disabled.

 -- Robert S. Edmonds <edmonds@debian.org>  Sat, 25 Jan 2014 16:57:43 -0500

# For older changelog entries, run 'apt-get changelog libprotobuf-java'
