Please merge protobuf 2.2.0a-0.1 (main) from Debian testing (main)

Bug #502654 reported by Hew
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
protobuf (Ubuntu)
Wishlist
Unassigned

Bug Description

protobuf (2.2.0a-0.1) unstable; urgency=low

  * Non-maintainer upload
  * New upstream release made this evening correction major SONAME
  * debian/control: Updated major version to 5 (Closes: #556563)
  * debian/rules: Updated two links to use libproto*5
  * debian/libprotobuf5.shlibs: Added
  * debian/libprotoc5.shlibs: Added

 -- Dirk Eddelbuettel <email address hidden> Wed, 18 Nov 2009 21:47:41 -0600

protobuf (2.2.0-0.1) unstable; urgency=low

  * Non-maintainer upload coordinated with maintainer
  * New upstream release (Closes: #551931)

  * debian/libprotobuf-install: Added 'usr/lib/pkgconfig/*' to have
    pkg-config support files installed

  * debian/control: Added (= ${binary:Version}) to Depends for -dev
    packages for tighter link to underlying libraries [lintian warning]
  * debian/control: Updated StandardVersion: to 3.8.3

  * debian/control: Major version not incremented as upstream kept it at 4

 -- Dirk Eddelbuettel <email address hidden> Sat, 14 Nov 2009 06:44:22 -0600

https://merges.ubuntu.com/p/protobuf/

This is blocking mumble 1.2.0-1 from being synced.

Related branches

Hew (hew)
Changed in protobuf (Ubuntu):
importance: Undecided → Wishlist
Revision history for this message
Elliot Murphy (statik) wrote :
Revision history for this message
Martin Pitt (pitti) wrote :

Something went wrong with this:

$ bzr merge lp:~statik/ubuntu/lucid/protobuf/merge-bug502654
Warning: criss-cross merge encountered. See bzr help criss-cross.
+N debian/patches/
+N debian/patches/series.OTHER
 M debian/changelog
R debian/patches/ => debian/patches.moved/
R debian/patches/default_python_version => debian/patches/default_python_version
R debian/patches/no_death_tests_on_ia64 => debian/patches/no_death_tests_on_ia64
RM debian/patches/series => debian/patches.moved/series.THIS
Text conflict in debian/changelog
Conflict adding files to debian/patches. Created directory.
Conflict because debian/patches is not versioned, but has versioned children. Versioned directory.
Conflict adding file debian/patches. Moved existing file to debian/patches.moved.
Contents conflict in debian/patches.moved/series
Contents conflict in debian/patches/series
6 conflicts encountered.

Revision history for this message
Martin Pitt (pitti) wrote :

Do you have a plain debdiff between current Debian and the merge? That's much easier to review/upload.

Revision history for this message
Daniel Holbach (dholbach) wrote :

I ran into https://bugs.launchpad.net/bzr/+bug/522041

Can you provide a debdiff please?

Changed in protobuf (Ubuntu):
status: New → Incomplete
Revision history for this message
Hew (hew) wrote :

It looks like this merge has already occurred, but Debian now has 2.3.0-1.

Revision history for this message
Daniel Holbach (dholbach) wrote :

Ok closing this bug then.

Changed in protobuf (Ubuntu):
status: Incomplete → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers