Merge lp:~gnomemm/pangomm/ubuntu into lp:~ubuntu-desktop/pangomm/ubuntu

[Krzysztof Klimonda]

[Krzysztof Klimonda (kklimonda)]

It requires mm-common to be promoted to main, MIR request has status "Fix Commited" (bug 736236), so I assume now we have to upload something that depends on mm-common so it is pulled.

[Michael Vogt (mvo)]

Looks fine, thanks for the update!

review: Approve

[Murray Cumming (murrayc)]

I (upstream) just released pangomm-2.28.1, which removes the need for mm-common during the tarball build, so you shouldn't need to promote mm-common to main.

If that works for you then I'll do the same for atkmm, gtkmm, and others.

[Michael Vogt (mvo)]

Thanks Murray! I removed the b-d to mm-common again and updated the version.

It appears the tarball is not (yet?) on http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.28/ I will wait a little bit with the test-build.

[Michael Vogt (mvo)]

Here we go, tarball arrived :)

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-20 06:32:35 +0000
+++ debian/changelog	2011-03-24 21:13:31 +0000
@@ -1,3 +1,19 @@
+pangomm (2.28.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release. (LP: #742058)
+  * debian/control.in:
+    - add mm-common (>=0.9.3) to build dependencies. 
+
+ -- Krzysztof Klimonda <[e-mail]>  Thu, 24 Mar 2011 21:59:26 +0100
+
+pangomm (2.27.1-0ubuntu1) natty; urgency=low
+
+  * New upstream release. (LP: #718412)
+  * debian/rules:
+    - bump SHVER for new API additions
+
+ -- Krzysztof Klimonda <[e-mail]>  Sun, 13 Feb 2011 22:50:14 +0100
+
 pangomm (2.26.3-0ubuntu1) natty; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2010-12-20 06:32:35 +0000
+++ debian/control	2011-03-24 21:13:31 +0000
@@ -6,7 +6,8 @@
 Source: pangomm
 Section: libs
 Priority: optional
-Maintainer: Michael Casadevall <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Michael Casadevall <[e-mail]>
 Uploaders: Debian GNOME Maintainers <[e-mail]>, Deng Xiyue <[e-mail]>, Sebastian Dröge <[e-mail]>
 DM-Upload-Allowed: yes
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/pangomm/ubuntu
@@ -16,7 +17,8 @@
                gnome-pkg-tools (>= 0.11),
                libcairomm-1.0-dev (>= 1.2.2),
                libglibmm-2.4-dev (>= 2.22.1-2),
-               libpango1.0-dev (>= 1.23.0)
+               libpango1.0-dev (>= 1.23.0),
+               mm-common (>= 0.9.3)
 Standards-Version: 3.9.1
 Homepage: http://gtkmm.org
 

=== modified file 'debian/control.in'
--- debian/control.in	2010-12-20 06:32:35 +0000
+++ debian/control.in	2011-03-24 21:13:31 +0000
@@ -1,7 +1,8 @@
 Source: pangomm
 Section: libs
 Priority: optional
-Maintainer: Michael Casadevall <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Michael Casadevall <[e-mail]>
 Uploaders: @GNOME_TEAM@
 DM-Upload-Allowed: yes
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/pangomm/ubuntu
@@ -11,7 +12,8 @@
                gnome-pkg-tools (>= 0.11),
                libcairomm-1.0-dev (>= 1.2.2),
                libglibmm-2.4-dev (>= 2.22.1-2),
-               libpango1.0-dev (>= 1.23.0)
+               libpango1.0-dev (>= 1.23.0),
+               mm-common (>= 0.9.3)
 Standards-Version: 3.9.1
 Homepage: http://gtkmm.org
 

=== modified file 'debian/rules'
--- debian/rules	2010-12-20 06:25:58 +0000
+++ debian/rules	2011-03-24 21:13:31 +0000
@@ -10,7 +10,7 @@
 
 SHARED_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libpangomm-[[:digit:]\.]+-[[:digit:]][[:alnum:]]*)[[:space:]]*$$/\1/p' debian/control)
 DOC_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libpangomm-[[:digit:]\.]+-doc)[[:space:]]*$$/\1/p' debian/control)
-SHVER := 2.26.0
+SHVER := 2.27.1
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 

=== modified file 'debian/watch'
--- debian/watch	2010-12-20 06:25:58 +0000
+++ debian/watch	2011-03-24 21:13:31 +0000
@@ -1,3 +1,3 @@
 version=3
-http://download.gnome.org/sources/pangomm/([\d\.]+)[24680]/ \
+http://download.gnome.org/sources/pangomm/([\d\.]+)/ \
         pangomm-([\d\.]+)\.tar\.gz