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

[Krzysztof Klimonda]

[Daniel Holbach (dholbach)]

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]

20. By Krzysztof Klimonda on 2010-12-02

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

[Daniel Holbach (dholbach)]

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]

21. By Krzysztof Klimonda on 2010-12-02

* 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 on 2010-12-02

We don't break previous version

[Sebastien Bacher (seb128)]

uploaded the fixed version as discussed on IRC

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-19 16:20:50 +0000
+++ debian/changelog	2010-12-02 17:09:14 +0000
@@ -1,8 +1,17 @@
-gtkmm2.4 (1:2.20.3-0ubuntu1) lucid-proposed; urgency=low
-
-  * New upstream version (lp: #582908)
-
- -- Sebastien Bacher <[e-mail]>  Wed, 19 May 2010 18:02:49 +0200
+gtkmm2.4 (1:2.22.0-0ubuntu1) natty; urgency=low
+
+  * New upstream release (LP: #660787)
+  * Upstream no longer installs examples in /usr/share/gtkmm-2.4/
+  * debian/control.in:
+    - Build-Depend on libatkmm-1.6 >= 2.22.0-1
+
+ -- Krzysztof Klimonda <[e-mail]>  Mon, 08 Nov 2010 22:29:30 +0100
+
+gtkmm2.4 (1:2.20.3-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Sebastian Dröge <[e-mail]>  Tue, 04 May 2010 17:01:12 +0200
 
 gtkmm2.4 (1:2.20.2-1) unstable; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2010-04-13 16:23:46 +0000
+++ debian/control	2010-12-02 17:09:14 +0000
@@ -6,8 +6,9 @@
 Source: gtkmm2.4
 Section: libs
 Priority: optional
-Maintainer: Deng Xiyue <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Mario Lang <[e-mail]>, Sebastian Dröge <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Deng Xiyue <[e-mail]>
+Uploaders: Debian GNOME Maintainers <[e-mail]>, Deng Xiyue <[e-mail]>, Mario Lang <[e-mail]>, Sebastian Dröge <[e-mail]>
 DM-Upload-Allowed: yes
 Homepage: http://www.gtkmm.org/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gtkmm2.4
@@ -20,7 +21,8 @@
                libglibmm-2.4-dev (>= 2.24.0),
                libatk1.0-dev (>= 1.12.0),
                libcairomm-1.0-dev (>= 1.2.2),
-               libpangomm-1.4-dev (>= 2.26.0)
+               libpangomm-1.4-dev (>= 2.26.0),
+               libatkmm-1.6-dev (>= 2.22.0)
 Standards-Version: 3.8.4
 
 Package: libgtkmm-2.4-dev
@@ -33,7 +35,8 @@
          libglibmm-2.4-dev (>= 2.24.0),
          libatk1.0-dev (>= 1.12.0),
          libcairomm-1.0-dev (>= 1.2.2),
-         libpangomm-1.4-dev (>= 2.26.0)
+         libpangomm-1.4-dev (>= 2.26.0),
+         libatkmm-1.6-dev (>= 2.22.0)
 Suggests: libgtkmm-2.4-doc
 Description: C++ wrappers for GTK+ (development files)
  Gtkmm is a C++ interface for the popular GUI library GTK+, API version 2.4.

=== modified file 'debian/control.in'
--- debian/control.in	2010-04-13 16:23:46 +0000
+++ debian/control.in	2010-12-02 17:09:14 +0000
@@ -1,7 +1,8 @@
 Source: gtkmm2.4
 Section: libs
 Priority: optional
-Maintainer: Deng Xiyue <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Deng Xiyue <[e-mail]>
 Uploaders: @GNOME_TEAM@
 DM-Upload-Allowed: yes
 Homepage: http://www.gtkmm.org/
@@ -15,7 +16,8 @@
                libglibmm-2.4-dev (>= 2.24.0),
                libatk1.0-dev (>= 1.12.0),
                libcairomm-1.0-dev (>= 1.2.2),
-               libpangomm-1.4-dev (>= 2.26.0)
+               libpangomm-1.4-dev (>= 2.26.0),
+               libatkmm-1.6-dev (>= 2.22.0)
 Standards-Version: 3.8.4
 
 Package: libgtkmm-2.4-dev
@@ -28,7 +30,8 @@
          libglibmm-2.4-dev (>= 2.24.0),
          libatk1.0-dev (>= 1.12.0),
          libcairomm-1.0-dev (>= 1.2.2),
-         libpangomm-1.4-dev (>= 2.26.0)
+         libpangomm-1.4-dev (>= 2.26.0),
+         libatkmm-1.6-dev (>= 2.22.0)
 Suggests: libgtkmm-2.4-doc
 Description: C++ wrappers for GTK+ (development files)
  Gtkmm is a C++ interface for the popular GUI library GTK+, API version 2.4.

=== modified file 'debian/libgtkmm-2.4-dev.install'
--- debian/libgtkmm-2.4-dev.install	2009-08-28 05:29:51 +0000
+++ debian/libgtkmm-2.4-dev.install	2010-12-02 17:09:14 +0000
@@ -4,4 +4,3 @@
 usr/lib/lib*.so
 usr/lib/pkgconfig
 usr/lib/*.la
-usr/share/gtkmm-2.4

=== modified file 'debian/rules'
--- debian/rules	2010-04-13 16:23:46 +0000
+++ debian/rules	2010-12-02 17:09:14 +0000
@@ -12,7 +12,7 @@
 
 SHARED_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libgtkmm-[[:digit:]\.]+-[[:digit:]][[:alnum:]]*)[[:space:]]*$$/\1/p' debian/control)
 DOC_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libgtkmm-[[:digit:]\.]+-doc)[[:space:]]*$$/\1/p' debian/control)
-SHVER := 1:2.20.0
+SHVER := 1:2.22.0
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed