summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/checksums.ini12
-rw-r--r--docs/usermanual/chapters/getting_oe.xml317
-rw-r--r--packages/libpng/libpng-native_1.2.35.bb4
-rw-r--r--packages/libpng/libpng_1.2.35.bb14
-rw-r--r--packages/pmount/pmount-0.9.18/gettext.patch133
-rw-r--r--packages/pmount/pmount-0.9.18/install.patch15
-rw-r--r--packages/pmount/pmount_0.9.18.bb22
-rw-r--r--packages/update-alternatives/update-alternatives-dpkg-1.13.25/paths.patch26
-rw-r--r--packages/update-alternatives/update-alternatives-dpkg-native_1.13.25.bb14
-rw-r--r--packages/update-alternatives/update-alternatives-dpkg_1.13.25.bb12
-rw-r--r--packages/vte/files/vte.desktop.in76
-rw-r--r--packages/vte/vte.inc17
-rw-r--r--packages/vte/vte_0.16.13.bb1
-rw-r--r--packages/vte/vte_0.16.14.bb1
14 files changed, 650 insertions, 14 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 4923c5f4f8..225dc1af25 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13050,6 +13050,10 @@ sha256=24b354dcd8843274a20e1625e04d618d43f9851082254cb9dae6f33f15c2a5cd
md5=78d2f8c4e0d64f8948819563587302d3
sha256=24b354dcd8843274a20e1625e04d618d43f9851082254cb9dae6f33f15c2a5cd
+[http://downloads.sourceforge.net/libpng/libpng-1.2.35.tar.bz2]
+md5=b8b8d09adf6bee2c5902c8e54c4f2e68
+sha256=cafe6431f9e6d561fb7b396bf94ff73a9cd0f4279f3eea2fc714ab90e345eee6
+
[http://downloads.sourceforge.net/libpng/libpng-1.2.8.tar.bz2]
md5=00cea4539bea4bd34cbf8b82ff9589cd
sha256=9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b
@@ -17438,6 +17442,10 @@ sha256=25b84792473fa17d118e69b588f32fe940d13a01c3b3db89290ce6516ad01b2e
md5=24a676bf495bec367b2d971cdca1c54c
sha256=2632d931b5732eb1d0de7a2e2d92c75d64412438958ee96dceb4443e4fc2a62f
+[http://alioth.debian.org/frs/download.php/2624/pmount-0.9.18.tar.gz]
+md5=d04973bde34edac7dd2e50bfe8f10700
+sha256=b216936e6e011b58fefee8e3f80d01008cb078b7fe2a5632b2ce98bc7bcb05c2
+
[http://heanet.dl.sourceforge.net/pmt/pngcrush-1.6.4.tar.gz]
md5=a329caad3f49ed3ca105e6fd441f5b93
sha256=22ffea3aed00da9a9518a9c25b619d212bbe27b9ec72165cf74640f930108b2f
@@ -22058,6 +22066,10 @@ sha256=c31e1e930bce109cccd40dc0378b7ee28933482855918f46573e79d9db818be7
md5=40480f20f6b7664f3d364e4f2ed27889
sha256=edfb74b0bef469ee122ab67c3e4562043e97803c8a32899caf5bd3a71c464a6d
+[http://ftp.gnome.org/pub/GNOME/sources/vte/0.16/vte-0.16.14.tar.bz2]
+md5=9df3e35b81b209952ac1cf7904f7b620
+sha256=40cf321980d3139c8f084e818504e1366be81bed817eeeec9021257e04c1c0db
+
[http://ftp.gnome.org/pub/GNOME/sources/vte/0.16/vte-0.16.8.tar.bz2]
md5=65344de3023c41c8dda2b35a415bf969
sha256=1dc06ad4224c18061b000de0435b81b7c249215da4163edecb62a8d46090098f
diff --git a/docs/usermanual/chapters/getting_oe.xml b/docs/usermanual/chapters/getting_oe.xml
index 3c685049a4..d71ea71e72 100644
--- a/docs/usermanual/chapters/getting_oe.xml
+++ b/docs/usermanual/chapters/getting_oe.xml
@@ -242,13 +242,316 @@ MACHINE = "om-gta01"</screen>
<section id="gettingoe_building_software">
<title>Building Software</title>
- <para>Once BitBake and OpenEmbedded are set up and configured, one can build
- software and images like this:
-<screen>
-bitbake &lt;recipe_name&gt;
-</screen>
- </para>
+ <para>The primary interface to the build system is
+ the <command>bitbake</command> command (see
+ the <ulink url="http://subversion.tigris.org/faq.html#proxy">BitBake
+ users manual</ulink>). BitBake will download and patch files from the
+ internet, so it helps if you are on a well connected machine.
+ </para>
+
+ <para>Note that you should issue all BitBake commands from inside of the
+ <filename>build/</filename> directory, or you should
+ override <varname>TMPDIR</varname> in
+ your <filename>$OEBASE/build/conf/local.conf</filename> to point
+ elsewhere (by default it goes to <filename>tmp/</filename> relative to
+ the directory you run <command>bitbake</command> commands in).
+ </para>
+
+ <note>
+ <para>BitBake might complain that there is a problem with the setting in
+ <filename>/proc/sys/vm/mmap_min_addr</filename>, which needs to be set
+ to zero. You can set it by doing the following as root:
+
+ <screen># echo 0 > /proc/sys/vm/mmap_min_addr</screen>
+
+ Note that you can not use a text editor to do this since files
+ in <filename>/proc</filename> are not real files. Also note that this
+ above change will be lost when you reboot your system. To have the
+ change made automatically when the system boots, some systems provide
+ a <filename>/etc/sysctl.conf</filename> file. Add the following line
+ to that file:
+
+ <screen>vm.mmap_min_addr=0</screen>
+
+ If your system does not provide
+ the <filename>/etc/sysctl.conf</filename> mechanism, you can try adding
+ the above <command>echo</command> command line to
+ your <filename>/etc/rc.local</filename>.
+ </para>
+ </note>
+
+ <para>Once BitBake and OpenEmbedded are set up and configured, you can build
+ software and images like this:
- <para>This section is a stub, help us by expanding it</para>
+ <screen>$ bitbake &lt;recipe_name&gt;</screen>
+
+ A recipe name corresponds to a BitBake <filename>.bb</filename> file. A
+ BitBake file is a logical unit of tasks to be executed. Normally this is
+ a package to be built. Inter-recipe dependencies are obeyed. The recipes
+ are located by BitBake via the <varname>BBFILES</varname> variable (set
+ in your <filename>$OEBASE/build/conf/local/conf</filename>), which is a
+ space separated list of <filename>.bb</filename> files, and does handle
+ wildcards.
+ </para>
+
+ <para>To build a single package, bypassing the long parse step (and
+ therefore its dependencies -- use with care):
+
+ <screen>$ bitbake -b $OEBASE/openembedded/packages/blah/blah.bb</screen>
+ </para>
+
+ <para>There are a few groups of special recipes located in subdirectories
+ of the <filename>$OEBASE/openembedded/packages/</filename>
+ directory. These groups are:
+
+ <variablelist>
+ <varlistentry>
+ <term><filename>tasks/</filename></term>
+ <listitem><para>A collection of meta-packages that depend on real
+ packages to make managing package sets easier.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><filename>meta/</filename></term>
+ <listitem><para>A collection of usefull meta tasks and recipes that
+ don't fit in a general category.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><filename>images/</filename></term>
+ <listitem><para>A collection of image targets that depend on
+ packages that will be installed into an image which can be put
+ on the target system.</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+
+ <section><title>Useful Target Recipes</title>
+ <para>Although BitBake can build individual packages, it is often more
+ useful to build a set of packages and combine them into an image. The
+ following recipe names are commonly used to that effect.
+ </para>
+
+ <section><title>Images</title>
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term><literal>helloworld-image</literal></term>
+ <listitem>
+ <para>Builds an image, that if used as a root filesystem, will
+ start a static executable that prints hello world then
+ loops infinitely. Can be used to test the Linux boot
+ procedure into user space (init).
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>bootstrap-image</literal></term>
+ <listitem>
+ <para>Build image contains task-base packages.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>console-image</literal></term>
+ <listitem>
+ <para>Build an image without the X11, gtk+, or qt windowing
+ libraries.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>x11-image</literal></term>
+ <listitem>
+ <para>Builds an image with X11.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>beagleboard-demo-image</literal></term>
+ <listitem>
+ <para>Builds the &Aring;ngstr&ouml;m distribution like Koen
+ proposed.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>opie-image</literal></term>
+ <listitem>
+ <para>Build image based on the
+ <ulink url="http://opie.handhelds.org/">Open Palmtop
+ Integrated Environment</ulink> (OPIE). OPIE is a completely
+ Open Source based graphical user environment and suite of
+ applications for small form-factor devices, such as PDAs,
+ running Linux.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>opie-kdepim-image</literal></term>
+ <listitem>
+ <para>Build image based on the OPIE and full featured
+ KDE-based PIM (pi-sync, ko/pi, ka/pi, etc).
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>pivotboot-image</literal></term>
+ <listitem>
+ <para>Build image that is necessary to flash a Sharp SL C3000,
+ Zaurus. It pivots after booting from the NAND and finalizes
+ the install to the HD during the first boot.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>twin-image</literal></term>
+ <listitem>
+ <para>A image with task-base plus a couple of editors, nano and
+ vim (why two?), and a mail reader, mutt.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>uml-image</literal></term>
+ <listitem>
+ <para>A root image for user-mode-linux. Includes task-base,
+ and parts of opie.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>gpe-image</literal></term>
+ <listitem>
+ <para>Build a <ulink url="http://opie.handhelds.org/">GPE
+ Palmtop Environment</ulink> based kernel and rootfs. The GPE
+ provides a user interface environment for palmtop/handheld
+ computers running the GNU/Linux or any other UNIX-like
+ operating system.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </section>
+
+ <section><title>Tasks</title>
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term><literal>task-base</literal></term>
+ <listitem>
+ <para>Build a kernel and core packages for a basic
+ installation. You won't be able to do much more than ssh to
+ the machine if this is all that is installed.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>task-dvb</literal></term>
+ <listitem>
+ <para>Meta-package for DVB application (DVB = Digital Video
+ Broadcasting).
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>task-python-everything</literal></term>
+ <listitem>
+ <para>All of python.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>task-native-sdk</literal></term>
+ <listitem>
+ <para>Mata-package for native (on-device) SDK.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </section>
+
+ <section><title>Meta</title>
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term><literal>meta-opie</literal></term>
+ <listitem>
+ <para>Build all OPIE related packages and some more for OPIE
+ based usage.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>meta-gpe</literal></term>
+ <listitem>
+ <para>Basic packages to go with gpe-image.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </section>
+
+ <section><title>Other</title>
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term><literal>helloworld</literal></term>
+ <listitem>
+ <para>Builds a static executable that prints hello
+ world then loops infinitely.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>world</literal></term>
+ <listitem>
+ <para>Build everything. This takes a long time, a lot
+ of network bandwidth, and a lot of disc space. Can also
+ break your toolchain.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>package-index</literal></term>
+ <listitem>
+ <para>Target to update the "feed" files to reflect the current
+ set of .ipk's that exist in the deploy directory. Commonly
+ used after building some packages individually to update the
+ feed and allow them to be installed via a package manager or
+ the ipkg command line tools.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>virtual/kernel</literal></term>
+ <listitem>
+ <para>Builds the appropriate kernel for your device.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </section>
+ </section>
</section>
</chapter>
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