diff -Nru pangomm-2.27.1/aclocal.m4 pangomm-2.28.1/aclocal.m4 --- pangomm-2.27.1/aclocal.m4 2011-01-08 17:16:51.000000000 +0000 +++ pangomm-2.28.1/aclocal.m4 2011-03-25 08:23:02.000000000 +0000 @@ -1084,7 +1084,7 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])[]dnl +_PKG_TEXT])dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -1095,7 +1095,7 @@ _PKG_TEXT -To get pkg-config, see .])[]dnl +To get pkg-config, see .])dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -1120,7 +1120,7 @@ [dnl m4_assert([$# >= 1])[]dnl AC_REQUIRE([_MM_PRE_INIT])[]dnl -_MM_PREREQ([mm-common], [0.9.2], [$1], m4_defn([AC_PACKAGE_NAME]))[]dnl +_MM_PREREQ([mm-common], [0.9.4], [$1], m4_defn([AC_PACKAGE_NAME]))[]dnl ]) @@ -1199,13 +1199,13 @@ AC_MSG_CHECKING([location of documentation utilities]) AS_IF([test "x$MMDOCTOOLDIR" = x], [ - MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir glibmm-2.4 2>&AS_MESSAGE_LOG_FD` + MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir mm-common-util 2>&AS_MESSAGE_LOG_FD` AS_IF([test "[$]?" -ne 0], [AC_MSG_ERROR([[not found -The required module glibmm could not be found on this system. If you -are running a binary distribution and the glibmm package is installed, -make sure that any separate development package for glibmm is installed -as well. If you built glibmm yourself, it may be necessary to adjust +The required module mm-common-util could not be found on this system. If you +are running a binary distribution and the mm-common package is installed, +make sure that any separate development package for mm-common is installed +as well. If you built mm-common yourself, it may be necessary to adjust the PKG_CONFIG_PATH environment variable for pkg-config to find it. ]])]) ]) @@ -1241,10 +1241,10 @@ [ mm_err= AS_IF([test "x$MMDOCTOOLDIR" = x], [mm_err='dnl -The glibmm module is available, but the installation of glibmm on this +The mm-common-util module is available, but the installation of mm-common on this machine is missing the shared documentation utilities of the GNOME C++ bindings. It may be necessary to upgrade to a more recent release of -glibmm in order to build '$PACKAGE_NAME' and install the documentation.'], +mm-common in order to build '$PACKAGE_NAME' and install the documentation.'], [test "x$PERL" = xperl], [mm_err='Perl is required for installing the documentation.'], [test "x$USE_MAINTAINER_MODE" != xno], [ diff -Nru pangomm-2.27.1/ChangeLog pangomm-2.28.1/ChangeLog --- pangomm-2.27.1/ChangeLog 2011-01-08 17:16:27.000000000 +0000 +++ pangomm-2.28.1/ChangeLog 2011-03-25 08:22:16.000000000 +0000 @@ -1,25 +1,41 @@ +2.28.1 (stable): + +2011-03-25 Murray Cumming + + Avoid a tarball dependency on mm-common. + + * configure.ac: Add a call to MM_CONFIG_DOCTOOL_DIR() telling it to + copy the files locally and use them from there. + * docs/Makefile.am: Dist the copied files, so that the build does not + try to use the versions installed by mm-common. + +2.28.0 (stable): + +Just a version increase and a regenerated tarball due to changes in an m4 +macro in mm-common. + 2.27.1: 2011-01-08 Murray Cumming LayoutIter: Wrap this as a boxed type, which needs less code. - - * pango/src/layoutiter.[hg|ccg]: PangoLayoutIter became a boxed type at some - point, with a pango_layout_iter_copy() function, so we can now wrap it + + * pango/src/layoutiter.[hg|ccg]: PangoLayoutIter became a boxed type at some + point, with a pango_layout_iter_copy() function, so we can now wrap it normally without so much hand-coding. This also adds a copy constructor. - * pango/src/layout.ccg: get_iter(): Use the LayoutIter copy constructor - instead of the crappy old assign_gobj() function. Also deprecate this - method, adding a get_iter(void), now that the copy constructor allows us to - use LayoutIter as a return type. - + * pango/src/layout.ccg: get_iter(): Use the LayoutIter copy constructor + instead of the crappy old assign_gobj() function. Also deprecate this + method, adding a get_iter(void), now that the copy constructor allows us to + use LayoutIter as a return type. + 2011-01-08 Murray Cumming Improve the generated API documentation. * pango/src/pango_methods.defs: Regenerated with h2defs.py * pango/src/pango_extra_objects.defs: Added some object definitions to help - the documentation generator, avoiding warnings about not being able to - transform C function names into C++ function names. I did the same thing in + the documentation generator, avoiding warnings about not being able to + transform C function names into C++ function names. I did the same thing in gtkmm a few months ago. * pango/src/filelist.am: Mention the new files. * pango/src/pango.defs: Include the new file. @@ -28,8 +44,8 @@ Added conversions used by gtkmm. - * tools/m4/convert_pango.m4: Added the extra conversions that were in the - gtkmm copy of this file. They will probably be needed by other modules so + * tools/m4/convert_pango.m4: Added the extra conversions that were in the + gtkmm copy of this file. They will probably be needed by other modules so it makes sense to keep them to here to avoid duplication. 2011-01-07 Murray Cumming @@ -37,8 +53,8 @@ Allow other modules to use the m4 files. * codegen/Makefile.am: Install the m4 files, like gtkmm installs its files. - * pango/pangomm.pc.in: Add the gmmproc4mdir variable so that other modules such - as gtkmm and cluttermm can get the path to the m4 file, to avoid + * pango/pangomm.pc.in: Add the gmmproc4mdir variable so that other modules such + as gtkmm and cluttermm can get the path to the m4 file, to avoid duplicating its contents. 2011-01-07 Murray Cumming @@ -50,12 +66,12 @@ 2010-12-09 Murray Cumming - Include convert_glibmm.m4 instead of convert_gtkmm.m4. + Include convert_glibmm.m4 instead of convert_gtkmm.m4. - * tools/m4/convert.m4: Inlcude convert_glibmm.m4, just added to glibmm, + * tools/m4/convert.m4: Inlcude convert_glibmm.m4, just added to glibmm, instead of convert_gtkmm.m4, which glibmm no longer provides. - Also include convert_pangomm.m4 - we probably used the copy in glibmm until - now. + Also include convert_pangomm.m4 - we probably used the copy in glibmm until + now. 2010-09-30 Armin Burgmeier @@ -82,8 +98,8 @@ Documentation: Main page: Improve, linking to class and correcting pkg-config - * pango/pangomm.h: Simplify the text, improving the link, and link to - Pango::Layout as a starting point. Correct the pkg-config check from pangomm + * pango/pangomm.h: Simplify the text, improving the link, and link to + Pango::Layout as a starting point. Correct the pkg-config check from pangomm to pangomm-1.4. 2010-04-27 David King diff -Nru pangomm-2.27.1/configure pangomm-2.28.1/configure --- pangomm-2.27.1/configure 2011-01-08 17:16:52.000000000 +0000 +++ pangomm-2.28.1/configure 2011-03-25 08:23:03.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for pangomm 2.27.1. +# Generated by GNU Autoconf 2.67 for pangomm 2.28.1. # # Report bugs to . # @@ -702,8 +702,8 @@ # Identity of this package. PACKAGE_NAME='pangomm' PACKAGE_TARNAME='pangomm' -PACKAGE_VERSION='2.27.1' -PACKAGE_STRING='pangomm 2.27.1' +PACKAGE_VERSION='2.28.1' +PACKAGE_STRING='pangomm 2.28.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pangomm' PACKAGE_URL='http://www.gtkmm.org/' @@ -755,7 +755,6 @@ DOXYGEN DOT PERL -MMDOCTOOLDIR DISABLE_DEPRECATED_API_FALSE DISABLE_DEPRECATED_API_TRUE GMMPROC_DIR @@ -820,6 +819,7 @@ CXXFLAGS CXX LIBPANGOMM_SO_VERSION +MMDOCTOOLDIR PANGOMM_MICRO_VERSION PANGOMM_MINOR_VERSION PANGOMM_MAJOR_VERSION @@ -1475,7 +1475,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pangomm 2.27.1 to adapt to many kinds of systems. +\`configure' configures pangomm 2.28.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1545,7 +1545,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pangomm 2.27.1:";; + short | recursive ) echo "Configuration of pangomm 2.28.1:";; esac cat <<\_ACEOF @@ -1678,7 +1678,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pangomm configure 2.27.1 +pangomm configure 2.28.1 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2077,7 +2077,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pangomm $as_me 2.27.1, which was +It was created by pangomm $as_me 2.28.1, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2872,7 +2872,7 @@ # Define the identity of the package. PACKAGE='pangomm' - VERSION='2.27.1' + VERSION='2.28.1' # Some tools Automake needs. @@ -3036,7 +3036,7 @@ PANGOMM_MODULE_NAME='pangomm-1.4' -PANGOMM_VERSION='2.27.1' +PANGOMM_VERSION='2.28.1' PANGOMM_API_VERSION='1.4' @@ -3045,10 +3045,10 @@ $as_echo "#define PANGOMM_MAJOR_VERSION 2" >>confdefs.h -PANGOMM_MINOR_VERSION=27 +PANGOMM_MINOR_VERSION=28 -$as_echo "#define PANGOMM_MINOR_VERSION 27" >>confdefs.h +$as_echo "#define PANGOMM_MINOR_VERSION 28" >>confdefs.h PANGOMM_MICRO_VERSION=1 @@ -3057,6 +3057,12 @@ +# Copy the mm-common .pl scripts into docs/, +# and use them from there, +# so we can dist them to avoid a tarball-build dependency. +MMDOCTOOLDIR='${top_srcdir}/docs' + + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html LIBPANGOMM_SO_VERSION=1:30:0 @@ -5438,13 +5444,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5441: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5447: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5444: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5450: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5447: output\"" >&5) + (eval echo "\"\$as_me:5453: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6647,7 +6653,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6650 "configure"' > conftest.$ac_ext + echo '#line 6656 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8671,11 +8677,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8674: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8680: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8678: \$? = $ac_status" >&5 + echo "$as_me:8684: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9010,11 +9016,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9013: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9019: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9017: \$? = $ac_status" >&5 + echo "$as_me:9023: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9115,11 +9121,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9118: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9124: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9122: \$? = $ac_status" >&5 + echo "$as_me:9128: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9170,11 +9176,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9173: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9179: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9177: \$? = $ac_status" >&5 + echo "$as_me:9183: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11554,7 +11560,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11557 "configure" +#line 11563 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11650,7 +11656,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11653 "configure" +#line 11659 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13606,11 +13612,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13609: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13615: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13613: \$? = $ac_status" >&5 + echo "$as_me:13619: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13705,11 +13711,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13708: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13714: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13712: \$? = $ac_status" >&5 + echo "$as_me:13718: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13757,11 +13763,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13760: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13766: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13764: \$? = $ac_status" >&5 + echo "$as_me:13770: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14988,26 +14994,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking location of documentation utilities" >&5 -$as_echo_n "checking location of documentation utilities... " >&6; } -if test "x$MMDOCTOOLDIR" = x; then : - - MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir glibmm-2.4 2>&5` - if test "$?" -ne 0; then : - as_fn_error $? "not found -The required module glibmm could not be found on this system. If you -are running a binary distribution and the glibmm package is installed, -make sure that any separate development package for glibmm is installed -as well. If you built glibmm yourself, it may be necessary to adjust -the PKG_CONFIG_PATH environment variable for pkg-config to find it. -" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MMDOCTOOLDIR" >&5 -$as_echo "$MMDOCTOOLDIR" >&6; } - - # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -15184,10 +15170,10 @@ mm_err= if test "x$MMDOCTOOLDIR" = x; then : - mm_err='The glibmm module is available, but the installation of glibmm on this + mm_err='The mm-common-util module is available, but the installation of mm-common on this machine is missing the shared documentation utilities of the GNOME C++ bindings. It may be necessary to upgrade to a more recent release of -glibmm in order to build '$PACKAGE_NAME' and install the documentation.' +mm-common in order to build '$PACKAGE_NAME' and install the documentation.' elif test "x$PERL" = xperl; then : mm_err='Perl is required for installing the documentation.' elif test "x$USE_MAINTAINER_MODE" != xno; then : @@ -16193,7 +16179,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pangomm $as_me 2.27.1, which was +This file was extended by pangomm $as_me 2.28.1, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16260,7 +16246,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pangomm config.status 2.27.1 +pangomm config.status 2.28.1 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -Nru pangomm-2.27.1/configure.ac pangomm-2.28.1/configure.ac --- pangomm-2.27.1/configure.ac 2011-01-08 17:16:15.000000000 +0000 +++ pangomm-2.28.1/configure.ac 2011-03-25 08:22:39.000000000 +0000 @@ -15,7 +15,7 @@ ## You should have received a copy of the GNU Lesser General Public License ## along with this library. If not, see . -AC_INIT([pangomm], [2.27.1], +AC_INIT([pangomm], [2.28.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=pangomm], [pangomm], [http://www.gtkmm.org/]) AC_PREREQ([2.59]) @@ -33,6 +33,11 @@ MM_PREREQ([0.7.1]) MM_INIT_MODULE([pangomm-1.4]) +# Copy the mm-common .pl scripts into docs/, +# and use them from there, +# so we can dist them to avoid a tarball-build dependency. +MM_CONFIG_DOCTOOL_DIR([docs]) + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html AC_SUBST([LIBPANGOMM_SO_VERSION], [1:30:0]) diff -Nru pangomm-2.27.1/debian/changelog pangomm-2.28.1/debian/changelog --- pangomm-2.27.1/debian/changelog 2011-03-25 08:48:32.000000000 +0000 +++ pangomm-2.28.1/debian/changelog 2011-03-25 08:48:33.000000000 +0000 @@ -1,3 +1,20 @@ +pangomm (2.28.1-0ubuntu1) natty; urgency=low + + * New stable upstream release + * debian/control{,.in}: + - remove mm-common from the build dependencies, no longer needed + with 2.28.1 + + -- Michael Vogt Fri, 25 Mar 2011 09:43:03 +0100 + +pangomm (2.28.0-0ubuntu1) natty; urgency=low + + * New upstream release. (LP: #742058) + * debian/control.in: + - add mm-common (>=0.9.3) to build dependencies. + + -- Krzysztof Klimonda Thu, 24 Mar 2011 21:59:26 +0100 + pangomm (2.27.1-0ubuntu1) natty; urgency=low * New upstream release. (LP: #718412) diff -Nru pangomm-2.27.1/debian/control pangomm-2.28.1/debian/control --- pangomm-2.27.1/debian/control 2011-03-25 08:48:32.000000000 +0000 +++ pangomm-2.28.1/debian/control 2011-03-25 08:48:33.000000000 +0000 @@ -6,7 +6,8 @@ Source: pangomm Section: libs Priority: optional -Maintainer: Michael Casadevall +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Michael Casadevall Uploaders: Debian GNOME Maintainers , Deng Xiyue , Sebastian Dröge DM-Upload-Allowed: yes Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/pangomm/ubuntu diff -Nru pangomm-2.27.1/debian/control.in pangomm-2.28.1/debian/control.in --- pangomm-2.27.1/debian/control.in 2011-03-25 08:48:32.000000000 +0000 +++ pangomm-2.28.1/debian/control.in 2011-03-25 08:48:33.000000000 +0000 @@ -1,7 +1,8 @@ Source: pangomm Section: libs Priority: optional -Maintainer: Michael Casadevall +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Michael Casadevall Uploaders: @GNOME_TEAM@ DM-Upload-Allowed: yes Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/pangomm/ubuntu diff -Nru pangomm-2.27.1/debian/watch pangomm-2.28.1/debian/watch --- pangomm-2.27.1/debian/watch 2011-03-25 08:48:32.000000000 +0000 +++ pangomm-2.28.1/debian/watch 2011-03-25 08:48:33.000000000 +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 diff -Nru pangomm-2.27.1/docs/doc-install.pl pangomm-2.28.1/docs/doc-install.pl --- pangomm-2.27.1/docs/doc-install.pl 1970-01-01 00:00:00.000000000 +0000 +++ pangomm-2.28.1/docs/doc-install.pl 2011-03-25 08:22:54.000000000 +0000 @@ -0,0 +1,222 @@ +package main; + +# Copyright (c) 2009 Openismus GmbH +# +# This file is part of mm-common. +# +# mm-common is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 2 of the License, +# or (at your option) any later version. +# +# mm-common is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with mm-common. If not, see . + +use strict; +use warnings; +use bytes; +use File::Glob qw(:glob); +use File::Spec; +use Getopt::Long qw(:config no_getopt_compat no_ignore_case require_order bundling); + +# Globals +my $message_prefix; +my %tags_hash; +my $book_base; +my $perm_mode; +my $target_dir; +my $target_nodir = ''; +my $expand_glob = ''; +my $verbose = ''; + +sub path_basename ($) +{ + my ($path) = @_; + my $basename = File::Spec->splitpath($path); + + return $basename; +} + +sub exit_help () +{ + my $script_name = path_basename($0) || 'doc-install.pl'; + + print <<"EOF"; +Usage: perl $script_name [OPTION]... [-T] SOURCE DEST + or: perl $script_name [OPTION]... SOURCE... DIRECTORY + or: perl $script_name [OPTION]... -t DIRECTORY SOURCE... + +Copy SOURCE to DEST or multiple SOURCE files to the existing DIRECTORY, +while setting permission modes. For HTML files, translate references to +external documentation. + +Mandatory arguments to long options are mandatory for short options, too. + --book-base=BASEPATH use reference BASEPATH for Devhelp book + -l, --tag-base=TAGFILE\@BASEPATH use BASEPATH for references from TAGFILE + -m, --mode=MODE override file permission MODE (octal) + -t, --target-directory=DIRECTORY copy all SOURCE arguments into DIRECTORY + -T, --no-target-directory treat DEST as normal file + --glob expand SOURCE as filename glob pattern + -v, --verbose enable informational messages + -?, --help display this help and exit +EOF + exit; +} + +sub notice (@) +{ + print($message_prefix, @_, "\n") if ($verbose); +} + +sub warning (@) +{ + print STDERR ($message_prefix, @_, "\n"); +} + +sub error (@) +{ + warning(@_); + exit 1; +} + +# Copy file to destination while translating references on the fly. +# Sniff the content for the file type, as it is always read in anyway. +sub install_file ($$$) +{ + my ($in_name, $out_name, $basename) = @_; + my ($in, $out, $buf); + { + local $/; # slurp mode: read entire file into buffer + + open($in, '<', $in_name) and binmode($in) and defined($buf = <$in>) and close($in) + or error('Failed to read ', $basename, ': ', $!); + } + + if (%tags_hash and $buf =~ m/\A(?> \s*)(?> (?> <[?!][^<]+ )* )\s]/sx) + { + my $count = 0; + my $total = $buf =~ + s!(?<= \s) doxygen="((?> [^:"]+)):((?> [^"]*))" # doxygen="(TAGFILE):(BASEPATH)" + (?> \s+) ((?> href|src) =") \2 ((?> [^"]*)") # (href|src=")BASEPATH(RELPATH") + ! $3 . ((exists $tags_hash{$1}) ? (++$count, $tags_hash{$1}) : $2) . $4 + !egsx; + my $change = $total ? "rewrote $count of $total" + : 'no'; + notice('Translating ', $basename, ' (', $change, ' references)'); + } + elsif (defined($book_base) and $buf =~ m/\A(?> \s*)(?> (?> <[?!][^<]+ )* ) + my $change = $buf =~ s/(]*? \b base=") (?> [^"]*) (?= ")/$1$book_base/sx + ? 'rewrote base path' + : 'base path not set'; + notice('Translating ', $basename, ' (', $change, ')'); + } + else + { + notice('Copying ', $basename); + } + + # Avoid inheriting permissions of existing file + unlink($out_name); + + open($out, '>', $out_name) and binmode($out) and print $out ($buf) and close($out) + or error('Failed to write ', $basename, ': ', $!); + + chmod($perm_mode, $out_name) + or warning('Failed to set ', $basename, ' permissions: ', $!); +} + +# Split TAGFILE@BASEPATH argument into key/value pair +sub split_key_value ($) +{ + my ($mapping) = @_; + my ($name, $path) = split(m'@', $mapping, 2); + + error('Invalid base path mapping: ', $mapping) unless (defined($name) and $name ne ''); + + if (defined $path) + { + notice('Using base path ', $path, ' for tag file ', $name); + return ($name, $path); + } + notice('Not changing base path for tag file ', $name); + return (); +} + +# Define line leader of log messages +$message_prefix = path_basename($0); +$message_prefix =~ s/\.[^.]*$//s if (defined $message_prefix); +$message_prefix = ($message_prefix || 'doc-install') . ': '; + +# Process command-line options +{ + my @tags = (); + my $mode = '0644'; + + GetOptions('book-base=s' => \$book_base, + 'tag-base|l=s' => \@tags, + 'mode|m=s' => \$mode, + 'target-directory|t=s' => \$target_dir, + 'no-target-directory|T' => \$target_nodir, + 'glob' => \$expand_glob, + 'verbose|v' => \$verbose, + 'help|?' => \&exit_help) + or exit 2; + + error('Invalid permission mode: ', $mode) unless ($mode =~ m/^[0-7]+$/s); + + $perm_mode = oct($mode); + %tags_hash = map(split_key_value($_), @tags); +} +notice('Using base path ', $book_base, ' for Devhelp book') if (defined $book_base); + +if ($target_nodir) +{ + error('Conflicting target directory options') if (defined $target_dir); + error('Source and destination filenames expected') unless ($#ARGV == 1); + error('Filename globbing requires target directory') if ($expand_glob); + + install_file($ARGV[0], $ARGV[1], path_basename($ARGV[1])); + exit; +} + +unless (defined $target_dir) +{ + if (!$expand_glob and $#ARGV == 1) + { + my $basename = path_basename($ARGV[1]); + + if (defined($basename) and $basename ne '') + { + install_file($ARGV[0], $ARGV[1], $basename); + exit; + } + } + $target_dir = pop(@ARGV); +} +error('No target directory specified') unless (defined($target_dir) and $target_dir ne ''); + +@ARGV = map(bsd_glob($_, GLOB_NOSORT), @ARGV) if ($expand_glob); +my %basename_hash = (); + +foreach my $in_name (@ARGV) +{ + my $basename = path_basename($in_name); + + # If there are multiple files with the same base name in the list, only + # the first one will be installed. This behavior makes it very easy to + # implement a VPATH search for each individual file. + unless (exists $basename_hash{$basename}) + { + $basename_hash{$basename} = undef; + my $out_name = File::Spec->catfile($target_dir, $basename); + install_file($in_name, $out_name, $basename); + } +} +exit; diff -Nru pangomm-2.27.1/docs/doc-postprocess.pl pangomm-2.28.1/docs/doc-postprocess.pl --- pangomm-2.27.1/docs/doc-postprocess.pl 1970-01-01 00:00:00.000000000 +0000 +++ pangomm-2.28.1/docs/doc-postprocess.pl 2011-03-25 08:22:54.000000000 +0000 @@ -0,0 +1,121 @@ +package main; + +# Copyright (c) 2009 Openismus GmbH +# +# This file is part of mm-common. +# +# mm-common is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 2 of the License, +# or (at your option) any later version. +# +# mm-common is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with mm-common. If not, see . + +use strict; +use warnings; +use bytes; +use File::Glob qw(:glob); +use File::Spec; +use Getopt::Long qw(:config no_getopt_compat no_ignore_case require_order bundling); + +sub path_basename ($) +{ + my ($path) = @_; + my $basename = File::Spec->splitpath($path); + + return $basename; +} + +sub exit_help () +{ + my $script_name = path_basename($0) || 'doc-postprocess.pl'; + + print <<"EOF"; +Usage: perl $script_name [OPTION]... [PATTERN]... + +Post-process the Doxygen-generated HTML files matching PATTERN. + +Options: + -?, --help display this help and exit +EOF + exit; +} + +sub error (@) +{ + my $script_name = path_basename($0); + $script_name =~ s/\.[^.]*$//s if (defined $script_name); + + print STDERR ($script_name || 'doc-postprocess', ': ', @_, "\n"); + exit 1; +} + +GetOptions('help|?' => \&exit_help) + or exit 2; + +foreach my $filename (map(bsd_glob($_, GLOB_NOSORT), @ARGV)) +{ + my @buf; + my $file; + + open($file, '<', $filename) and (@buf = <$file>) and close($file) + or error('Failed to read ', path_basename($filename), ': ', $!); + + foreach (@buf) + { + if (/|)template</$1template </; + } + + s/©/©/g; + s/—/—/g; + s/–/–/g; + s/ *  */ /g; + s/(?<=\S)\s{2,}/ /g; + } + + # write the whole buffer back + open($file, '>', $filename) and print $file (@buf) and close($file) + or error('Failed to write ', path_basename($filename), ': ', $!); +} + +exit; diff -Nru pangomm-2.27.1/docs/doxygen.css pangomm-2.28.1/docs/doxygen.css --- pangomm-2.27.1/docs/doxygen.css 1970-01-01 00:00:00.000000000 +0000 +++ pangomm-2.28.1/docs/doxygen.css 2011-03-25 08:22:54.000000000 +0000 @@ -0,0 +1,249 @@ +/* GNOME C++ bindings Doxygen style */ + +html, body { + background: #FFFFFF; + color: #222222; + margin: 0; +} + +body { + font: normal 90%/150% sans-serif; + padding: 1.5em; + min-width: 28em; +} + +table { + font-size: inherit; +} + +img { + border-style: none; +} + +address img { + vertical-align: middle; +} + +h1 { + font-size: 150%; + line-height: 120%; + text-align: center; +} + +h2 { + font-size: 120%; +} + +h3 { + font-size: 100%; +} + +h1 + h3 { + text-align: center; +} + +.navpath { + display: none; +} + +caption { + font-weight: bold; +} + +p, dl { + margin: 0.75em 0; +} + +.center { + text-align: center; +} + +div.qindex { + width: 100%; + line-height: 140%; + background-color: #E8EEF2; + border: 1px solid #84B0C7; + text-align: center; + margin: 0.2em; + padding: 0.2em; +} + +a { + color: #153788; + font-weight: normal; + text-decoration: none; +} + +.contents a:visited { + color: #1B77C5; +} + +a:hover { + text-decoration: underline; +} + +a.el, a.qindex { + font-weight: bold; +} + +dl.el { + margin-left: -1.5em; +} + +code, .fragment { + font-family: monospace, fixed; +} + +pre.fragment { + background-color: #EEEEFF; + border: 1px solid #AAAAFF; + padding: 0.5em; + margin: 0.375em 0.75em 0.375em 0.2em; +} + +div.ah { + background-color: #000000; + color: #FFFFFF; + font-weight: bold; + margin: 0.2em 0; +} + +.indexkey, .indexvalue { + background-color: #E8EEF2; + border: 1px solid #CCCCCC; + margin: 0.2em 0; + padding: 0.2em 0.75em; +} + +.indexkey { + font-weight: bold; +} +.memlist { + background-color: #F0F0F0; +} + +span.keyword { + color: #008000; +} + +span.keywordtype { + color: #604020; +} + +span.keywordflow { + color: #E08000; +} + +span.comment { + color: #800000; +} + +span.preprocessor { + color: #806020; +} + +span.stringliteral { + color: #002080; +} + +span.charliteral { + color: #008080; +} + +.tiny { + font-size: 80%; +} + +hr { + height: 0; + border: none; + border-top: 1px solid #666666; +} + +.mdescLeft, .mdescRight, .memItemLeft, .memItemRight, +.memTemplItemLeft, .memTemplItemRight, .memTemplParams { + background-color: #FAFAFA; + border: none; + margin: 0.375em; + padding: 0.125em 0 0 0.75em; +} + +.mdescLeft, .mdescRight { + padding: 0 0.75em 0.375em; + color: #555555; +} + +.memItemLeft, .memItemRight, .memTemplParams { + border-top: 1px solid #CCCCCC; +} + +.memTemplParams { + color: #606060; +} + +.memtemplate { + color: #606060; + font-size: 90%; + font-weight: normal; + margin-left: 0.2em; +} + +.memnav { + background-color: #E8EEF2; + border: 1px solid #84B0C7; + text-align: center; + margin: 0.2em 1em 0.2em 0; + padding: 0.2em; +} + +.memitem { + margin: 0.5em 0; + padding: 0; +} + +.memname { + white-space: nowrap; + font-weight: bold; + line-height: 120%; +} + +.memproto, .memdoc { + border: 1px solid #84B0C7; +} + +.memproto { + padding: 0; + background-color: #D5E1E8; + font-weight: bold; + -webkit-border-top-left-radius: 1ex; + -webkit-border-top-right-radius: 1ex; + -moz-border-radius-topleft: 1ex; + -moz-border-radius-topright: 1ex; +} + +.memdoc { + padding: 0.2em 0.5em; + background-color: #EEF3F5; + border-top-width: 0; + -webkit-border-bottom-left-radius: 1ex; + -webkit-border-bottom-right-radius: 1ex; + -moz-border-radius-bottomleft: 1ex; + -moz-border-radius-bottomright: 1ex; +} + +.paramkey { + text-align: right; +} + +.paramtype { + white-space: nowrap; +} + +.paramname { + color: #602020; + white-space: nowrap; +} + +.paramname em { + font-style: normal; +} diff -Nru pangomm-2.27.1/docs/Makefile.am pangomm-2.28.1/docs/Makefile.am --- pangomm-2.27.1/docs/Makefile.am 2010-05-04 08:07:47.000000000 +0000 +++ pangomm-2.28.1/docs/Makefile.am 2011-03-25 08:16:42.000000000 +0000 @@ -28,3 +28,10 @@ dist_docimages_DATA = images/gtkmm_logo.gif images/top.gif include $(top_srcdir)/build/doc-reference.am + +# These are copied here by mm-common: +dist_noinst_DATA += \ + doc-install.pl \ + doc-postprocess.pl \ + tagfile-to-devhelp2.xsl \ + doxygen.css diff -Nru pangomm-2.27.1/docs/Makefile.in pangomm-2.28.1/docs/Makefile.in --- pangomm-2.27.1/docs/Makefile.in 2011-01-08 17:16:54.000000000 +0000 +++ pangomm-2.28.1/docs/Makefile.in 2011-03-25 08:23:05.000000000 +0000 @@ -279,7 +279,10 @@ @ENABLE_DOCUMENTATION_FALSE@doc_dist_files = @ENABLE_DOCUMENTATION_TRUE@doc_dist_files = $(devhelpfile) $(call vpath_listall,$(htmlref_patterns)) dist_reference_DATA = $(strip $(doc_inst_files)) -dist_noinst_DATA = $(strip $(doc_dist_files)) + +# These are copied here by mm-common: +dist_noinst_DATA = $(strip $(doc_dist_files)) doc-install.pl \ + doc-postprocess.pl tagfile-to-devhelp2.xsl doxygen.css DISTCLEANFILES = $(doc_outdir)/doxygen.log MAINTAINERCLEANFILES = $(doxytagfile) $(devhelpfile) $(doc_outdir)/html/* diff -Nru pangomm-2.27.1/docs/reference/html/annotated.html pangomm-2.28.1/docs/reference/html/annotated.html --- pangomm-2.27.1/docs/reference/html/annotated.html 2011-01-08 17:17:27.000000000 +0000 +++ pangomm-2.28.1/docs/reference/html/annotated.html 2011-03-25 08:23:36.000000000 +0000 @@ -72,7 +72,7 @@ Pango::TabArrayA Pango::TabArray contains an array of tab stops -