summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/altboot/README.txt2
-rw-r--r--packages/altboot/altboot_svn.bb2
-rw-r--r--packages/btxml/btxml.bb6
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth.inc11
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth_0.49.bb11
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth_0.51.bb14
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth_0.52.bb14
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth_0.53.bb14
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth_0.54.bb14
-rw-r--r--packages/meta/meta-sdk-sbox.bb35
-rw-r--r--packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch18
-rw-r--r--packages/xorg-xserver/xserver-kdrive_1.2.0.bb2
-rw-r--r--packages/xournal/files/no-printing.diff178
-rw-r--r--packages/xournal/files/xournal.desktop9
-rw-r--r--packages/xournal/xournal_0.2.bb11
-rw-r--r--packages/xournal/xournal_0.3.1.bb11
-rw-r--r--packages/xournal/xournal_0.3.3.bb17
17 files changed, 74 insertions, 295 deletions
diff --git a/packages/altboot/README.txt b/packages/altboot/README.txt
index 07a41bef3d..ed71b03957 100644
--- a/packages/altboot/README.txt
+++ b/packages/altboot/README.txt
@@ -2,4 +2,4 @@ altboot_1.0.5.bb - Last known-working version for clamshell
Zauruses running kernel 2.4
altboot_1.0.8.bb - Last known-working version for all Zauruses
altboot_1.1.1+wip-20061123.bb - Last known-working version for neo1973
-altboot_wip.bb
+altboot_svn.bb - Altboot developer snapshot - avoid ;)
diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb
index baf5116d70..d31c5160a2 100644
--- a/packages/altboot/altboot_svn.bb
+++ b/packages/altboot/altboot_svn.bb
@@ -65,6 +65,8 @@ do_install() {
install -m 0644 ${S}/altbootctl.conf ${D}/etc
install -m 0755 ${S}/init.altboot ${D}/sbin
install -m 0755 ${S}/altbootctl ${D}/sbin
+
+ ln -s /sbin/init.altboot ${D}/sbin/altboot
install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
diff --git a/packages/btxml/btxml.bb b/packages/btxml/btxml.bb
index b48ebb79f6..d072b85bac 100644
--- a/packages/btxml/btxml.bb
+++ b/packages/btxml/btxml.bb
@@ -1,9 +1,9 @@
DESCRIPTION = "Bluetooh Download Data from remote phones"
-PRIORITY = "optional"
-SECTIONS = "apps"
-DEPENDS = "bluez-libs"
HOMEPAGE = "http://www.saftware.de"
+SECTION = "apps"
+PRIORITY = "optional"
LICENSE = "GPL"
+DEPENDS = "bluez-libs"
SRC_URI = "http://www.saftware.de/bluetooth/btxml.c"
S = "${WORKDIR}"
diff --git a/packages/gpe-bluetooth/gpe-bluetooth.inc b/packages/gpe-bluetooth/gpe-bluetooth.inc
new file mode 100644
index 0000000000..c258832c8b
--- /dev/null
+++ b/packages/gpe-bluetooth/gpe-bluetooth.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "GPE bluetooth support user interface tool."
+SECTION = "gpe"
+LICENSE = "GPL"
+PRIORITY = "optional"
+DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
+RDEPENDS = "bluez-utils-dbus blueprobe"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpe autotools
+
+FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb
index f3129fcf17..396beeb014 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb
@@ -1,12 +1,3 @@
-LICENSE = "GPL"
-DESCRIPTION = "GPE bluetooth support"
-SECTION = "gpe"
-PRIORITY = "optional"
+require gpe-bluetooth.inc
DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus libcontactsdb"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-
-GPE_TARBALL_SUFFIX= "bz2"
-inherit gpe autotools
-
-FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
index 15d8ccafcc..98cdbc4b7f 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
@@ -1,16 +1,6 @@
-LICENSE = "GPL"
-DESCRIPTION = "GPE bluetooth support user interface tool."
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r1"
+require gpe-bluetooth.inc
-DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-
-GPE_TARBALL_SUFFIX= "bz2"
-inherit gpe autotools
-
-FILES_${PN} += '${datadir}/bluez-pin'
+PR = "r1"
do_configure () {
autotools_do_configure
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb
index b6dcfcca61..66bc3f0b24 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb
@@ -1,13 +1 @@
-LICENSE = "GPL"
-DESCRIPTION = "GPE bluetooth support user interface tool."
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r0"
-
-DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-
-GPE_TARBALL_SUFFIX= "bz2"
-inherit gpe autotools
-
-FILES_${PN} += '${datadir}/bluez-pin'
+require gpe-bluetooth.inc
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb
index b6dcfcca61..66bc3f0b24 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb
@@ -1,13 +1 @@
-LICENSE = "GPL"
-DESCRIPTION = "GPE bluetooth support user interface tool."
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r0"
-
-DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-
-GPE_TARBALL_SUFFIX= "bz2"
-inherit gpe autotools
-
-FILES_${PN} += '${datadir}/bluez-pin'
+require gpe-bluetooth.inc
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
index e664f51959..9164cc4088 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
@@ -1,16 +1,6 @@
-LICENSE = "GPL"
-DESCRIPTION = "GPE bluetooth support user interface tool."
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r1"
+require gpe-bluetooth.inc
-DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-
-GPE_TARBALL_SUFFIX= "bz2"
-inherit gpe autotools
+PR = "r1"
SRC_URI += "file://hciattach-bts.patch;patch=1 \
file://include-sdp_lib.patch;patch=1"
-
-FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb
index 4e3151805e..cf399644e3 100644
--- a/packages/meta/meta-sdk-sbox.bb
+++ b/packages/meta/meta-sdk-sbox.bb
@@ -1,15 +1,14 @@
DESCRIPTION = "Meta package for a Scratchbox SDK"
LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
PACKAGES = ""
-PACKAGES = ""
-inherit sdk debian
+inherit rootfs_ipk sdk debian
SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
-SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
+SDK_DEPLOY = "${DEPLOY_DIR}/sdk"
prefix = "/"
exec_prefix = "${prefix}"
base_prefix = "${exec_prefix}"
@@ -28,28 +27,11 @@ BUILD_ALL_DEPS = "1"
IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
-ipk_do_indexes () {
- set -x
-
- ipkgarchs="${PACKAGE_ARCHS}"
-
- if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
- touch ${DEPLOY_DIR_IPK}/Packages
- ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
- fi
-
- for arch in $ipkgarchs; do
- if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
- if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then
- touch ${DEPLOY_DIR_IPK}/$arch/Packages
- ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/
- fi
- fi
- done
-}
-
do_populate_sdk() {
- ipk_do_indexes
+
+ set -ex
+ rootfs_ipk_do_indexes
+ set +ex
rm -rf ${SDK_OUTPUT}
mkdir -p ${SDK_OUTPUT}
@@ -99,9 +81,6 @@ EOF
# fix pkgconfig data files
cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig
- #for f in *.pc ; do
- # sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f"
- #done
for f in *.pc ; do
sed -i 's%${STAGING_DIR}%/usr/%g' "$f"
done
diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch
index aec94a3a6d..c82aa943d2 100644
--- a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch
+++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch
@@ -1,7 +1,7 @@
Index: xorg-server-1.2.0/mi/miinitext.c
===================================================================
---- xorg-server-1.2.0.orig/mi/miinitext.c 2007-03-29 11:32:40.000000000 +0200
-+++ xorg-server-1.2.0/mi/miinitext.c 2007-03-29 11:33:22.000000000 +0200
+--- xorg-server-1.2.0.orig/mi/miinitext.c 2007-01-23 06:39:17.000000000 +0100
++++ xorg-server-1.2.0/mi/miinitext.c 2007-03-30 11:28:44.000000000 +0200
@@ -372,6 +372,9 @@
#ifdef DMXEXT
extern void DMXExtensionInit(INITARGS);
@@ -22,3 +22,17 @@ Index: xorg-server-1.2.0/mi/miinitext.c
}
void
+Index: xorg-server-1.2.0/include/kdrive-config.h.in
+===================================================================
+--- xorg-server-1.2.0.orig/include/kdrive-config.h.in 2007-03-30 11:31:07.000000000 +0200
++++ xorg-server-1.2.0/include/kdrive-config.h.in 2007-03-30 11:34:09.000000000 +0200
+@@ -22,6 +22,9 @@
+ /* Support tslib touchscreen abstraction library */
+ #undef TSLIB
+
++/* Build XCalibrate extension */
++#undef XCALIBRATE
++
+ /* Verbose debugging output hilarity */
+ #undef DEBUG
+
diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
index d4c01f240a..b64bfe8ff9 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
DEPENDS += "libxkbfile libxcalibrate"
PE = "1"
-PR = "r2"
+PR = "r3"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
diff --git a/packages/xournal/files/no-printing.diff b/packages/xournal/files/no-printing.diff
deleted file mode 100644
index 7a4724e696..0000000000
--- a/packages/xournal/files/no-printing.diff
+++ /dev/null
@@ -1,178 +0,0 @@
-diff -ru xournal-0.2/configure.in xournal-0.2.noprint/configure.in
---- xournal-0.2/configure.in 2006-01-29 22:25:10.000000000 +0000
-+++ xournal-0.2.noprint/configure.in 2006-03-17 13:08:01.000000000 +0000
-@@ -10,11 +10,16 @@
- AM_PROG_CC_STDC
- AC_HEADER_STDC
-
--pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
-+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0"
- PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
- AC_SUBST(PACKAGE_CFLAGS)
- AC_SUBST(PACKAGE_LIBS)
-
-+#PKG_CHECK_MODULES(GNOMEPRINT, libgnomeprintui-2.2 >= 2.0.0
-+#AC_SUBST(GNOMEPRINT_CFLAGS)
-+#AC_SUBST(GNOMEPRINT_LIBS)
-+AM_CONDITIONAL(ENABLE_PRINTING, false)
-+
- AC_OUTPUT([
- Makefile
- src/Makefile
-diff -ru xournal-0.2/src/main.c xournal-0.2.noprint/src/main.c
---- xournal-0.2/src/main.c 2006-01-29 22:22:52.000000000 +0000
-+++ xournal-0.2.noprint/src/main.c 2006-03-17 13:14:50.000000000 +0000
-@@ -28,7 +28,9 @@
-
- void hide_unimplemented(void)
- {
-+#if ENABLE_PRINTING
- gtk_widget_hide(GET_COMPONENT("filePrintOptions"));
-+#endif
- gtk_widget_hide(GET_COMPONENT("journalFlatten"));
- gtk_widget_hide(GET_COMPONENT("papercolorOther"));
- gtk_widget_hide(GET_COMPONENT("journalApplyAllPages"));
-diff -ru xournal-0.2/src/Makefile.am xournal-0.2.noprint/src/Makefile.am
---- xournal-0.2/src/Makefile.am 2005-12-14 20:54:42.000000000 +0000
-+++ xournal-0.2.noprint/src/Makefile.am 2006-03-17 13:07:47.000000000 +0000
-@@ -7,12 +7,16 @@
-
- bin_PROGRAMS = xournal
-
-+if ENABLE_PRINTING
-+PRINT_SOURCE = xo-print.c xo-print.h
-+endif
-+
- xournal_SOURCES = \
- main.c xournal.h \
- xo-misc.c xo-misc.h \
- xo-file.c xo-file.h \
- xo-paint.c xo-paint.h \
-- xo-print.c xo-print.h \
-+ $(PRINT_SOURCE) \
- xo-support.c xo-support.h \
- xo-interface.c xo-interface.h \
- xo-callbacks.c xo-callbacks.h
-diff -ru xournal-0.2/src/xo-callbacks.c xournal-0.2.noprint/src/xo-callbacks.c
---- xournal-0.2/src/xo-callbacks.c 2006-01-29 19:39:22.000000000 +0000
-+++ xournal-0.2.noprint/src/xo-callbacks.c 2006-03-17 13:12:01.000000000 +0000
-@@ -7,7 +7,9 @@
- #include <gtk/gtk.h>
- #include <libgnomecanvas/libgnomecanvas.h>
- #include <time.h>
-+#if ENABLE_PRINTING
- #include <libgnomeprintui/gnome-print-dialog.h>
-+#endif
- #include <glib/gstdio.h>
-
- #include "xournal.h"
-@@ -17,7 +19,9 @@
- #include "xo-misc.h"
- #include "xo-file.h"
- #include "xo-paint.h"
-+#if ENABLE_PRINTING
- #include "xo-print.h"
-+#endif
-
- void
- on_fileNew_activate (GtkMenuItem *menuitem,
-@@ -261,7 +265,7 @@
-
- }
-
--
-+#if ENABLE_PRINTING
- void
- on_filePrint_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-@@ -407,7 +411,7 @@
-
- g_free(filename);
- }
--
-+#endif
-
- void
- on_fileQuit_activate (GtkMenuItem *menuitem,
-diff -ru xournal-0.2/src/xo-callbacks.h xournal-0.2.noprint/src/xo-callbacks.h
---- xournal-0.2/src/xo-callbacks.h 2006-01-26 20:47:00.000000000 +0000
-+++ xournal-0.2.noprint/src/xo-callbacks.h 2006-03-17 13:08:45.000000000 +0000
-@@ -24,6 +24,7 @@
- on_filePrintOptions_activate (GtkMenuItem *menuitem,
- gpointer user_data);
-
-+#if ENABLE_PRINTING
- void
- on_filePrint_activate (GtkMenuItem *menuitem,
- gpointer user_data);
-@@ -32,6 +33,8 @@
- on_filePrintPDF_activate (GtkMenuItem *menuitem,
- gpointer user_data);
-
-+#endif
-+
- void
- on_fileQuit_activate (GtkMenuItem *menuitem,
- gpointer user_data);
-diff -ru xournal-0.2/src/xo-interface.c xournal-0.2.noprint/src/xo-interface.c
---- xournal-0.2/src/xo-interface.c 2006-01-29 18:58:25.000000000 +0000
-+++ xournal-0.2.noprint/src/xo-interface.c 2006-03-17 13:11:31.000000000 +0000
-@@ -41,10 +41,12 @@
- GtkWidget *fileSave;
- GtkWidget *fileSaveAs;
- GtkWidget *separator1;
-+#if ENABLE_PRINTING
- GtkWidget *filePrintOptions;
- GtkWidget *image501;
- GtkWidget *filePrint;
- GtkWidget *filePrintPDF;
-+#endif
- GtkWidget *separator2;
- GtkWidget *fileQuit;
- GtkWidget *menuEdit;
-@@ -327,6 +329,7 @@
- gtk_container_add (GTK_CONTAINER (menuFile_menu), separator1);
- gtk_widget_set_sensitive (separator1, FALSE);
-
-+#if ENABLE_PRINTING
- filePrintOptions = gtk_image_menu_item_new_with_mnemonic ("Print Options");
- gtk_widget_show (filePrintOptions);
- gtk_container_add (GTK_CONTAINER (menuFile_menu), filePrintOptions);
-@@ -347,6 +350,7 @@
- gtk_widget_show (separator2);
- gtk_container_add (GTK_CONTAINER (menuFile_menu), separator2);
- gtk_widget_set_sensitive (separator2, FALSE);
-+#endif
-
- fileQuit = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group);
- gtk_widget_show (fileQuit);
-@@ -1522,6 +1526,7 @@
- g_signal_connect ((gpointer) fileSaveAs, "activate",
- G_CALLBACK (on_fileSaveAs_activate),
- NULL);
-+#if ENABLE_PRINTING
- g_signal_connect ((gpointer) filePrintOptions, "activate",
- G_CALLBACK (on_filePrintOptions_activate),
- NULL);
-@@ -1531,6 +1536,7 @@
- g_signal_connect ((gpointer) filePrintPDF, "activate",
- G_CALLBACK (on_filePrintPDF_activate),
- NULL);
-+#endif
- g_signal_connect ((gpointer) fileQuit, "activate",
- G_CALLBACK (on_fileQuit_activate),
- NULL);
-@@ -1941,11 +1947,13 @@
- GLADE_HOOKUP_OBJECT (winMain, fileSave, "fileSave");
- GLADE_HOOKUP_OBJECT (winMain, fileSaveAs, "fileSaveAs");
- GLADE_HOOKUP_OBJECT (winMain, separator1, "separator1");
-+#if ENABLE_PRINTING
- GLADE_HOOKUP_OBJECT (winMain, filePrintOptions, "filePrintOptions");
- GLADE_HOOKUP_OBJECT (winMain, image501, "image501");
- GLADE_HOOKUP_OBJECT (winMain, filePrint, "filePrint");
- GLADE_HOOKUP_OBJECT (winMain, filePrintPDF, "filePrintPDF");
- GLADE_HOOKUP_OBJECT (winMain, separator2, "separator2");
-+#endif
- GLADE_HOOKUP_OBJECT (winMain, fileQuit, "fileQuit");
- GLADE_HOOKUP_OBJECT (winMain, menuEdit, "menuEdit");
- GLADE_HOOKUP_OBJECT (winMain, menuEdit_menu, "menuEdit_menu");
diff --git a/packages/xournal/files/xournal.desktop b/packages/xournal/files/xournal.desktop
new file mode 100644
index 0000000000..52dde1e47c
--- /dev/null
+++ b/packages/xournal/files/xournal.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=0.3.3
+Type=Application
+Name=Xournal
+Comment=Notetaking tool
+Exec=/usr/bin/xournal
+Icon=/usr/share/xournal/pixmaps/xournal.png
+Terminal=false
+
diff --git a/packages/xournal/xournal_0.2.bb b/packages/xournal/xournal_0.2.bb
deleted file mode 100644
index 6a4b6839b4..0000000000
--- a/packages/xournal/xournal_0.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-HOMEPAGE = "http://xournal.sf.net/"
-DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus."
-DEPENDS = "gtk+ libgnomecanvas"
-SECTION = "x11"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://xournal.sourceforge.net/xournal-0.2.tar.gz \
- file://no-printing.diff;patch=1"
-
-inherit autotools pkgconfig
diff --git a/packages/xournal/xournal_0.3.1.bb b/packages/xournal/xournal_0.3.1.bb
deleted file mode 100644
index 077036b686..0000000000
--- a/packages/xournal/xournal_0.3.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-HOMEPAGE = "http://xournal.sf.net/"
-DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus."
-DEPENDS = "gtk+ libgnomecanvas"
-SECTION = "x11"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://xournal.sourceforge.net/xournal-0.3.1.tar.gz \
- "
-
-inherit autotools pkgconfig
diff --git a/packages/xournal/xournal_0.3.3.bb b/packages/xournal/xournal_0.3.3.bb
new file mode 100644
index 0000000000..5a8a1b74b7
--- /dev/null
+++ b/packages/xournal/xournal_0.3.3.bb
@@ -0,0 +1,17 @@
+HOMEPAGE = "http://xournal.sf.net/"
+DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus."
+DEPENDS = "gtk+ libgnomecanvas libgnomeprintui"
+SECTION = "x11"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://xournal.sourceforge.net/xournal-${PV}.tar.gz \
+ file://xournal.desktop"
+
+inherit autotools pkgconfig
+
+do_install_append () {
+ install -d ${D}${datadir}/applications/
+ install -m 0644 ${WORKDIR}/xournal.desktop ${D}${datadir}/applications/
+}
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 13:41:40 +0000