diff options
author | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-10-12 17:26:16 +0000 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-10-12 17:26:16 +0000 |
commit | ee749f41f8ee9af1987771a3cca4e506c4c05919 (patch) | |
tree | 012666f0f657d3abc306f6f760d84ce0d68c2bd5 /packages | |
parent | 2e172d2f132c4ca253683393809fa6bcaa9be311 (diff) | |
parent | c9d6f681e3f34bd83550a20056511820e2495ea4 (diff) |
merge of '1e5f74b2b60986b2dbf42fbd03a69ee2a59be5a2'
and 'a205d31ba30bfe2c36e1988e8e13a5dbe3399620'
Diffstat (limited to 'packages')
30 files changed, 397 insertions, 23 deletions
diff --git a/packages/fbida/.mtn2git_empty b/packages/fbida/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fbida/.mtn2git_empty diff --git a/packages/fbida/fbida_2.07.bb b/packages/fbida/fbida_2.07.bb new file mode 100644 index 0000000000..9360600858 --- /dev/null +++ b/packages/fbida/fbida_2.07.bb @@ -0,0 +1,21 @@ +# - Currently this app needs ttf-dejavu-sans-mono[.ipk] installed! +# - think about using fbi -a option for autozoom on tiny screens +# - fbi displays in portrait-mode if your fb is in portrait (normal) mode too +# (fbcon:rotate stands only for the fb console) + +HOMEPAGE = "http://linux.bytesex.org/fbida/" +DESCRIPTION = "frame buffer image and doc viewer tools" +AUTHOR = "Gerd Knorr" +LICENSE = "GPL2" +SECTION = "utils" +DEPENDS = "jpeg fontconfig freetype libexif ttf-dejavu" + +SRC_URI = "http://dl.bytesex.org/releases/fbida/fbida-${PV}.tar.gz \ + file://exiftran.c.patch;patch=1 \ + file://fbi.c.patch;patch=1 \ + file://GNUmakefile.patch;patch=1" + +inherit autotools + +#CFLAGS_append = " ${LDFLAGS}" +EXTRA_OECONF = "--disable-magick --without-x" diff --git a/packages/fbida/files/.mtn2git_empty b/packages/fbida/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fbida/files/.mtn2git_empty diff --git a/packages/fbida/files/GNUmakefile.patch b/packages/fbida/files/GNUmakefile.patch new file mode 100644 index 0000000000..2c0e8fbcd3 --- /dev/null +++ b/packages/fbida/files/GNUmakefile.patch @@ -0,0 +1,24 @@ +Index: fbida-2.07/fbi.c +=================================================================== +--- fbida-2.07/GNUmakefile 2008-10-10 22:27:58.000000000 +0200 ++++ fbida-2.07/GNUmakefile.mod 2008-10-10 22:31:07.000000000 +0200 +@@ -181,16 +181,16 @@ + install: build + $(INSTALL_DIR) $(bindir) + $(INSTALL_DIR) $(mandir)/man1 +- $(INSTALL_BINARY) exiftran $(bindir) ++ $(INSTALL_SCRIPT) exiftran $(bindir) + $(INSTALL_DATA) $(srcdir)/exiftran.man $(mandir)/man1/exiftran.1 + ifeq ($(HAVE_LINUX_FB_H),yes) +- $(INSTALL_BINARY) fbi $(bindir) ++ $(INSTALL_SCRIPT) fbi $(bindir) + $(INSTALL_SCRIPT) fbgs $(bindir) + $(INSTALL_DATA) $(srcdir)/fbi.man $(mandir)/man1/fbi.1 + $(INSTALL_DATA) $(srcdir)/fbgs.man $(mandir)/man1/fbgs.1 + endif + ifeq ($(HAVE_MOTIF),yes) +- $(INSTALL_BINARY) ida $(bindir) ++ $(INSTALL_SCRIPT) ida $(bindir) + $(INSTALL_DATA) $(srcdir)/ida.man $(mandir)/man1/ida.1 + $(INSTALL_DIR) $(resdir)/app-defaults + $(INSTALL_DATA) $(srcdir)/Ida.ad $(resdir)/app-defaults/Ida diff --git a/packages/fbida/files/exiftran.c.patch b/packages/fbida/files/exiftran.c.patch new file mode 100644 index 0000000000..0441a5a1de --- /dev/null +++ b/packages/fbida/files/exiftran.c.patch @@ -0,0 +1,13 @@ +Index: fbida-2.07/exiftran.c +=================================================================== +--- fbida-2.07/exiftran.c 2006-06-13 14:47:24.000000000 +0200 ++++ fbida-2.07/exiftran.c.mod 2008-10-07 01:43:07.000000000 +0200 +@@ -16,6 +16,8 @@ + #include "jpegtools.h" + #include "genthumbnail.h" + ++#define HAVE_NEW_EXIF ++ + /* ---------------------------------------------------------------------- */ + + static void dump_exif(FILE *out, ExifData *ed) diff --git a/packages/fbida/files/fbi.c.patch b/packages/fbida/files/fbi.c.patch new file mode 100644 index 0000000000..36942afa3d --- /dev/null +++ b/packages/fbida/files/fbi.c.patch @@ -0,0 +1,25 @@ +Index: fbida-2.07/fbi.c +=================================================================== +--- fbida-2.07/fbi.c 2008-06-09 16:53:33.000000000 +0200 ++++ fbida-2.07/fbi.c.mod 2008-10-10 21:33:54.000000000 +0200 +@@ -46,6 +46,7 @@ + #include "jpeg/transupp.h" /* Support routines for jpegtran */ + #include "jpegtools.h" + ++#define HAVE_NEW_EXIF + #define TRUE 1 + #define FALSE 0 + #undef MAX +@@ -1465,10 +1466,10 @@ + + font_init(); + if (NULL == fontname) +- fontname = "monospace:size=16"; ++ fontname = "monospace:size=10"; + face = font_open(fontname); + if (NULL == face) { +- fprintf(stderr,"can't open font: %s\n",fontname); ++ fprintf(stderr,"can't open font: %s. Please install ttf-dejavu-sans-mono.ipk\n",fontname); + exit(1); + } + fd = fb_init(cfg_get_str(O_DEVICE), diff --git a/packages/fbida/files/makefile.patch b/packages/fbida/files/makefile.patch new file mode 100644 index 0000000000..8ed04dc1b9 --- /dev/null +++ b/packages/fbida/files/makefile.patch @@ -0,0 +1,13 @@ +Index: fbida-2.07/GNUmakefile +=================================================================== +--- fbida-2.07/GNUmakefile 2006-06-13 15:35:48.000000000 +0200 ++++ fbida-2.07/GNUmakefile.mod 2008-10-07 22:55:51.000000000 +0200 +@@ -181,7 +181,7 @@ + install: build + $(INSTALL_DIR) $(bindir) + $(INSTALL_DIR) $(mandir)/man1 +- $(INSTALL_BINARY) exiftran $(bindir) ++ $(INSTALL_SCRIPT) exiftran $(bindir) + $(INSTALL_DATA) $(srcdir)/exiftran.man $(mandir)/man1/exiftran.1 + ifeq ($(HAVE_LINUX_FB_H),yes) + $(INSTALL_SCRIPT) fbi $(bindir) diff --git a/packages/gnuplot/gnuplot_4.2.3.bb b/packages/gnuplot/gnuplot_4.2.4.bb index 478f6e2b0f..478f6e2b0f 100644 --- a/packages/gnuplot/gnuplot_4.2.3.bb +++ b/packages/gnuplot/gnuplot_4.2.4.bb diff --git a/packages/gtk+/gtk+-2.14.2/smallscreen_filechooser.patch b/packages/gtk+/gtk+-2.14.2/smallscreen_filechooser.patch new file mode 100644 index 0000000000..2d3b2aa8fb --- /dev/null +++ b/packages/gtk+/gtk+-2.14.2/smallscreen_filechooser.patch @@ -0,0 +1,235 @@ +diff -Naur gtk+-2.14.3.orig/gtk/gtkfilechooserdefault.c gtk+-2.14.3/gtk/gtkfilechooserdefault.c +--- gtk+-2.14.3.orig/gtk/gtkfilechooserdefault.c 2008-09-22 22:33:15.000000000 +0400 ++++ gtk+-2.14.3/gtk/gtkfilechooserdefault.c 2008-10-06 00:42:01.000000000 +0400 +@@ -252,7 +252,9 @@ + /* Icon size for if we can't get it from the theme */ + #define FALLBACK_ICON_SIZE 16 + +-#define PREVIEW_HBOX_SPACING 12 ++#define PREVIEW_HBOX_SPACING 2 ++#define NORMAL_SPACING 2 ++#define DOUBLE_SPACING 2 + #define NUM_LINES 45 + #define NUM_CHARS 60 + +@@ -460,6 +462,17 @@ + + + ++int ++_gtk_is_pda_mode() ++{ ++ /* PDA mode is when we have small screen width, plus small overall screen area ++ too. What we want to do when it is active is to prefer vertical packing over ++ horizontal (so we can show user filenames of as long length as possible), yet ++ still layout vertical space in such way so user can be able to see as many ++ files as possible. And of course, we save space overall - no big spacings and ++ borders. */ ++ return gdk_screen_width() < 490; ++} + + + /* Drag and drop interface declarations */ +@@ -803,7 +816,7 @@ + impl->operation_mode = OPERATION_MODE_BROWSE; + impl->recent_manager = gtk_recent_manager_get_default (); + +- gtk_box_set_spacing (GTK_BOX (impl), 12); ++ gtk_box_set_spacing (GTK_BOX (impl), DOUBLE_SPACING); + + set_file_system_backend (impl); + +@@ -3969,8 +3982,9 @@ + GtkWidget *vbox; + GtkWidget *hbox; + GtkWidget *widget; ++ gboolean is_pda = _gtk_is_pda_mode(); + +- vbox = gtk_vbox_new (FALSE, 6); ++ vbox = (is_pda?gtk_hbox_new:gtk_vbox_new) (FALSE, NORMAL_SPACING); + gtk_widget_show (vbox); + + /* Shortcuts tree */ +@@ -3980,7 +3994,7 @@ + + /* Box for buttons */ + +- hbox = gtk_hbox_new (TRUE, 6); ++ hbox = (is_pda?gtk_vbox_new:gtk_hbox_new) (TRUE, NORMAL_SPACING); + gtk_size_group_add_widget (size_group, hbox); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + gtk_widget_show (hbox); +@@ -3988,7 +4002,7 @@ + /* Add bookmark button */ + + impl->browse_shortcuts_add_button = button_new (impl, +- _("_Add"), ++ "", + GTK_STOCK_ADD, + FALSE, + TRUE, +@@ -4000,15 +4014,25 @@ + /* Remove bookmark button */ + + impl->browse_shortcuts_remove_button = button_new (impl, +- _("_Remove"), ++ "", + GTK_STOCK_REMOVE, + FALSE, + TRUE, + G_CALLBACK (remove_bookmark_button_clicked_cb)); ++ if (!is_pda) { ++/* Remove button is pretty reduntant, as that choice is available from popup ++ * menu (and would be intuitively expected to be there; compare that with ++ * the "Add to shortucts" in popup in files pane - most users would never ++ * try that and never new what shortcuts are). ++ * If we suspect we can be short of screen space (PDA device is what often ++ * has portrait layout), don't pack it, to allow more visually pleasing ++ * layout when minimizing location pane. Note that we still instantiate it, ++ * as it is referenced thruout the code. */ ++ + gtk_box_pack_start (GTK_BOX (hbox), impl->browse_shortcuts_remove_button, TRUE, TRUE, 0); + gtk_widget_set_tooltip_text (impl->browse_shortcuts_remove_button, + _("Remove the selected bookmark")); +- ++ } + return vbox; + } + +@@ -4661,7 +4685,7 @@ + GtkWidget *hbox; + GtkWidget *widget; + +- vbox = gtk_vbox_new (FALSE, 6); ++ vbox = gtk_vbox_new (FALSE, NORMAL_SPACING); + gtk_widget_show (vbox); + + /* Box for lists and preview */ +@@ -4677,13 +4701,13 @@ + + /* Preview */ + +- impl->preview_box = gtk_vbox_new (FALSE, 12); ++ impl->preview_box = gtk_vbox_new (FALSE, DOUBLE_SPACING); + gtk_box_pack_start (GTK_BOX (hbox), impl->preview_box, FALSE, FALSE, 0); + /* Don't show preview box initially */ + + /* Filter combo */ + +- impl->filter_combo_hbox = gtk_hbox_new (FALSE, 12); ++ impl->filter_combo_hbox = gtk_hbox_new (FALSE, DOUBLE_SPACING); + + widget = filter_create (impl); + +@@ -4835,13 +4859,13 @@ + + location_switch_to_path_bar (impl); + +- vbox = gtk_vbox_new (FALSE, 12); ++ vbox = gtk_vbox_new (FALSE, DOUBLE_SPACING); + + table = gtk_table_new (2, 2, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); + gtk_widget_show (table); +- gtk_table_set_row_spacings (GTK_TABLE (table), 12); +- gtk_table_set_col_spacings (GTK_TABLE (table), 12); ++ gtk_table_set_row_spacings (GTK_TABLE (table), DOUBLE_SPACING); ++ gtk_table_set_col_spacings (GTK_TABLE (table), DOUBLE_SPACING); + + /* Label */ + +@@ -5175,10 +5199,10 @@ + + /* size group is used by the [+][-] buttons and the filter combo */ + size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL); +- vbox = gtk_vbox_new (FALSE, 12); ++ vbox = gtk_vbox_new (FALSE, DOUBLE_SPACING); + + /* Location widgets */ +- hbox = gtk_hbox_new (FALSE, 12); ++ hbox = gtk_hbox_new (FALSE, DOUBLE_SPACING); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + gtk_widget_show (hbox); + impl->browse_path_bar_hbox = hbox; +@@ -5201,7 +5225,7 @@ + + /* Box for the location label and entry */ + +- impl->location_entry_box = gtk_hbox_new (FALSE, 12); ++ impl->location_entry_box = gtk_hbox_new (FALSE, DOUBLE_SPACING); + gtk_box_pack_start (GTK_BOX (vbox), impl->location_entry_box, FALSE, FALSE, 0); + + impl->location_label = gtk_label_new_with_mnemonic (_("_Location:")); +@@ -5209,12 +5233,16 @@ + gtk_box_pack_start (GTK_BOX (impl->location_entry_box), impl->location_label, FALSE, FALSE, 0); + + /* Paned widget */ +- hpaned = gtk_hpaned_new (); ++ if (_gtk_is_pda_mode()) ++ hpaned = gtk_vpaned_new (); ++ else ++ hpaned = gtk_hpaned_new (); ++ + gtk_widget_show (hpaned); + gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0); + + widget = shortcuts_pane_create (impl, size_group); +- gtk_paned_pack1 (GTK_PANED (hpaned), widget, FALSE, FALSE); ++ gtk_paned_pack1 (GTK_PANED (hpaned), widget, FALSE, TRUE); /* Shortcuts can shrink beyond requested size */ + widget = file_pane_create (impl, size_group); + gtk_paned_pack2 (GTK_PANED (hpaned), widget, TRUE, FALSE); + +diff -Naur gtk+-2.14.3.orig/gtk/gtkfilechooserdialog.c gtk+-2.14.3/gtk/gtkfilechooserdialog.c +--- gtk+-2.14.3.orig/gtk/gtkfilechooserdialog.c 2008-09-19 08:44:03.000000000 +0400 ++++ gtk+-2.14.3/gtk/gtkfilechooserdialog.c 2008-10-10 12:37:38.000000000 +0400 +@@ -32,8 +32,12 @@ + + #include <stdarg.h> + ++#define NORMAL_SPACING 1 ++#define DOUBLE_SPACING 2 ++ + #define GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE(o) (GTK_FILE_CHOOSER_DIALOG (o)->priv) + ++extern int _gtk_is_pda_mode(void); + static void gtk_file_chooser_dialog_finalize (GObject *object); + + static GObject* gtk_file_chooser_dialog_constructor (GType type, +@@ -89,9 +93,9 @@ + dialog->priv->response_requested = FALSE; + + gtk_dialog_set_has_separator (fc_dialog, FALSE); +- gtk_container_set_border_width (GTK_CONTAINER (fc_dialog), 5); +- gtk_box_set_spacing (GTK_BOX (fc_dialog->vbox), 2); /* 2 * 5 + 2 = 12 */ +- gtk_container_set_border_width (GTK_CONTAINER (fc_dialog->action_area), 5); ++ gtk_container_set_border_width (GTK_CONTAINER (fc_dialog), NORMAL_SPACING); ++ gtk_box_set_spacing (GTK_BOX (fc_dialog->vbox), NORMAL_SPACING); ++ gtk_container_set_border_width (GTK_CONTAINER (fc_dialog->action_area), NORMAL_SPACING); + + /* We do a signal connection here rather than overriding the method in + * class_init because GtkDialog::response is a RUN_LAST signal. We want *our* +@@ -170,8 +174,13 @@ + + gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); + +- if (width) +- *width = MIN (*width, (monitor.width * 3) / 4); ++ if (width) { ++ if (_gtk_is_pda_mode()) ++ /* If width is physically small, use it all */ ++ *width = monitor.width; ++ else ++ *width = MIN (*width, (monitor.width * 3) / 4); ++ } + + if (height) + *height = MIN (*height, (monitor.height * 3) / 4); +@@ -279,7 +288,7 @@ + g_signal_connect (priv->widget, "response-requested", + G_CALLBACK (file_chooser_widget_response_requested), object); + +- gtk_container_set_border_width (GTK_CONTAINER (priv->widget), 5); ++ gtk_container_set_border_width (GTK_CONTAINER (priv->widget), NORMAL_SPACING); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (object)->vbox), priv->widget, TRUE, TRUE, 0); + + gtk_widget_show (priv->widget); diff --git a/packages/gtk+/gtk+_2.14.2.bb b/packages/gtk+/gtk+_2.14.2.bb index d63a47a8b7..b0002b8102 100644 --- a/packages/gtk+/gtk+_2.14.2.bb +++ b/packages/gtk+/gtk+_2.14.2.bb @@ -1,5 +1,7 @@ require gtk+.inc +PR = "r1" + DEPENDS += "cairo jasper" # disabled per default - this uses as little patches as possible @@ -11,6 +13,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.14/gtk+-${PV}.tar.bz2 \ file://hardcoded_libtool.patch;patch=1 \ file://no-demos.patch;patch=1 \ file://toggle-font.diff;patch=1;pnum=0 \ + file://smallscreen_filechooser.patch;patch=1 \ " EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes" diff --git a/packages/jpeg/jasper_1.900.1.bb b/packages/jpeg/jasper_1.900.1.bb index a71dd684db..9f1f5eeebc 100644 --- a/packages/jpeg/jasper_1.900.1.bb +++ b/packages/jpeg/jasper_1.900.1.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Jpeg 2000 implementation" LICENSE = "MIT" +DEPENDS = "unzip-native" SRC_URI = "http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-${PV}.zip" diff --git a/packages/libxml/libxml++_2.14.0.bb b/packages/libxml/libxml++_2.14.0.bb deleted file mode 100644 index 71a4de2bdb..0000000000 --- a/packages/libxml/libxml++_2.14.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -LICENSE = "GPL" - -DEPENDS = "gtk+ glibmm" - -inherit gnome pkgconfig - -do_stage() { -autotools_stage_all -} diff --git a/packages/libxml/libxml2-native_2.6.29.bb b/packages/libxml/libxml2-native_2.6.29.bb deleted file mode 100644 index f82c4e088f..0000000000 --- a/packages/libxml/libxml2-native_2.6.29.bb +++ /dev/null @@ -1,2 +0,0 @@ -require libxml2-native.inc -PR = "r3" diff --git a/packages/libxml/libxml2-native_2.6.32.bb b/packages/libxml/libxml2-native_2.7.2.bb index 48e35986f6..48e35986f6 100644 --- a/packages/libxml/libxml2-native_2.6.32.bb +++ b/packages/libxml/libxml2-native_2.7.2.bb diff --git a/packages/libxml/libxml2.inc b/packages/libxml/libxml2.inc index 3f83f76ed5..f7ecaff977 100644 --- a/packages/libxml/libxml2.inc +++ b/packages/libxml/libxml2.inc @@ -26,4 +26,4 @@ DEBIANNAME_${PN} = "libxml2" PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/*-config" -FILES_${PN}-utils += "${bindir}/*" +FILES_${PN}-utils += "${bindir}/* ${libdir}/*.sh" diff --git a/packages/libxml/libxml2_2.6.27.bb b/packages/libxml/libxml2_2.6.27.bb deleted file mode 100644 index 2a85ce8956..0000000000 --- a/packages/libxml/libxml2_2.6.27.bb +++ /dev/null @@ -1,3 +0,0 @@ -# You want this old version for compatibility with Maemo OS2008. -require libxml2.inc - diff --git a/packages/libxml/libxml2_2.6.29.bb b/packages/libxml/libxml2_2.6.29.bb deleted file mode 100644 index b366a8278c..0000000000 --- a/packages/libxml/libxml2_2.6.29.bb +++ /dev/null @@ -1,4 +0,0 @@ -require libxml2.inc - -PR = "r5" - diff --git a/packages/libxml/libxml2_2.6.32.bb b/packages/libxml/libxml2_2.7.2.bb index 555a436a63..555a436a63 100644 --- a/packages/libxml/libxml2_2.6.32.bb +++ b/packages/libxml/libxml2_2.7.2.bb diff --git a/packages/mcabber/.mtn2git_empty b/packages/mcabber/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mcabber/.mtn2git_empty diff --git a/packages/mcabber/mcabber_0.9.9.bb b/packages/mcabber/mcabber_0.9.9.bb new file mode 100644 index 0000000000..8f399c888c --- /dev/null +++ b/packages/mcabber/mcabber_0.9.9.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Jabber ncurses client" +HOMEPAGE = "http://www.lilotux.net/~mikael/mcabber/" +AUTHOR = "Mikael Berthe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "ncurses openssl gpgme" + +SRC_URI = "http://www.lilotux.net/~mikael/mcabber/files/mcabber-${PV}.tar.bz2" + +inherit autotools + +do_configure() { + export ac_cv_func_malloc_0_nonnull=yes + export ac_cv_func_realloc_0_nonnull=yes + oe_runconf +} diff --git a/packages/motion/motion_3.2.10.1.bb b/packages/motion/motion_3.2.11.bb index dc7c0ecdbb..dc7c0ecdbb 100644 --- a/packages/motion/motion_3.2.10.1.bb +++ b/packages/motion/motion_3.2.11.bb diff --git a/packages/mumpot/.mtn2git_empty b/packages/mumpot/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mumpot/.mtn2git_empty diff --git a/packages/mumpot/files/.mtn2git_empty b/packages/mumpot/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mumpot/files/.mtn2git_empty diff --git a/packages/mumpot/files/mumpot-mapnik.desktop b/packages/mumpot/files/mumpot-mapnik.desktop new file mode 100644 index 0000000000..b02b077de1 --- /dev/null +++ b/packages/mumpot/files/mumpot-mapnik.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Mumpot Mapnik +Comment=Mumpot Mapnuk +Exec=mumpot-mapnik +Terminal=0 +Type=Application +Categories=Application;PIM;GTK +StartupNotify=True diff --git a/packages/mumpot/files/mumpot-tah.desktop b/packages/mumpot/files/mumpot-tah.desktop new file mode 100644 index 0000000000..bcdba40b0a --- /dev/null +++ b/packages/mumpot/files/mumpot-tah.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Mumpot t@h +Comment=Mumpot t@h +Exec=mumpot-tah +Terminal=0 +Type=Application +Categories=Application;PIM;GTK +StartupNotify=True diff --git a/packages/mumpot/mumpot_0.3.1.bb b/packages/mumpot/mumpot_0.3.1.bb new file mode 100644 index 0000000000..c5b9091bdb --- /dev/null +++ b/packages/mumpot/mumpot_0.3.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "A map-viewer, simple editor and routing application for OSM maps" +HOMEPAGE = "http://wiki.openstreetmap.org/index.php/Mumpot" +AUTHOR = "Andreas Kemnade" +SECTION = "x11/applications" +LICENSE = "GPLv2" +DEPENDS = "gtk+ bluez-libs bzip2 libxml2 libpng jpeg" + +SRC_URI = "http://osm.andi.de1.cc/mumpot-${PV}.tar.gz \ + file://mumpot-tah.desktop \ + file://mumpot-mapnik.desktop" + +inherit autotools pkgconfig + +do_install_append() { + install -d ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/mumpot-tah.desktop ${D}${datadir}/applications/mumpot-tah.desktop + install -m 0644 ${WORKDIR}/mumpot-mapnik.desktop ${D}${datadir}/applications/mumpot-mapnik.desktop +} diff --git a/packages/opie-i18n/opie-i18n.inc b/packages/opie-i18n/opie-i18n.inc index 8a1eaba5b3..fd39583557 100644 --- a/packages/opie-i18n/opie-i18n.inc +++ b/packages/opie-i18n/opie-i18n.inc @@ -35,7 +35,8 @@ do_install() { done } -PACKAGES = "${PN}-dbg opie-i18n-cz opie-i18n-da opie-i18n-de opie-i18n-dk opie-i18n-en opie-i18n-es \ +ALLOW_EMPTY_${PN} = "1" +PACKAGES = "${PN}-dbg ${PN} opie-i18n-cz opie-i18n-da opie-i18n-de opie-i18n-dk opie-i18n-en opie-i18n-es \ opie-i18n-fr opie-i18n-hu opie-i18n-it opie-i18n-ja opie-i18n-ko opie-i18n-lv opie-i18n-mk \ opie-i18n-nl opie-i18n-no opie-i18n-pl opie-i18n-pt opie-i18n-pt-br opie-i18n-ru opie-i18n-sl \ opie-i18n-xx opie-i18n-zh-cn opie-i18n-zh-tw \ diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index a29b86b823..827105ce69 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,12 +1,12 @@ # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. -# Generator: './generate-manifest-2.5.py' Version 20080722 (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de> +# Generator: 'generate-manifest-2.5.py' Version 20080722 (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de> # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy -PROVIDES+="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-bzip2 python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +PROVIDES+="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-bzip2 python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " -PACKAGES="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-bzip2 python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +PACKAGES="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-bzip2 python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " DESCRIPTION_python-profile="Python Basic Profiling Support" PR_python-profile="ml0" @@ -273,6 +273,11 @@ PR_python-debugger="ml1" RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell python-pprint" FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " +DESCRIPTION_python-pkgutil="Python Package Extension Utility Support" +PR_python-pkgutil="ml0" +RDEPENDS_python-pkgutil="python-core" +FILES_python-pkgutil="${libdir}/python2.5/pkgutil.* " + DESCRIPTION_python-shell="Python Shell-Like Functionality" PR_python-shell="ml1" RDEPENDS_python-shell="python-core python-re" diff --git a/packages/vala/vala-native_0.3.4.bb b/packages/vala/vala-native_0.3.5.bb index f097e7db74..f097e7db74 100644 --- a/packages/vala/vala-native_0.3.4.bb +++ b/packages/vala/vala-native_0.3.5.bb diff --git a/packages/vala/vala_0.3.4.bb b/packages/vala/vala_0.3.5.bb index 37ad4b4cfe..9b027f1baa 100644 --- a/packages/vala/vala_0.3.4.bb +++ b/packages/vala/vala_0.3.5.bb @@ -13,3 +13,4 @@ do_stage() { autotools_stage_all } +FILES_${PN}-doc += ${datadir}/devhelp |