Merge lp:~kklimonda/gtkmm/packaging into lp:~ubuntu-desktop/gtkmm/ubuntu

Proposed by Krzysztof Klimonda
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~kklimonda/gtkmm/packaging
Merge into: lp:~ubuntu-desktop/gtkmm/ubuntu
Diff against target: 117 lines (+28/-14)
5 files modified
debian/changelog (+14/-5)
debian/control (+7/-4)
debian/control.in (+6/-3)
debian/libgtkmm-2.4-dev.install (+0/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~kklimonda/gtkmm/packaging
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Needs Fixing
Review via email: mp+42461@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

On natty:
daniel@bert:~$ apt-cache showsrc gtkmm2.4 | grep ^Ver
Version: 1:2.20.3-1
daniel@bert:~$

I'll make this as rejected. Thanks a lot for your work though!

review: Disapprove
lp:~kklimonda/gtkmm/packaging updated
20. By Krzysztof Klimonda

Upstream no longer installs examples in /usr/share/gtkmm-2.4/

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

Misses a build-dep on libatkm-1.6-dev see the diff between the old and the new configure.ac

Also does it FTBFS on natty amd64:
/bin/bash ../../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I.. -I../.. -I../../gdk -DG_LOG_DOMAIN=\"gtkmm\" -DGTKMM_BUILD=1 -pthread -pthread -I/usr/include/atkmm-1.6 -I/usr/include/atk-1.0 -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/giomm-2.4 -I/usr/lib/giomm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/lib/pangomm-1.4/include -I/usr/include/cairomm-1.0 -I/usr/lib/cairomm-1.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/gtk-unix-print-2.0 -Wall -g -O2 -g -Wall -O2 -c -o colorbutton.lo colorbutton.cc
libtool: compile: g++ -DHAVE_CONFIG_H -I.. -I../.. -I../../gdk -DG_LOG_DOMAIN=\"gtkmm\" -DGTKMM_BUILD=1 -pthread -pthread -I/usr/include/atkmm-1.6 -I/usr/include/atk-1.0 -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/giomm-2.4 -I/usr/lib/giomm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/lib/pangomm-1.4/include -I/usr/include/cairomm-1.0 -I/usr/lib/cairomm-1.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/gtk-unix-print-2.0 -Wall -g -O2 -g -Wall -O2 -c colorbutton.cc -fPIC -DPIC -o .libs/colorbutton.o
Assembler messages:
Fatal error: can't create .libs/colorbutton.o: No such file or directory
make[3]: *** [colorbutton.lo] Fehler 1
make[3]: Verlasse Verzeichnis '/home/daniel/build-area/gtkmm2.4-2.22.0/gtk/gtkmm'
make[2]: *** [all-recursive] Fehler 1
make[2]: Verlasse Verzeichnis '/home/daniel/build-area/gtkmm2.4-2.22.0'
make[1]: *** [all] Fehler 2
make[1]: Verlasse Verzeichnis '/home/daniel/build-area/gtkmm2.4-2.22.0'
make: *** [debian/stamp-makefile-build] Fehler 2
dpkg-buildpackage: Fehler: debian/rules build gab Fehler-Exitstatus 2
debuild: fatal error at line 1335:
dpkg-buildpackage -rfakeroot -D -us -uc failed
bzr: ERROR: The build failed.

review: Needs Fixing
lp:~kklimonda/gtkmm/packaging updated
21. By Krzysztof Klimonda

* debian/control.in:
  - Build-Depend on libatkmm-1.6 >= 2.22.0-1
  - Break and Replace all binary packages on previous versions

22. By Krzysztof Klimonda

We don't break previous version

Revision history for this message
Sebastien Bacher (seb128) wrote :

uploaded the fixed version as discussed on IRC

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-05-19 16:20:50 +0000
3+++ debian/changelog 2010-12-02 17:09:14 +0000
4@@ -1,8 +1,17 @@
5-gtkmm2.4 (1:2.20.3-0ubuntu1) lucid-proposed; urgency=low
6-
7- * New upstream version (lp: #582908)
8-
9- -- Sebastien Bacher <seb128@ubuntu.com> Wed, 19 May 2010 18:02:49 +0200
10+gtkmm2.4 (1:2.22.0-0ubuntu1) natty; urgency=low
11+
12+ * New upstream release (LP: #660787)
13+ * Upstream no longer installs examples in /usr/share/gtkmm-2.4/
14+ * debian/control.in:
15+ - Build-Depend on libatkmm-1.6 >= 2.22.0-1
16+
17+ -- Krzysztof Klimonda <kklimonda@ubuntu.com> Mon, 08 Nov 2010 22:29:30 +0100
18+
19+gtkmm2.4 (1:2.20.3-1) unstable; urgency=low
20+
21+ * New upstream bugfix release.
22+
23+ -- Sebastian Dröge <slomo@debian.org> Tue, 04 May 2010 17:01:12 +0200
24
25 gtkmm2.4 (1:2.20.2-1) unstable; urgency=low
26
27
28=== modified file 'debian/control'
29--- debian/control 2010-04-13 16:23:46 +0000
30+++ debian/control 2010-12-02 17:09:14 +0000
31@@ -6,8 +6,9 @@
32 Source: gtkmm2.4
33 Section: libs
34 Priority: optional
35-Maintainer: Deng Xiyue <manphiz-guest@users.alioth.debian.org>
36-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Mario Lang <mlang@debian.org>, Sebastian Dröge <slomo@debian.org>
37+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
38+XSBC-Original-Maintainer: Deng Xiyue <manphiz-guest@users.alioth.debian.org>
39+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Deng Xiyue <manphiz-guest@users.alioth.debian.org>, Mario Lang <mlang@debian.org>, Sebastian Dröge <slomo@debian.org>
40 DM-Upload-Allowed: yes
41 Homepage: http://www.gtkmm.org/
42 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gtkmm2.4
43@@ -20,7 +21,8 @@
44 libglibmm-2.4-dev (>= 2.24.0),
45 libatk1.0-dev (>= 1.12.0),
46 libcairomm-1.0-dev (>= 1.2.2),
47- libpangomm-1.4-dev (>= 2.26.0)
48+ libpangomm-1.4-dev (>= 2.26.0),
49+ libatkmm-1.6-dev (>= 2.22.0)
50 Standards-Version: 3.8.4
51
52 Package: libgtkmm-2.4-dev
53@@ -33,7 +35,8 @@
54 libglibmm-2.4-dev (>= 2.24.0),
55 libatk1.0-dev (>= 1.12.0),
56 libcairomm-1.0-dev (>= 1.2.2),
57- libpangomm-1.4-dev (>= 2.26.0)
58+ libpangomm-1.4-dev (>= 2.26.0),
59+ libatkmm-1.6-dev (>= 2.22.0)
60 Suggests: libgtkmm-2.4-doc
61 Description: C++ wrappers for GTK+ (development files)
62 Gtkmm is a C++ interface for the popular GUI library GTK+, API version 2.4.
63
64=== modified file 'debian/control.in'
65--- debian/control.in 2010-04-13 16:23:46 +0000
66+++ debian/control.in 2010-12-02 17:09:14 +0000
67@@ -1,7 +1,8 @@
68 Source: gtkmm2.4
69 Section: libs
70 Priority: optional
71-Maintainer: Deng Xiyue <manphiz-guest@users.alioth.debian.org>
72+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
73+XSBC-Original-Maintainer: Deng Xiyue <manphiz-guest@users.alioth.debian.org>
74 Uploaders: @GNOME_TEAM@
75 DM-Upload-Allowed: yes
76 Homepage: http://www.gtkmm.org/
77@@ -15,7 +16,8 @@
78 libglibmm-2.4-dev (>= 2.24.0),
79 libatk1.0-dev (>= 1.12.0),
80 libcairomm-1.0-dev (>= 1.2.2),
81- libpangomm-1.4-dev (>= 2.26.0)
82+ libpangomm-1.4-dev (>= 2.26.0),
83+ libatkmm-1.6-dev (>= 2.22.0)
84 Standards-Version: 3.8.4
85
86 Package: libgtkmm-2.4-dev
87@@ -28,7 +30,8 @@
88 libglibmm-2.4-dev (>= 2.24.0),
89 libatk1.0-dev (>= 1.12.0),
90 libcairomm-1.0-dev (>= 1.2.2),
91- libpangomm-1.4-dev (>= 2.26.0)
92+ libpangomm-1.4-dev (>= 2.26.0),
93+ libatkmm-1.6-dev (>= 2.22.0)
94 Suggests: libgtkmm-2.4-doc
95 Description: C++ wrappers for GTK+ (development files)
96 Gtkmm is a C++ interface for the popular GUI library GTK+, API version 2.4.
97
98=== modified file 'debian/libgtkmm-2.4-dev.install'
99--- debian/libgtkmm-2.4-dev.install 2009-08-28 05:29:51 +0000
100+++ debian/libgtkmm-2.4-dev.install 2010-12-02 17:09:14 +0000
101@@ -4,4 +4,3 @@
102 usr/lib/lib*.so
103 usr/lib/pkgconfig
104 usr/lib/*.la
105-usr/share/gtkmm-2.4
106
107=== modified file 'debian/rules'
108--- debian/rules 2010-04-13 16:23:46 +0000
109+++ debian/rules 2010-12-02 17:09:14 +0000
110@@ -12,7 +12,7 @@
111
112 SHARED_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libgtkmm-[[:digit:]\.]+-[[:digit:]][[:alnum:]]*)[[:space:]]*$$/\1/p' debian/control)
113 DOC_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libgtkmm-[[:digit:]\.]+-doc)[[:space:]]*$$/\1/p' debian/control)
114-SHVER := 1:2.20.0
115+SHVER := 1:2.22.0
116
117 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
118

Subscribers

People subscribed via source and target branches