debian/0000755000000000000000000000000012236465675007206 5ustar debian/libmatchbox1.docs0000644000000000000000000000000511732157776012430 0ustar NEWS debian/rules0000755000000000000000000000115011732331427010246 0ustar #!/usr/bin/make -f DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: dh $@ --with autoreconf override_dh_autoreconf: rm -f config.guess config.sub dh_autoreconf --as-needed override_dh_install: ls -R debian/tmp/ dh_install --list-missing override_dh_installdocs: dh_installdocs -XAUTHORS -XREADME override_dh_clean: -rm -rf doc/man dh_clean override_dh_auto_configure: ./configure --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --enable-pango --enable-jpeg --enable-png --enable-doxygen-docs --enable-xsettings debian/control0000644000000000000000000000451411763350111010573 0ustar Source: libmatchbox Section: libs Priority: optional Maintainer: Moray Allan Build-Depends: debhelper (>= 9.0), dh-autoreconf, pkg-config (>= 0.18), libx11-dev, x11proto-core-dev, libxext-dev, libxt-dev, libglib2.0-dev, libpng-dev, libjpeg-dev, doxygen, libpango1.0-dev, libxsettings-dev, libxsettings-client-dev, autoconf, automake, autotools-dev, libtool Standards-Version: 3.9.3 Homepage: http://matchbox-project.org/ Package: libmatchbox-dev Section: libdevel Architecture: any Multi-Arch: same Depends: libmatchbox1 (= ${binary:Version}), libglib2.0-dev, libjpeg-dev, libpango1.0-dev, libpng-dev, libx11-dev, libxext-dev, ${misc:Depends} Replaces: matchbox (<< 1:0.8.2) Description: shared library for Matchbox Project applications [development] Matchbox is a base environment for the X Window System running on non-desktop embedded platforms such as handhelds, set-top boxes, kiosks and anything else for which screen space, input mechanisms or system resources are limited. . libmatchbox provides core functionality used by several Matchbox project applications. . This package contains libmatchbox development files. Package: libmatchbox-doc Section: doc Architecture: all Multi-Arch: foreign Suggests: libmatchbox-dev Depends: ${misc:Depends} Description: shared library for Matchbox Project applications [documentation] Matchbox is a base environment for the X Window System running on non-desktop embedded platforms such as handhelds, set-top boxes, kiosks and anything else for which screen space, input mechanisms or system resources are limited. . libmatchbox provides core functionality used by several Matchbox project applications. . This package contains the libmatchbox documentation. Package: libmatchbox1 Section: libs Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Replaces: matchbox (<< 1:0.8.2) Description: shared library for Matchbox Project applications [runtime] Matchbox is a base environment for the X Window System running on non-desktop embedded platforms such as handhelds, set-top boxes, kiosks and anything else for which screen space, input mechanisms or system resources are limited. . libmatchbox provides core functionality used by several Matchbox project applications. . This package contains the libmatchbox runtime library. debian/source/0000755000000000000000000000000011732205273010470 5ustar debian/source/format0000644000000000000000000000001411732205273011676 0ustar 3.0 (quilt) debian/changelog0000644000000000000000000001225112236465534011053 0ustar libmatchbox (1.9-osso8-3.1) unstable; urgency=low * Non-maintainer upload. * Fix "FTBFS: ld: dump-image.o: undefined reference to symbol 'XOpenDisplay'": Add patches from Ubuntu / Daniel T Chen: + Fixed FTBFS: - added missing lib to link; - added preprocessor directive to fix implicit declaration warning that would have caused FTBFS on amd64 buildds. (Closes: #713701) -- gregor herrmann Wed, 06 Nov 2013 17:16:27 +0100 libmatchbox (1.9-osso8-3) unstable; urgency=low * Split out documentation into -doc package. Closes: #670009. -- Moray Allan Tue, 05 Jun 2012 10:29:48 +0100 libmatchbox (1.9-osso8-2) unstable; urgency=low * Patch from Simon Ruderich to restore CPPFLAGS. Closes: #668114. -- Moray Allan Wed, 11 Apr 2012 16:44:51 +0100 libmatchbox (1.9-osso8-1) unstable; urgency=low * Pull upstream changes from Maemo repository. -- Moray Allan Fri, 23 Mar 2012 20:16:42 +0000 libmatchbox (1.9-12) unstable; urgency=low * Remember to add "Multi-Arch: same". * Use DEB_LDFLAGS_MAINT_APPEND instead of changing LDFLAGS. -- Moray Allan Wed, 21 Mar 2012 10:53:14 +0000 libmatchbox (1.9-11) unstable; urgency=low * Move debian/rules from cdbs to dh 9. * Convert package to multiarch. * Use --as-needed to avoid unnecessary dependencies. * Switch to dpkg-source 3.0 (quilt) format. -- Moray Allan Tue, 20 Mar 2012 22:54:42 +0000 libmatchbox (1.9-10) unstable; urgency=low * Patch from Nobuhiro Iwamatsu for libpng 1.5. Closes: #649822. -- Moray Allan Mon, 19 Mar 2012 17:46:52 +0000 libmatchbox (1.9-9) unstable; urgency=low * Depend on libpng-dev instead of libpng12-dev. Closes: #662406. -- Moray Allan Sat, 17 Mar 2012 19:33:25 +0000 libmatchbox (1.9-8) unstable; urgency=low * Depend on libjpeg-dev instead of libjpeg62-dev. Closes: #629972. -- Moray Allan Fri, 10 Jun 2011 01:05:02 +0100 libmatchbox (1.9-7) unstable; urgency=low * Remove .a and .la files. Closes: #620588, #621574. -- Moray Allan Sun, 08 May 2011 14:04:48 +0100 libmatchbox (1.9-6) unstable; urgency=low * Add $(X11_LIBS) to LDADD. Closes: #555284. * Update standards version. -- Moray Allan Sat, 07 May 2011 20:14:45 +0100 libmatchbox (1.9-5) unstable; urgency=low * Patch from Neil Williams to fix autoreconf. Closes: #535446. * Change Build-Depends from x-dev to x11proto-core-dev. Closes: #515459. -- Moray Allan Sat, 25 Jul 2009 17:29:11 +0200 libmatchbox (1.9-4) unstable; urgency=low * Enable xsettings support. Closes: #477216. -- Moray Allan Sun, 08 Jun 2008 14:51:04 +0200 libmatchbox (1.9-3) unstable; urgency=low * Enable use of Pango. Closes: #471309. -- Moray Allan Sun, 23 Mar 2008 22:52:52 +0100 libmatchbox (1.9-2) unstable; urgency=low * Update watch file URL. * Update doc/Doxyfile.in for new doxygen (using doxygen -u). -- Moray Allan Sun, 09 Mar 2008 19:10:09 +0100 libmatchbox (1.9-1) unstable; urgency=low * New upstream release. -- Moray Allan Sun, 15 Oct 2006 16:02:14 +0100 libmatchbox (1.8-2) unstable; urgency=low * Fix -dev package Depends for X11R7. -- Moray Allan Sat, 22 Apr 2006 16:50:32 +0100 libmatchbox (1.8-1) unstable; urgency=low * New upstream release. -- Moray Allan Sat, 11 Mar 2006 23:31:45 +0000 libmatchbox (1.7-4) unstable; urgency=low * Update libxft-dev Build-Depends to remove reference to libXft.la in libmb.la. -- Moray Allan Sun, 19 Feb 2006 18:04:21 +0000 libmatchbox (1.7-3) unstable; urgency=low * Update autotools files. * Use Libs.private in .pc file. -- Moray Allan Sun, 15 Jan 2006 00:25:58 +0000 libmatchbox (1.7-2) unstable; urgency=high * Fix shlibs. -- Moray Allan Sun, 1 May 2005 16:11:24 +0100 libmatchbox (1.7-1) unstable; urgency=high * New upstream release. * Update copyright file to reflect LGPL licensing. -- Moray Allan Sat, 30 Apr 2005 14:10:31 +0100 libmatchbox (1.6-1) unstable; urgency=low * New upstream release. -- Moray Allan Mon, 28 Mar 2005 20:11:32 +0100 libmatchbox (1.5-2) unstable; urgency=high * Include .la file in -dev package. * Add shlibs file. * Update watch file. -- Moray Allan Mon, 10 Jan 2005 02:24:54 +0000 libmatchbox (1.5-1) unstable; urgency=high * New upstream release. * Disable Pango to reduce memory use, at upstream maintainer's suggestion. * Patch to avoid segfault when font can't be loaded. -- Moray Allan Fri, 7 Jan 2005 16:13:32 +0000 libmatchbox (1.4-1) unstable; urgency=low * New upstream release. -- Moray Allan Sat, 27 Nov 2004 18:52:41 +0000 libmatchbox (1.2-1) unstable; urgency=low * Split out from monolithic matchbox package. * New maintainer for Matchbox packages. -- Moray Allan Fri, 16 Jul 2004 02:17:39 +0100 debian/rules.cdbs0000755000000000000000000000064211561314454011166 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk DEB_DH_INSTALL_ARGS = --list-missing DEB_CONFIGURE_EXTRA_FLAGS = --enable-pango --enable-jpeg --enable-png --enable-doxygen-docs --enable-xsettings post-patches:: autoreconf -ifs clean:: -rm -rf doc/man -rm missing config.guess config.sub ltmain.sh install-sh depcomp config.sub* config.guess* INSTALL debian/compat0000644000000000000000000000000211732110163010357 0ustar 9 debian/libmatchbox-doc.docs0000644000000000000000000000001211561314454013074 0ustar doc/html/ debian/patches/0000755000000000000000000000000012236465636010632 5ustar debian/patches/50-implicit-decl0000644000000000000000000000035212236465631013511 0ustar --- a/libmb/mbpixbuf.c +++ b/libmb/mbpixbuf.c @@ -23,6 +23,9 @@ #include #include "mbpixbuf.h" +extern int +mb_want_warnings(void); + #define BYTE_ORD_24_RGB 0 #define BYTE_ORD_24_RBG 1 #define BYTE_ORD_24_BRG 2 debian/patches/10-libmb.pc.in0000644000000000000000000000127311732204514013053 0ustar Description: Fix libmb.pc.in pkg-config file The upstream pkg-config file makes anything which uses the library get unnecessary dependencies. We trim it to distinguish between things that libmatchbox uses for building, and things that its dependencies need. Author: Moray Allan --- a/libmb.pc.in +++ b/libmb.pc.in @@ -7,6 +7,7 @@ Description: Utility Library used by Matchbox utilities. Version: @VERSION@ -Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@ -Libs: -L${libdir} -lmb @MB_EXTRA_LIBS@ +Requires.private: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@ +Libs: -L${libdir} -lmb +Libs.private: @MB_EXTRA_LIBS@ Cflags: -I${includedir} @MB_EXTRA_CFLAGS@ debian/patches/40-configure-cppflags0000644000000000000000000000134511741323341014541 0ustar Description: Restore CPPFLAGS in configure.ac Necessary for (hardening) flags from environment. Author: Simon Ruderich Last-Update: 2012-04-09 Index: libmatchbox-1.9-osso8/configure.ac =================================================================== --- libmatchbox-1.9-osso8.orig/configure.ac 2012-03-23 20:19:45.943215410 +0000 +++ libmatchbox-1.9-osso8/configure.ac 2012-04-11 16:43:30.226947513 +0100 @@ -241,8 +241,8 @@ AC_MSG_ERROR([cannot find Xsettings-client headers]) fi - CPPFLAGS="$saved_CPPFLAGS" - LIBS="$saved_LIBS" + CPPFLAGS="$xsetsaved_CPPFLAGS" + LIBS="$xsetsaved_LIBS" MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XSET_LIBS" MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XSET_CFLAGS" debian/patches/series0000644000000000000000000000012012236465530012031 0ustar 10-libmb.pc.in 20-libpng 30-build-system 40-configure-cppflags 50-implicit-decl debian/patches/30-build-system0000644000000000000000000000210512236465636013414 0ustar Description: Fix build Author: Moray Allan --- a/configure.ac +++ b/configure.ac @@ -315,9 +315,9 @@ have_check=no -#if test x$enable_unit_tests = xyes; then -# AM_PATH_CHECK(,have_check=yes, have_check=no) -#fi +if test x$enable_unit_tests = xyes; then + PKG_CHECK_MODULES([CHECK], [check], have_check=yes) +fi AM_CONDITIONAL(HAVE_CHECK, test x$have_check = xyes) --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,12 +1,12 @@ SUBDIRS = menu -TESTS = dot-desktop pixbuf - AM_CPPFLAGS = @CHECK_CFLAGS@ -I../libmb @GCC_WARNINGS@ @XLIBS_CFLAGS@ @PANGO_CFLAGS@ @PNG_CFLAGS@ AM_LDFLAGS = -L../libmb -lmb if HAVE_CHECK +TESTS = dot-desktop pixbuf + check_PROGRAMS=dot-desktop pixbuf dot_desktop_SOURCES=dot-desktop.c @@ -15,10 +15,15 @@ pixbuf_SOURCES=pixbuf.c oh.h pixbuf_LDADD= @CHECK_LIBS@ +else + +TESTS = + endif noinst_PROGRAMS = dump-image dump_image_SOURCES=dump-image.c +dump_image_LDADD= @CHECK_LIBS@ -lX11 EXTRA_DIST = oh-overlayed.png oh.png oh-scaled.png overlay.png oh.jpg oh.xpm \ dot-desktop.c pixbuf.c oh.h debian/patches/20-libpng0000644000000000000000000000211511732205542012232 0ustar Description: Fix building with libpng 1.5 The upstream code FTBFS with libpng1.5. The patch fixes this. Author: Nobuhiro Iwamatsu Last-Update: 2012-03-19 Index: libmatchbox-1.9/libmb/mbpixbuf.c =================================================================== --- libmatchbox-1.9.orig/libmb/mbpixbuf.c 2006-07-26 20:12:25.000000000 +0100 +++ libmatchbox-1.9/libmb/mbpixbuf.c 2012-03-20 22:57:32.909288562 +0000 @@ -247,7 +247,11 @@ return NULL; } +#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 + if ( setjmp( png_jmpbuf ( png_ptr ) ) ) { +#else if ( setjmp( png_ptr->jmpbuf ) ) { +#endif png_destroy_read_struct( &png_ptr, &info_ptr, NULL); fclose(fd); return NULL; @@ -269,8 +273,8 @@ ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA )) png_set_gray_to_rgb(png_ptr); - if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA - || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA + if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA + || color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) *has_alpha = 1; else debian/libmatchbox-dev.install0000644000000000000000000000014011732155370013625 0ustar debian/tmp/usr/include/libmb/* debian/tmp/usr/lib/*/pkgconfig/*.pc debian/tmp/usr/lib/*/lib*.so debian/copyright0000644000000000000000000000171511733156346011136 0ustar This package was debianised by Moray Allan on Mon, 12 Jul 2004 20:39:00 +0100. It was downloaded from http://repository.maemo.org/pool/fremantle/free/libm/libmatchbox1/ Upstream author: Matthew Allum Copyright: Copyright (C) 2002, 2003, 2004 Matthew Allum This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library 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 Lesser General Public License for more details. On Debian GNU/Linux systems, the complete text of the GNU Lesser General Public License can be found in '/usr/share/common-licenses/LGPL-2.1'. debian/libmatchbox1.shlibs0000644000000000000000000000004011561314454012747 0ustar libmb 1 libmatchbox1 (>= 1.7-1) debian/libmatchbox1.install0000644000000000000000000000003711732155015013133 0ustar debian/tmp/usr/lib/*/lib*.so.* debian/watch0000644000000000000000000000016211561314454010222 0ustar version=2 http://projects.o-hand.com/matchbox/sources/libmatchbox/1.9/libmatchbox-(.*)\.tar.gz \ debian uupdate