diff -Nru mx-1.4.6/debian/changelog mx-1.4.6/debian/changelog --- mx-1.4.6/debian/changelog 2012-05-11 16:52:10.000000000 +0000 +++ mx-1.4.6/debian/changelog 2012-05-30 11:24:05.000000000 +0000 @@ -1,22 +1,47 @@ -mx (1.4.6-0ubuntu1~12.04~ricotz0) precise; urgency=low +mx (1.4.6-1ubuntu1~precise1) precise; urgency=low + + * Copied from quantal + + -- Rico Tzschichholz Wed, 30 May 2012 13:24:05 +0200 + +mx (1.4.6-1ubuntu1) quantal; urgency=low + + * debian/control.in: + - Don't build-depend on libclutter-imcontext-0.1-dev or + libcluttergesture-dev; they aren't in main and appear to have been + abandoned by their developers + + -- Jeremy Bicha Sat, 26 May 2012 18:24:33 -0400 + +mx (1.4.6-1) unstable; urgency=low * New upstream release - -- Rico Tzschichholz Fri, 11 May 2012 18:52:10 +0200 + -- Ying-Chun Liu (PaulLiu) Wed, 16 May 2012 20:41:13 +0800 -mx (1.4.3-0ubuntu1) precise; urgency=low +mx (1.4.5-1) unstable; urgency=low - [ Rico Tzchichholz ] - * Sync with Debian. Remaining changes: * New upstream release - * Bump debhelper compat to 8 - * debian/control: - - Wrap and sort - - Add gir dependencies - * debian/rules: - - Simplify and fix several bugs - -- Jeremy Bicha Wed, 14 Mar 2012 21:09:51 -0400 + -- Ying-Chun Liu (PaulLiu) Sun, 01 Apr 2012 02:09:54 +0800 + +mx (1.4.3-2) unstable; urgency=low + + * Fix typelib files installed in wrong directory (Closes: #664818) + + -- Ying-Chun Liu (PaulLiu) Wed, 21 Mar 2012 10:07:56 +0800 + +mx (1.4.3-1) unstable; urgency=low + + * New upstream release + * Bump Standards-Version to 3.9.3: nothing needs to be changed. + * Update debian/copyright to format 1.0 + * debian/control: gir1.2-mx-1.0 Section: libs -> introspection + * Multi-Arch support + - Bump debhelper version to 9 + - Split libmx-bin and libmx-common from shared library package + + -- Ying-Chun Liu (PaulLiu) Sun, 18 Mar 2012 02:17:30 +0800 mx (1.4.2-1) unstable; urgency=low @@ -45,12 +70,6 @@ -- Ying-Chun Liu (PaulLiu) Thu, 04 Aug 2011 03:38:29 +0800 -mx (1.2.0-1ubuntu1) oneiric; urgency=low - - * Fix build-dep on new gir1.2-json-1.0 - - -- Rico Tzschichholz Mon, 25 Jul 2011 10:26:15 +0200 - mx (1.2.0-1) unstable; urgency=low * New upstream release diff -Nru mx-1.4.6/debian/clean mx-1.4.6/debian/clean --- mx-1.4.6/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ mx-1.4.6/debian/clean 2012-05-26 22:43:37.000000000 +0000 @@ -0,0 +1,49 @@ +mx-create-image-cache.1 +ltmain.sh +aclocal.m4 +configure +config.h.in +install-sh +missing +depcomp +config.guess +config.sub +config.log +config.status +m4/libtool.m4 +m4/ltoptions.m4 +m4/ltsugar.m4 +m4/ltversion.m4 +m4/lt~obsolete.m4 +m4/gtk-doc.m4 +m4/intltool.m4 +mkinstalldirs +Makefile.in +mx/Makefile.in +m4/Makefile.in +build/Makefile.in +tests/Makefile.in +data/Makefile.in +data/style/Makefile.in +data/glade/Makefile.in +docs/reference/libmx/Makefile.in +docs/reference/Makefile.in +docs/Makefile.in +examples/Makefile.in +po/Makefile.in.in +gtk-doc.make +compile +INSTALL +doltcompile +doltlibtool +docs/reference/libmx/mx-overrides.txt +docs/reference/libmx-gtk/Makefile.in +po/*.gmo +mx-gtk/Makefile.in +docs/reference/libmx/mx-scan.c +intltool-*.in +Makefile +data/Makefile +docs/Makefile +docs/reference/Makefile +docs/reference/libmx/mx.types diff -Nru mx-1.4.6/debian/compat mx-1.4.6/debian/compat --- mx-1.4.6/debian/compat 2012-05-11 16:52:10.000000000 +0000 +++ mx-1.4.6/debian/compat 2012-05-26 22:43:37.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru mx-1.4.6/debian/control mx-1.4.6/debian/control --- mx-1.4.6/debian/control 2012-05-11 16:52:10.000000000 +0000 +++ mx-1.4.6/debian/control 2012-05-26 22:43:37.000000000 +0000 @@ -3,8 +3,11 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Ying-Chun Liu (PaulLiu) -Build-Depends: cdbs, - debhelper (>= 8.1.3), +Build-Depends: autoconf, + automake, + autotools-dev, + cdbs (>= 0.4.93~), + debhelper (>= 9), dh-autoreconf, docbook-to-man, gir1.2-clutter-1.0, @@ -12,22 +15,25 @@ gir1.2-json-1.0, gobject-introspection (>= 0.10.0), gtk-doc-tools, - libclutter-1.0-dev (>= 1.7.91), - libclutter-imcontext-0.1-dev, - libcluttergesture-dev, - libdbus-glib-1-dev (>= 0.82), + intltool, + libclutter-1.0-dev, + libdbus-glib-1-dev, libgdk-pixbuf2.0-dev, - libgtk2.0-dev (>= 2.20), libgirepository1.0-dev (>= 0.10.0), - libstartup-notification0-dev (>= 0.9), + libgtk2.0-dev, + libstartup-notification0-dev, + libtool, libxrandr-dev -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://www.clutter-project.org/ Package: libmx-1.0-2 Section: libs Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends} +Depends: libmx-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} +Recommends: libmx-bin +Multi-Arch: same Description: toolkit for the Moblin user experience The MX toolkit is a GUI toolkit library, using Clutter and is optimized for the Moblin user experience. It consists of various classes useful for @@ -37,10 +43,11 @@ Package: libmx-dev Section: libdevel Architecture: any -Depends: libmx-1.0-2 (= ${binary:Version}), +Depends: autotools-dev, gir1.2-mx-1.0 (= ${binary:Version}), libclutter-1.0-dev, libclutter-imcontext-0.1-dev, + libmx-1.0-2 (= ${binary:Version}), ${misc:Depends} Suggests: libmx-doc Description: toolkit for the Moblin user experience (development files) @@ -56,6 +63,7 @@ Architecture: all Depends: ${misc:Depends} Suggests: devhelp +Multi-Arch: foreign Description: toolkit for the Moblin user experience (documentation) The MX toolkit is a GUI toolkit library, using Clutter and is optimized for the Moblin user experience. It consists of various classes useful for @@ -64,11 +72,43 @@ . This package contains the documentation. +Package: libmx-common +Architecture: all +Section: misc +Depends: ${misc:Depends} +Replaces: libmx-1.0-2 (<< 1.4.3-1) +Breaks: libmx-1.0-2 (<< 1.4.3-1) +Multi-Arch: foreign +Description: toolkit for the Moblin user experience (common files) + The MX toolkit is a GUI toolkit library, using Clutter and is optimized + for the Moblin user experience. It consists of various classes useful for + building UIs such as Buttons, Tooltips, Scrollbars and others. It also + supports styling through CSS stylesheets. + . + This package contains the common files which the libraries need. + +Package: libmx-bin +Architecture: any +Section: misc +Depends: ${misc:Depends}, ${shlibs:Depends} +Replaces: libmx-1.0-2 (<< 1.4.3-1) +Breaks: libmx-1.0-2 (<< 1.4.3-1) +Multi-Arch: foreign +Description: toolkit for the Moblin user experience (utilities) + The MX toolkit is a GUI toolkit library, using Clutter and is optimized + for the Moblin user experience. It consists of various classes useful for + building UIs such as Buttons, Tooltips, Scrollbars and others. It also + supports styling through CSS stylesheets. + . + This package contains the utilities which are used by the libraries and + other packages. + Package: libmx-1.0-2-dbg Architecture: any Section: debug Priority: extra Depends: libmx-1.0-2 (=${binary:Version}), ${misc:Depends} +Multi-Arch: same Description: toolkit for the Moblin user experience (debug symbols) The MX toolkit is a GUI toolkit library, using Clutter and is optimized for the Moblin user experience. It consists of various classes useful for diff -Nru mx-1.4.6/debian/copyright mx-1.4.6/debian/copyright --- mx-1.4.6/debian/copyright 2012-05-11 16:52:10.000000000 +0000 +++ mx-1.4.6/debian/copyright 2012-05-26 22:43:37.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: mx Upstream-Contact: Emmanuele Bassi Thomas Wood @@ -15,27 +15,27 @@ are permitted in any medium without royalty provided the copyright notice and this notice are preserved. -Files: mx/mx-adjustment.[ch] mx/mx-viewport.[ch] +Files: mx/mx-adjustment.* mx/mx-viewport.* Copyright: 2008 OpenedHandoration. 2009 Intel Corporation. License: LGPL-2.1 -Files: mx/mx-button.[ch] mx/mx-widget.[ch] +Files: mx/mx-button.* mx/mx-widget.* Copyright: 2007 OpenedHandl Corporation. 2008-2009 Intel Corporation. License: LGPL-2.1 -Files: mx/mx-gtk.h mx/mx-private.h mx/mx-subtexture.c mx/mx-texture-cache.[ch] mx/mx-texture-frame.c +Files: mx/mx-gtk.h mx/mx-private.h mx/mx-subtexture.c mx/mx-texture-cache.* mx/mx-texture-frame.c Copyright: 2007 OpenedHand 2009 Intel Corporation. License: LGPL-2.1 -Files: mx/mx-scroll-bar.[ch] mx/mx-scroll-view.[ch] mx/mx-scrollable.[ch] +Files: mx/mx-scroll-bar.* mx/mx-scroll-view.* mx/mx-scrollable.* Copyright: 2008 OpenedHand 2009 Intel Corporation. License: LGPL-2.1 -Files: mx/mx-stylable.[ch] +Files: mx/mx-stylable.* Copyright: 2008-2009 Intel Corporation License: LGPL-2.1 diff -Nru mx-1.4.6/debian/gir1.2-mx-1.0.install mx-1.4.6/debian/gir1.2-mx-1.0.install --- mx-1.4.6/debian/gir1.2-mx-1.0.install 2012-05-11 16:52:10.000000000 +0000 +++ mx-1.4.6/debian/gir1.2-mx-1.0.install 2012-05-26 22:43:37.000000000 +0000 @@ -1 +1 @@ -usr/lib/girepository-1.0 +usr/lib/*/girepository-1.0/ usr/lib/ diff -Nru mx-1.4.6/debian/libmx-1.0-2.install mx-1.4.6/debian/libmx-1.0-2.install --- mx-1.4.6/debian/libmx-1.0-2.install 2012-05-11 16:52:10.000000000 +0000 +++ mx-1.4.6/debian/libmx-1.0-2.install 2012-05-26 22:43:37.000000000 +0000 @@ -1,4 +1 @@ -usr/bin/ -usr/lib/*.so.* -usr/share/locale/ -usr/share/mx/ +usr/lib/*/*.so.* diff -Nru mx-1.4.6/debian/libmx-bin.install mx-1.4.6/debian/libmx-bin.install --- mx-1.4.6/debian/libmx-bin.install 1970-01-01 00:00:00.000000000 +0000 +++ mx-1.4.6/debian/libmx-bin.install 2012-05-26 22:43:37.000000000 +0000 @@ -0,0 +1 @@ +usr/bin/ diff -Nru mx-1.4.6/debian/libmx-bin.manpages mx-1.4.6/debian/libmx-bin.manpages --- mx-1.4.6/debian/libmx-bin.manpages 1970-01-01 00:00:00.000000000 +0000 +++ mx-1.4.6/debian/libmx-bin.manpages 2012-05-26 22:43:37.000000000 +0000 @@ -0,0 +1 @@ +mx-create-image-cache.1 diff -Nru mx-1.4.6/debian/libmx-common.install mx-1.4.6/debian/libmx-common.install --- mx-1.4.6/debian/libmx-common.install 1970-01-01 00:00:00.000000000 +0000 +++ mx-1.4.6/debian/libmx-common.install 2012-05-26 22:43:37.000000000 +0000 @@ -0,0 +1,2 @@ +usr/share/locale/ +usr/share/mx/ diff -Nru mx-1.4.6/debian/libmx-dev.install mx-1.4.6/debian/libmx-dev.install --- mx-1.4.6/debian/libmx-dev.install 2012-05-11 16:52:10.000000000 +0000 +++ mx-1.4.6/debian/libmx-dev.install 2012-05-26 22:43:37.000000000 +0000 @@ -1,4 +1,4 @@ usr/include/ -usr/lib/*.so -usr/lib/pkgconfig/ +usr/lib/*/*.so +usr/lib/*/pkgconfig/ usr/share/gir-1.0/ diff -Nru mx-1.4.6/debian/rules mx-1.4.6/debian/rules --- mx-1.4.6/debian/rules 2012-05-11 16:52:10.000000000 +0000 +++ mx-1.4.6/debian/rules 2012-05-26 22:43:37.000000000 +0000 @@ -5,20 +5,22 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc -DEB_DH_MAKESHLIBS_ARGS_libmx-1.0-2 += -V -- -c1 -DEB_INSTALL_MANPAGES_libmx-1.0-2 += debian/mx-create-image-cache.1 +DEB_DH_AUTORECONF_ARGS := $(CURDIR)/debian/rules reconf +DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) -build/libmx-1.0-2:: $(DEB_INSTALL_MANPAGES_libmx-1.0-2) +mx-create-image-cache.1: debian/mx-create-image-cache.sgml + docbook-to-man $< > $@ -%.1: %.sgml - /usr/bin/docbook-to-man $< >$@ +build/libmx-bin:: mx-create-image-cache.1 -clean:: - rm -f $(DEB_INSTALL_MANPAGES_libmx-1.0-2) - -common-binary-predeb-arch:: - find debian -name *.a -exec rm '{}' \; - find debian -name *.la -exec rm '{}' \; +clean:: + rm -rf docs/reference/libmx/html + rm -rf docs/reference/libmx/tmpl + find . -type f -name ".gitignore" -exec rm -f {} \; + +reconf: + intltoolize --force --copy --automake + gtkdocize + autoreconf -f -i -v common-binary-predeb-arch:: list-missing