pangomm

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

  1. ubuntu
  2. Merge into ubuntu
Proposed by Krzysztof Klimonda
Status: Merged
Approved by: Michael Vogt
Approved revision: 17
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~gnomemm/pangomm/ubuntu
Merge into: lp:~ubuntu-desktop/pangomm/ubuntu
Diff against target: 93 lines (+26/-6)
5 files modified
debian/changelog (+16/-0)
debian/control (+4/-2)
debian/control.in (+4/-2)
debian/rules (+1/-1)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~gnomemm/pangomm/ubuntu
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+54785@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Krzysztof Klimonda (kklimonda) wrote :

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.

Revision history for this message
Michael Vogt (mvo) wrote :

Looks fine, thanks for the update!

review: Approve
Revision history for this message
Murray Cumming (murrayc) wrote :

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.

Revision history for this message
Michael Vogt (mvo) wrote :

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.

Revision history for this message
Michael Vogt (mvo) wrote :

Here we go, tarball arrived :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1pangomm (2.28.0-0ubuntu1) UNRELEASED; urgency=low
2
3 * New upstream release. (LP: #742058)
4 * debian/control.in:
5 - add mm-common (>=0.9.3) to build dependencies.
6
7 -- Krzysztof Klimonda <kklimonda@ubuntu.com> Thu, 24 Mar 2011 21:59:26 +0100
8
9pangomm (2.27.1-0ubuntu1) natty; urgency=low
10
11 * New upstream release. (LP: #718412)
12 * debian/rules:
13 - bump SHVER for new API additions
14
15 -- Krzysztof Klimonda <kklimonda@ubuntu.com> Sun, 13 Feb 2011 22:50:14 +0100
16
1pangomm (2.26.3-0ubuntu1) natty; urgency=low17pangomm (2.26.3-0ubuntu1) natty; urgency=low
218
3 * New upstream release19 * New upstream release
420
=== 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 @@
6Source: pangomm6Source: pangomm
7Section: libs7Section: libs
8Priority: optional8Priority: optional
9Maintainer: Michael Casadevall <sonicmctails@gmail.com>9Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
10XSBC-Original-Maintainer: Michael Casadevall <sonicmctails@gmail.com>
10Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Deng Xiyue <manphiz-guest@users.alioth.debian.org>, Sebastian Dröge <slomo@debian.org>11Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Deng Xiyue <manphiz-guest@users.alioth.debian.org>, Sebastian Dröge <slomo@debian.org>
11DM-Upload-Allowed: yes12DM-Upload-Allowed: yes
12Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/pangomm/ubuntu13Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/pangomm/ubuntu
@@ -16,7 +17,8 @@
16 gnome-pkg-tools (>= 0.11),17 gnome-pkg-tools (>= 0.11),
17 libcairomm-1.0-dev (>= 1.2.2),18 libcairomm-1.0-dev (>= 1.2.2),
18 libglibmm-2.4-dev (>= 2.22.1-2),19 libglibmm-2.4-dev (>= 2.22.1-2),
19 libpango1.0-dev (>= 1.23.0)20 libpango1.0-dev (>= 1.23.0),
21 mm-common (>= 0.9.3)
20Standards-Version: 3.9.122Standards-Version: 3.9.1
21Homepage: http://gtkmm.org23Homepage: http://gtkmm.org
2224
2325
=== 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 @@
1Source: pangomm1Source: pangomm
2Section: libs2Section: libs
3Priority: optional3Priority: optional
4Maintainer: Michael Casadevall <sonicmctails@gmail.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Michael Casadevall <sonicmctails@gmail.com>
5Uploaders: @GNOME_TEAM@6Uploaders: @GNOME_TEAM@
6DM-Upload-Allowed: yes7DM-Upload-Allowed: yes
7Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/pangomm/ubuntu8Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/pangomm/ubuntu
@@ -11,7 +12,8 @@
11 gnome-pkg-tools (>= 0.11),12 gnome-pkg-tools (>= 0.11),
12 libcairomm-1.0-dev (>= 1.2.2),13 libcairomm-1.0-dev (>= 1.2.2),
13 libglibmm-2.4-dev (>= 2.22.1-2),14 libglibmm-2.4-dev (>= 2.22.1-2),
14 libpango1.0-dev (>= 1.23.0)15 libpango1.0-dev (>= 1.23.0),
16 mm-common (>= 0.9.3)
15Standards-Version: 3.9.117Standards-Version: 3.9.1
16Homepage: http://gtkmm.org18Homepage: http://gtkmm.org
1719
1820
=== 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 @@
1010
11SHARED_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libpangomm-[[:digit:]\.]+-[[:digit:]][[:alnum:]]*)[[:space:]]*$$/\1/p' debian/control)11SHARED_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libpangomm-[[:digit:]\.]+-[[:digit:]][[:alnum:]]*)[[:space:]]*$$/\1/p' debian/control)
12DOC_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libpangomm-[[:digit:]\.]+-doc)[[:space:]]*$$/\1/p' debian/control)12DOC_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libpangomm-[[:digit:]\.]+-doc)[[:space:]]*$$/\1/p' debian/control)
13SHVER := 2.26.013SHVER := 2.27.1
1414
15LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed15LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
1616
1717
=== 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 @@
1version=31version=3
2http://download.gnome.org/sources/pangomm/([\d\.]+)[24680]/ \2http://download.gnome.org/sources/pangomm/([\d\.]+)/ \
3 pangomm-([\d\.]+)\.tar\.gz3 pangomm-([\d\.]+)\.tar\.gz

Subscribers

People subscribed via source and target branches