Package: fbreader Version: 0.8.12-1 Severity: wishlist Now that we have libhildon and libosso in Debian, we can build the maemo ui as well.
-- "rm -rf" only sounds scary if you don't have backups
diff -ur fbreader-0.8.12/debian/changelog fbreader-0.8.12.new/debian/changelog --- fbreader-0.8.12/debian/changelog 2008-01-22 20:27:10.000000000 +0200 +++ fbreader-0.8.12.new/debian/changelog 2008-01-23 20:45:47.000000000 +0200 @@ -1,3 +1,10 @@ +fbreader (0.8.12-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Add maemo UI + + -- Riku Voipio <[EMAIL PROTECTED]> Wed, 23 Jan 2008 20:44:56 +0200 + fbreader (0.8.12-2) unstable; urgency=low * Include dependency loosening changes. diff -ur fbreader-0.8.12/debian/control fbreader-0.8.12.new/debian/control --- fbreader-0.8.12/debian/control 2008-01-22 20:25:42.000000000 +0200 +++ fbreader-0.8.12.new/debian/control 2008-01-23 20:42:42.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Joey Hess <[EMAIL PROTECTED]> Standards-Version: 3.7.3 -Build-Depends: debhelper (>= 5.0.22), libgtk2.0-dev, libqt3-mt-dev, libqt4-dev, libexpat1-dev, libbz2-dev, libz-dev +Build-Depends: debhelper (>= 5.0.22), libgtk2.0-dev, libqt3-mt-dev, libqt4-dev, libexpat1-dev, libbz2-dev, libz-dev, libhildon-1-dev, libosso-dev Homepage: http://www.fbreader.org/ Vcs-Git: git://git.kitenet.net/joey/packages/fbreader @@ -73,11 +73,20 @@ Description: Qt4 interface module for zlibrary This package provides a qt4-based UI for zlibrary. +Package: libzlui-maemo +Section: libs +Priority: optional +Architecture: any +Depends: ${shlibs:Depends}, libzlcore (= ${Source-Version}) +Provides: libzlui +Description: Maemo interface module for zlibrary + This package provides a maemo-based UI for zlibrary. + Package: libzlcore-dev Section: libdevel Priority: optional Architecture: any -Depends: libzlcore, ${shlibs:Depends}, libzlcore (= ${Source-Version}) +Depends: libzlcore, ${shlibs:Depends} Description: zlibrary core - development files This package contains development files for the zlibrary core. diff -ur fbreader-0.8.12/debian/rules fbreader-0.8.12.new/debian/rules --- fbreader-0.8.12/debian/rules 2008-01-22 22:49:36.000000000 +0200 +++ fbreader-0.8.12.new/debian/rules 2008-01-23 21:51:19.000000000 +0200 @@ -14,6 +14,7 @@ $(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=gtk $(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt $(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt4 + $(MAKE) -C zlibrary/ui TARGET_ARCH=maemo UI_TYPE=maemo4 $(MAKE) -C fbreader TARGET_ARCH=desktop UI_TYPE=dummy touch build-stamp @@ -31,6 +32,7 @@ $(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=gtk DESTDIR=$(DEB_DIR)/libzlui-gtk do_install $(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt DESTDIR=$(DEB_DIR)/libzlui-qt do_install $(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt4 DESTDIR=$(DEB_DIR)/libzlui-qt4 do_install + $(MAKE) -C zlibrary/ui TARGET_ARCH=maemo UI_TYPE=maemo4 DESTDIR=$(DEB_DIR)/libzlui-maemo do_install $(MAKE) -C fbreader TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/fbreader do_install touch install-stamp diff -ur fbreader-0.8.12/makefiles/arch/maemo.mk fbreader-0.8.12.new/makefiles/arch/maemo.mk --- fbreader-0.8.12/makefiles/arch/maemo.mk 2008-01-19 02:54:55.000000000 +0200 +++ fbreader-0.8.12.new/makefiles/arch/maemo.mk 2008-01-23 20:44:31.000000000 +0200 @@ -13,7 +13,7 @@ LD = g++ ifeq "$(UI_TYPE)" "maemo4" - CFLAGS = -pipe -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -pthread -mthumb -DMAEMO_VERSION=4 + CFLAGS = -pipe -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -pthread -DMAEMO_VERSION=4 GTKINCLUDE = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -DMAEMO_CHANGES -I/usr/include/hildon-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include UILIBS = -lhildon-1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgmodule-2.0 -ldl -lfreetype -lz -lfontconfig -lpng12 -lXrender -lX11 -losso -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 else # ifeq "$(UI_TYPE)" "maemo2"
