Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

12 files changed, 328 insertions, 7 deletions

diff --git a/packages/libpng/libpng-native_1.2.35.bb b/packages/libpng/libpng-native_1.2.35.bb
new file mode 100644
index 0000000000..52c92e9954
--- /dev/null
+++ b/packages/libpng/libpng-native_1.2.35.bb
@@ -0,0 +1,4 @@
+require libpng_${PV}.bb
+require libpng-native.inc
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
diff --git a/packages/libpng/libpng_1.2.35.bb b/packages/libpng/libpng_1.2.35.bb
new file mode 100644
index 0000000000..3ed02a7f17
--- /dev/null
+++ b/packages/libpng/libpng_1.2.35.bb
@@ -0,0 +1,14 @@
+require libpng.inc
+
+PR = "r0"
+
+SRC_URI += "file://makefile_fix.patch;patch=1"
+
+do_stage() {
+	cp libpng.pc libpng12.pc
+	install -m 644 png.h ${STAGING_INCDIR}/png.h
+	install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
+	oe_libinstall -so libpng ${STAGING_LIBDIR}/
+	oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
+	ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
+}
diff --git a/packages/pmount/pmount-0.9.18/gettext.patch b/packages/pmount/pmount-0.9.18/gettext.patch
new file mode 100644
index 0000000000..dbac93f6ba
--- /dev/null
+++ b/packages/pmount/pmount-0.9.18/gettext.patch
@@ -0,0 +1,133 @@
+Index: pmount-0.9.17/src/pmount-hal.c
+===================================================================
+--- pmount-0.9.17.orig/src/pmount-hal.c	2007-07-01 13:58:49.000000000 +0200
++++ pmount-0.9.17/src/pmount-hal.c	2008-10-08 23:39:20.970178412 +0200
+@@ -16,7 +16,6 @@
+ #include <dirent.h>
+ #include <sys/stat.h>
+ #include <locale.h>
+-#include <libintl.h>
+ #include <libhal-storage.h>
+ 
+ #include "policy.h"
+@@ -26,7 +25,12 @@
+ #include "realpath.h"
+ 
+ /* gettext abbreviation */
++#ifdef ENABLE_NLS
++#include <libintl.h>
+ #define _(String) gettext(String)
++#else
++#define _(String) (String)
++#endif
+ 
+ void help() {
+     puts( _(
+@@ -196,10 +200,12 @@
+     char *dmask = NULL;
+     char *iocharset = NULL;
+ 
++#ifdef ENABLE_NLS
+     /* initialize locale */
+     setlocale( LC_ALL, "" );
+     bindtextdomain( "pmount", NULL );
+     textdomain( "pmount" );
++#endif
+ 
+     if( argc < 2 ) {
+         help();
+Index: pmount-0.9.17/src/utils.h
+===================================================================
+--- pmount-0.9.17.orig/src/utils.h	2007-07-07 09:05:06.000000000 +0200
++++ pmount-0.9.17/src/utils.h	2008-10-08 23:19:09.515475595 +0200
+@@ -12,7 +12,12 @@
+ #define __utils_h
+ 
+ /* gettext abbreviation */
++#ifdef ENABLE_NLS
++#include <libintl.h>
+ #define _(String) gettext(String)
++#else
++#define _(String) (String)
++#endif
+ 
+ /* global flag whether to print debug messages (false by default) */
+ extern int enable_debug;
+Index: pmount-0.9.17/configure.ac
+===================================================================
+--- pmount-0.9.17.orig/configure.ac	2007-12-14 20:27:23.000000000 +0100
++++ pmount-0.9.17/configure.ac	2008-10-08 23:19:09.598820915 +0200
+@@ -77,10 +77,7 @@
+ fi
+ AM_CONDITIONAL(PMOUNT_HAL, test -n "$BUILD_HAL")
+ 													   
+-GETTEXT_PACKAGE="pmount"
+-AC_SUBST(GETTEXT_PACKAGE)
+-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
+-AM_GLIB_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+ 
+ AC_OUTPUT([
+ Makefile
+Index: pmount-0.9.17/src/pmount.c
+===================================================================
+--- pmount-0.9.17.orig/src/pmount.c	2008-10-08 23:36:44.452037557 +0200
++++ pmount-0.9.17/src/pmount.c	2008-10-08 23:37:38.778816969 +0200
+@@ -21,9 +21,12 @@
+ #include <errno.h>
+ #include <locale.h>
+ #include <langinfo.h>
+-#include <libintl.h>
+ #include <sys/stat.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#endif
++
+ #include "fs.h"
+ #include "policy.h"
+ #include "utils.h"
+@@ -619,10 +622,12 @@
+         { NULL, 0, NULL, 0}
+     };
+ 
++#ifdef ENABLE_NLS
+     /* initialize locale */
+     setlocale( LC_ALL, "" );
+     bindtextdomain( "pmount", NULL );
+     textdomain( "pmount" );
++#endif
+ 
+     /* If pmount is run without a single argument, print out the list
+        of removable devices. Does not require root privileges, just read access
+Index: pmount-0.9.17/src/pumount.c
+===================================================================
+--- pmount-0.9.17.orig/src/pumount.c	2008-10-08 23:38:21.122028300 +0200
++++ pmount-0.9.17/src/pumount.c	2008-10-08 23:38:47.972023678 +0200
+@@ -16,9 +16,12 @@
+ #include <sys/wait.h>
+ #include <limits.h>
+ #include <getopt.h>
+-#include <libintl.h>
+ #include <locale.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#endif
++
+ #include "policy.h"
+ #include "utils.h"
+ #include "luks.h"
+@@ -172,10 +175,12 @@
+         { NULL, 0, NULL, 0}
+     };
+ 
++#ifdef ENABLE_NLS
+     /* initialize locale */
+     setlocale( LC_ALL, "" );
+     bindtextdomain( "pmount", NULL );
+     textdomain( "pmount" );
++#endif
+ 
+     /* are we root? */
+     if( geteuid() ) {
diff --git a/packages/pmount/pmount-0.9.18/install.patch b/packages/pmount/pmount-0.9.18/install.patch
new file mode 100644
index 0000000000..b02942a591
--- /dev/null
+++ b/packages/pmount/pmount-0.9.18/install.patch
@@ -0,0 +1,15 @@
+Index: pmount-0.9.17/src/Makefile.am
+===================================================================
+--- pmount-0.9.17.orig/src/Makefile.am	2008-10-09 01:22:41.668067209 +0200
++++ pmount-0.9.17/src/Makefile.am	2008-10-09 01:23:22.144725902 +0200
+@@ -36,8 +36,8 @@
+ 
+ install-data-hook:
+ 	test -z $(INSTALL_DIR) || mkdir -p -- $(INSTALL_DIR)
+-	$(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount
+-	$(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount
++	$(INSTALL_DATA)  -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount
++	$(INSTALL_DATA)  -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount
+ 
+ uninstall-hook:
+ 	rm -f $(INSTALL_DIR)/pmount
diff --git a/packages/pmount/pmount_0.9.18.bb b/packages/pmount/pmount_0.9.18.bb
new file mode 100644
index 0000000000..26770b33a9
--- /dev/null
+++ b/packages/pmount/pmount_0.9.18.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Policy based mounter that gives the ability to mount removable devices as a user"
+HOMEPAGE = "http://pmount.alioth.debian.org/"
+LICENSE = "GPLv2"
+PR = "r0"
+
+DEPENDS = "hal e2fsprogs-libs sysfsutils"
+RDEPENDS_${PN}-hal = "${PN}"
+RRECOMMENDS_${PN}-hal = "hal"
+
+SRC_URI = "http://alioth.debian.org/frs/download.php/2624/${P}.tar.gz \
+	   file://gettext.patch;patch=1 \
+	   file://install.patch;patch=1 \
+	  "
+
+inherit autotools gettext
+
+EXTRA_OECONF = "--enable-hal"
+
+PACKAGES =+ "${PN}-hal"
+
+FILES_${PN}-hal = "${bindir}/pmount-hal"
+
diff --git a/packages/update-alternatives/update-alternatives-dpkg-1.13.25/paths.patch b/packages/update-alternatives/update-alternatives-dpkg-1.13.25/paths.patch
new file mode 100644
index 0000000000..a23bf9a99d
--- /dev/null
+++ b/packages/update-alternatives/update-alternatives-dpkg-1.13.25/paths.patch
@@ -0,0 +1,26 @@
+diff -ruN dpkg-1.13.22.orig/scripts/update-alternatives.pl dpkg-1.13.22/scripts/update-alternatives.pl
+--- dpkg-1.13.22.orig/scripts/update-alternatives.pl   2006-06-21 01:46:12.000000000 -0300
++++ dpkg-1.13.22/scripts/update-alternatives.pl    2007-08-02 19:36:47.000000000 -0300
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl --
+ 
+ $admindir= "/var/lib/dpkg"; # This line modified by Makefile
+-$dpkglibdir= "../utils"; # This line modified by Makefile
++$dpkglibdir= "/usr/lib/dpkg"; # This line modified by Makefile
+ $version= '0.93.80'; # This line modified by Makefile
+ push (@INC, $dpkglibdir);
+ require 'dpkg-gettext.pl';
+@@ -129,6 +129,12 @@
+         &checkmanymodes;
+         @ARGV >= 4 || &badusage(_g("--install needs <link> <name> <path> <priority>"));
+         ($alink,$name,$apath,$apriority,@ARGV) = @ARGV;
++  if (! -e $apath) { 
++      $apath = substr($alink,0,rindex($alink,"/")+1).$apath;
++  }
++  if (! -e $apath) { 
++      &quit(sprintf(_g("Error: file not found: %s"), $apath));
++  }
+         $apriority =~ m/^[-+]?\d+/ || &badusage(_g("priority must be an integer"));
+         $mode= 'install';
+     } elsif (m/^--(remove|set)$/) {
+
diff --git a/packages/update-alternatives/update-alternatives-dpkg-native_1.13.25.bb b/packages/update-alternatives/update-alternatives-dpkg-native_1.13.25.bb
new file mode 100644
index 0000000000..d0af4eac7b
--- /dev/null
+++ b/packages/update-alternatives/update-alternatives-dpkg-native_1.13.25.bb
@@ -0,0 +1,14 @@
+require update-alternatives-dpkg.inc
+inherit native
+
+PROVIDES += "virtual/update-alternatives-native"
+DEPENDS = "perl-native"
+DEFAULT_PREFERENCE = "-1"
+
+do_stage () {
+    install -d ${sbindir} \
+               ${localstatedir}/dpkg/alternatives \
+               ${sysconfdir}/alternatives
+
+    install -m 0755 scripts/update-alternatives ${sbindir}/update-alternatives
+}
diff --git a/packages/update-alternatives/update-alternatives-dpkg_1.13.25.bb b/packages/update-alternatives/update-alternatives-dpkg_1.13.25.bb
new file mode 100644
index 0000000000..a07d5e36d4
--- /dev/null
+++ b/packages/update-alternatives/update-alternatives-dpkg_1.13.25.bb
@@ -0,0 +1,12 @@
+require update-alternatives-dpkg.inc
+
+RPROVIDES_${PN} = "update-alternatives"
+RDEPENDS_${PN} = "perl dpkg"
+
+do_install () {
+    install -d ${D}${sbindir} \
+               ${D}${localstatedir}/dpkg/alternatives \
+               ${D}${sysconfdir}/alternatives
+
+    install -m 0755 scripts/update-alternatives ${D}${sbindir}/update-alternatives
+}
diff --git a/packages/vte/files/vte.desktop.in b/packages/vte/files/vte.desktop.in
new file mode 100644
index 0000000000..ef2bf17efc
--- /dev/null
+++ b/packages/vte/files/vte.desktop.in
@@ -0,0 +1,76 @@
+[Desktop Entry]
+TryExec=vte
+Exec=vte
+Icon=terminal
+Type=Application
+Categories=GTK;Utility;TerminalEmulator;GPE;
+StartupNotify=true
+Name=VTE Terminal
+Name[af]=Vte-terminaal
+Name[ar]=Vte Terminal
+Name[bg]=Vte терминал
+Name[ca]=Terminal del VTE
+Name[cs]=VTE terminál
+Name[da]=VTE terminal
+Name[de]=Vte-Terminal
+Name[el]=Τερματικό του Vte
+Name[es]=Terminal de Vte
+Name[et]=VTE terminal
+Name[fi]=Vte-pääteohjelma
+Name[fr]=Terminal Vte
+Name[gl]=Vte Terminal
+Name[hu]=Vte konzol
+Name[it]=Terminale Vte
+Name[ja]=Vte 端末
+Name[km]=ស្ថានីយ Vte
+Name[ko]=VTE 터미널
+Name[lt]=Vte terminalas
+Name[mr]=VTE टर्मिनल
+Name[nb]=Vte-terminal
+Name[nl]=Vte Terminal
+Name[pa]=VTE ਟਰਮੀਨਲ
+Name[pl]=Terminal Vte
+Name[pt]=Vte Terminal
+Name[pt_BR]=Terminal do Vte
+Name[ru]=Vte терминал
+Name[sk]=VTE Terminál
+Name[sv]=Vte-terminal
+Name[uk]=Термінал Vte
+Name[xh]=Isiphelo se-Vte
+Name[zh_CN]=Vte 终端
+Name[zh_TW]=Vte 終端機
+GenericName=Command Line Terminal
+GenericName[af]=Opdragreëlterminaal
+GenericName[bg]=Терминал с команден ред
+GenericName[cs]=Terminál
+GenericName[da]=Kommandolinje-terminal
+GenericName[de]=Befehlszeilen-Terminal
+GenericName[el]=Τερματικό Γραμμής Εντολών
+GenericName[es]=Terminal de línea de órdenes
+GenericName[et]=Käsurea terminal
+GenericName[fi]=Pääteohjelma
+GenericName[fr]=Terminal de ligne de commande
+GenericName[gl]=Terminal de Liña de Comandos
+GenericName[hu]=Parancssoros terminál
+GenericName[it]=Terminale a riga di comando
+GenericName[ja]=コマンドラインターミナル
+GenericName[km]=ស្ថានីយ​បន្ទាត់​ពាក្យបញ្ជា​
+GenericName[ko]=터미널 명령 라인
+GenericName[lt]=Komandinės eilutės terminalas
+GenericName[mr]=लाईन टर्मिनलचा आदेश 
+GenericName[nb]=Vte-terminal
+GenericName[nl]=Commandoregelterminal
+GenericName[pa]=ਕਮਾਂਡ ਲਾਇਨ ਟਰਮੀਨਲ
+GenericName[pl]=Terminal - linia poleceń
+GenericName[pt]=Terminal de Linha de Comando
+GenericName[pt_BR]=Terminal de Linha de Comando
+GenericName[ru]=Терминал командной строки
+GenericName[sv]=Kommandoradsterminal
+GenericName[uk]=Термінал командного рядка
+GenericName[xh]=Isiphelo Somgca Womyalelo
+GenericName[zh_CN]=命令行终端
+GenericName[zh_TW]=指令行終端機
+X-GNOME-Bugzilla-Bugzilla=vte
+X-GNOME-Bugzilla-Product=gnome-terminal
+X-GNOME-Bugzilla-Component=BugBuddyBugs
+X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/packages/vte/vte.inc b/packages/vte/vte.inc
index 9151172c59..dcf25c945d 100644
--- a/packages/vte/vte.inc
+++ b/packages/vte/vte.inc
@@ -1,20 +1,23 @@
 DESCRIPTION = "vte is a virtual terminal emulator"
 LICENSE = "LGPL"
-DEPENDS += " glib-2.0 gtk+ intltool-native ncurses "
-PR = "r2"
+DEPENDS += "glib-2.0 gtk+ intltool-native ncurses"
 
 inherit gnome
 
-SRC_URI += "file://vte-pkgconfig-fixes.patch;patch=1"
+SRC_URI += "file://vte-pkgconfig-fixes.patch;patch=1 \
+	    file://vte.desktop.in"
 
 EXTRA_OECONF = "--disable-gtk-doc --disable-python"
 
-do_stage() {
-	autotools_stage_all
+# Upstream does not provide desktop file for vte considering it only as
+# a testing utility.
+do_install_append() {
+	mkdir -p ${D}${datadir}/applications
+	sed s/@VERSION@/${PV}/ <${WORKDIR}/vte.desktop.in >${D}${datadir}/applications/vte.desktop
 }
 
 PACKAGES =+ "libvte vte-termcap gnome-pty-helper"
-FILES_libvte = "${libdir}/*.so*"
+FILES_libvte = "${libdir}/*.so.*"
 FILES_gnome-pty-helper = "${libexecdir}/gnome-pty-helper"
-RDEPENDS_libvte = "vte-termcap"
+RDEPENDS_libvte = "vte-termcap gnome-pty-helper"
 FILES_vte-termcap = "${datadir}/vte/termcap"
diff --git a/packages/vte/vte_0.16.13.bb b/packages/vte/vte_0.16.13.bb
index 9453fee206..f408632430 100644
--- a/packages/vte/vte_0.16.13.bb
+++ b/packages/vte/vte_0.16.13.bb
@@ -1 +1,2 @@
 require vte.inc
+PR = "r3"
diff --git a/packages/vte/vte_0.16.14.bb b/packages/vte/vte_0.16.14.bb
new file mode 100644
index 0000000000..9453fee206
--- /dev/null
+++ b/packages/vte/vte_0.16.14.bb
@@ -0,0 +1 @@
+require vte.inc