[PATCH 00/58] [meta-oe] Small fixes from bitbake world

[PATCH 00/58] [meta-oe] Small fixes from bitbake world

[Martin Jansa]

The following changes since commit 85ab35f4edac91ecc180161e97c6698f1c10928b:

  netperf: Correct license flags (2012-11-30 11:49:56 -0500)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib jansa/pull
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Martin Jansa (58):
  e-base.bbclass: bump EFL_SRCREV for E17 alpha6
  e-base.bbclass: bump EFL_SRCREV for E17 alpha7
  vpnc: import from OE-classic
  fluidsynth: import from OE-Classic
  packagekit: import from OE-Classic
  pyrtm: import from OE-Classic
  usb-modeswitch-data: upgrade to 20121109
  usb-modeswitch: upgrade to 1.2.5
  cheese: rename eds-dbus to evolution-data-server in DEPENDS
  gnome-terminal: add SRC_URI checksums
  libnotify3: add SRC_URI checksum
  gcalctool: add SRC_URI checksums
  libgtkstylus: add SRC_URI checksums
  qconnman: update git repo URL
  edje-viewer: add LIC_FILES_CHKSUM and drop BSD from LICENSE
  uptime: add LIC_FILES_CHKSUM
  forecast: add LIC_FILES_CHKSUM
  cpu: add LIC_FILES_CHKSUM
  diskio: add LIC_FILES_CHKSUM
  exquisite: add LIC_FILES_CHKSUM
  ephoto: update LICENSE and LIC_FILES_CHKSUM
  exalt: fix LICENSE and add LIC_FILES_CHKSUM
  news: fix LICENSE and add LIC_FILES_CHKSUM
  flame: add LIC_FILES_CHKSUM
  rain: add LIC_FILES_CHKSUM
  libeweather: add LIC_FILES_CHKSUM
  epeg: add LIC_FILES_CHKSUM
  xorg-sgml-doctools: add LIC_FILES_CHKSUM
  engrave: add LIC_FILES_CHKSUM
  edb: add LIC_FILES_CHKSUM
  gnome-terminal: add LICENSE version and LIC_FILES_CHKSUM
  notification: remove recipe, notification module is now part of e-wm
  waker: remove recipe, source was removed in r70549
  elementary-alarm: remove recipe, source was removed in r70549
  epdfview: move from meta-efl to meta-gnome
  gnome-vfs: fix QA warnings in packaging
  fuse: remove /dev/fuse in do_install_append
  libbonobo: fix QA warnings in packaging
  gnome/libgnomecanvas: delete, there is newer version in
    libgnome/libgnomecanvas
  libgnomecanvas: fix QA warnings from packaging
  libgnome: fix QA warnings from packaging
  libbonoboui: fix QA warnings from packaging
  libgnomeui: fix QA warnings from packaging
  pcsc-lite: add bbappend in meta-systemd
  entrance: rename xserver-nodm.service to entrance.service so it does
    not conflict with xserver-nodm-init in sysroot
  systemd: add PACKAGES_DYNAMIC
  exalt-client: add LIC_FILES_CHKSUM
  systemd: reenable python and add python-systemd-journald
  xf86-input-void: fix SRC_URI checksums
  lightmediascaner: move .a files from PN-dev to PN-staticdev
  tangogps: fix doc instalation
  lightmediascaner: move .a files from PN-dev to PN-staticdev
  gvim: fix unpackaged files QA warning
  libcanberra: package also gtk-3.0 if it gets built
  lua5.1: fix packaging QA warnings
  util-linux: add meta-systemd bbappend for new version which installs
    uuidd.service and socket
  eject: drop 2nd LICENSE field
  eject: use new update-alternatives and add u-a for eject

 meta-efl/classes/e-base.bbclass                    |   2 +-
 meta-efl/recipes-efl/e17/cpu_svn.bb                |   3 +
 meta-efl/recipes-efl/e17/diskio_svn.bb             |   7 +-
 meta-efl/recipes-efl/e17/edje-viewer_svn.bb        |   5 +-
 meta-efl/recipes-efl/e17/elementary-alarm_svn.bb   |  17 -
 meta-efl/recipes-efl/e17/ephoto_svn.bb             |   6 +-
 meta-efl/recipes-efl/e17/exalt-client_svn.bb       |   4 +-
 meta-efl/recipes-efl/e17/exalt_svn.bb              |   4 +-
 meta-efl/recipes-efl/e17/exquisite_svn.bb          |   1 +
 meta-efl/recipes-efl/e17/flame_svn.bb              |   3 +
 meta-efl/recipes-efl/e17/forecasts_svn.bb          |   3 +
 meta-efl/recipes-efl/e17/news_svn.bb               |   7 +-
 meta-efl/recipes-efl/e17/notification_svn.bb       |  13 -
 meta-efl/recipes-efl/e17/rain_svn.bb               |   4 +
 meta-efl/recipes-efl/e17/uptime_svn.bb             |   3 +
 meta-efl/recipes-efl/e17/waker_svn.bb              |  17 -
 meta-efl/recipes-efl/efl/edb_svn.bb                |   3 +
 meta-efl/recipes-efl/efl/engrave_svn.bb            |   1 +
 meta-efl/recipes-efl/efl/epeg_svn.bb               |   3 +
 meta-efl/recipes-efl/efl/libeweather_svn.bb        |   5 +-
 .../lightmediascanner/lightmediascanner_0.4.4.bb   |   3 +-
 meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb    |   4 +-
 .../epdfview}/epdfview/browser_command.patch       |   0
 .../epdfview}/epdfview/fix-format.patch            |   0
 .../epdfview}/epdfview/glib-single-include.patch   |   0
 .../epdfview}/epdfview/swap-colors.patch           |   0
 .../recipes-apps/epdfview}/epdfview_0.1.8.bb       |   0
 meta-gnome/recipes-gnome/bonobo/libbonobo.inc      |   4 +-
 .../recipes-gnome/bonobo/libbonobo_2.24.3.bb       |   2 +
 .../recipes-gnome/bonobo/libbonoboui_2.24.3.bb     |   5 +-
 .../recipes-gnome/gcalctool/gcalctool_5.8.17.bb    |   3 +
 .../recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb    |  11 +-
 .../recipes-gnome/gnome/gnome-terminal_2.26.3.bb   |   5 +-
 .../recipes-gnome/gnome/libgnomecanvas_2.20.0.bb   |  14 -
 .../recipes-gnome/libgnome/libgnome_2.32.1.bb      |   6 +-
 .../libgnome/libgnomecanvas_2.26.0.bb              |   5 +-
 meta-gnome/recipes-gnome/libgnome/libgnomeui.inc   |   3 +-
 .../recipes-gnome/libgnome/libgnomeui_2.24.3.bb    |   2 +
 .../recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb |   8 +-
 .../recipes-gnome/libnotify/libnotify3_0.7.3.bb    |   2 +
 .../fluidsynth/fluidsynth_1.0.8.bb                 |  19 +
 .../recipes-connectivity/vpnc/vpnc/default.conf    |  19 +
 .../recipes-connectivity/vpnc/vpnc/long-help       | 168 ++++++++
 .../recipes-connectivity/vpnc/vpnc/makeman.patch   |  11 +
 .../vpnc/vpnc/vpnc-install.patch                   |  35 ++
 .../recipes-connectivity/vpnc/vpnc_0.5.3.bb        |  30 ++
 .../libcanberra/libcanberra_0.26.bb                |   6 +-
 meta-oe/recipes-devtools/lua/lua5.1_5.1.4.bb       |   6 +-
 .../packagekit/packagekit-0.5.6/configurefix.patch |  13 +
 .../packagekit/packagekit-0.5.6/opkgfixes.patch    | 422 +++++++++++++++++++++
 .../packagekit/packagekit_0.5.6.bb                 |  58 +++
 meta-oe/recipes-devtools/python/pyrtm_0.2.bb       |  12 +
 .../xorg-doc/xorg-sgml-doctools_1.7.bb             |   2 +
 .../xorg-driver/xf86-input-void_1.4.0.bb           |   4 +-
 .../recipes-navigation/tangogps/tangogps_0.99.4.bb |   6 +-
 meta-oe/recipes-qt/qconnman/qconnman.inc           |   2 +-
 meta-oe/recipes-support/eject/eject_2.1.5.bb       |  16 +-
 meta-oe/recipes-support/fuse/fuse_2.9.2.bb         |   6 +
 ...20120120.bb => usb-modeswitch-data_20121109.bb} |   4 +-
 ...usbmodeswitch-leave-stripping-to-packager.patch |   7 +-
 ...modeswitch-leave-script-munging-to-recipe.patch |  16 +-
 ...modeswitch_1.2.2.bb => usb-modeswitch_1.2.5.bb} |   6 +-
 meta-oe/recipes-support/vim/gvim_7.2.446.bb        |   4 +
 .../{xserver-nodm.service => entrance.service}     |   0
 .../meta-efl/recipes-efl/efl/entrance_svn.bbappend |   4 +-
 .../pcsc-lite/pcsc-lite_1.8.6.bbappend             |   6 +
 .../util-linux/util-linux_2.22.1.bbappend          |   8 +
 meta-systemd/recipes-core/systemd/systemd_git.bb   |  23 +-
 68 files changed, 959 insertions(+), 142 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/e17/elementary-alarm_svn.bb
 delete mode 100644 meta-efl/recipes-efl/e17/notification_svn.bb
 delete mode 100644 meta-efl/recipes-efl/e17/waker_svn.bb
 rename {meta-efl/recipes-efl/efl => meta-gnome/recipes-apps/epdfview}/epdfview/browser_command.patch (100%)
 rename {meta-efl/recipes-efl/efl => meta-gnome/recipes-apps/epdfview}/epdfview/fix-format.patch (100%)
 rename {meta-efl/recipes-efl/efl => meta-gnome/recipes-apps/epdfview}/epdfview/glib-single-include.patch (100%)
 rename {meta-efl/recipes-efl/efl => meta-gnome/recipes-apps/epdfview}/epdfview/swap-colors.patch (100%)
 rename {meta-efl/recipes-efl/efl => meta-gnome/recipes-apps/epdfview}/epdfview_0.1.8.bb (100%)
 delete mode 100644 meta-gnome/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb
 create mode 100644 meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.0.8.bb
 create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/default.conf
 create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/long-help
 create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch
 create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch
 create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
 create mode 100644 meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch
 create mode 100644 meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch
 create mode 100644 meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb
 create mode 100644 meta-oe/recipes-devtools/python/pyrtm_0.2.bb
 rename meta-oe/recipes-support/usb-modeswitch/{usb-modeswitch-data_20120120.bb => usb-modeswitch-data_20121109.bb} (74%)
 rename meta-oe/recipes-support/usb-modeswitch/{usb-modeswitch_1.2.2.bb => usb-modeswitch_1.2.5.bb} (78%)
 rename meta-systemd/meta-efl/recipes-efl/efl/entrance/{xserver-nodm.service => entrance.service} (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend
 create mode 100644 meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.1.bbappend

-- 
1.8.0

[PATCH 01/58] e-base.bbclass: bump EFL_SRCREV for E17 alpha6

[Martin Jansa]

* changelog: http://enlightenment.org/p.php?p=news/show&l=en&news_id=67

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/classes/e-base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass
index 4099351..9ff0ffc 100644
--- a/meta-efl/classes/e-base.bbclass
+++ b/meta-efl/classes/e-base.bbclass
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 SRCVER ?= "${PV}"
 
-EFL_SRCREV ?= "79741"
+EFL_SRCREV ?= "79754"
 
 ARM_INSTRUCTION_SET = "arm"
 
-- 
1.8.0

[PATCH 02/58] e-base.bbclass: bump EFL_SRCREV for E17 alpha7

[Martin Jansa]

* changelog: http://enlightenment.org/p.php?p=news/show&l=en&news_id=68

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/classes/e-base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass
index 9ff0ffc..7b42e44 100644
--- a/meta-efl/classes/e-base.bbclass
+++ b/meta-efl/classes/e-base.bbclass
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 SRCVER ?= "${PV}"
 
-EFL_SRCREV ?= "79754"
+EFL_SRCREV ?= "79912"
 
 ARM_INSTRUCTION_SET = "arm"
 
-- 
1.8.0

[PATCH 03/58] vpnc: import from OE-classic

[Martin Jansa]

* needed for exalt
* fix LICENSE
* add LIC_FILES_CHKSUM
* .inc merged to .bb and cleaned files

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-connectivity/vpnc/vpnc/default.conf    |  19 +++
 .../recipes-connectivity/vpnc/vpnc/long-help       | 168 +++++++++++++++++++++
 .../recipes-connectivity/vpnc/vpnc/makeman.patch   |  11 ++
 .../vpnc/vpnc/vpnc-install.patch                   |  35 +++++
 .../recipes-connectivity/vpnc/vpnc_0.5.3.bb        |  30 ++++
 5 files changed, 263 insertions(+)
 create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/default.conf
 create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/long-help
 create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch
 create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch
 create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb

diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/default.conf b/meta-networking/recipes-connectivity/vpnc/vpnc/default.conf
new file mode 100644
index 0000000..48b15ec
--- /dev/null
+++ b/meta-networking/recipes-connectivity/vpnc/vpnc/default.conf
@@ -0,0 +1,19 @@
+# Comment out the options you need.
+# Verify your config with "vpnc --print-config".
+# You might also try "vpnc --long-help" or look into the documentation.
+
+# Needed (you will be prompted if this is missing):
+#IPSec gateway 10.1.2.3
+#IPSec ID YOURPEERSID
+#IPSec secret YOURPEERSSECRET
+#Xauth username YOURUSERNAME
+#Xauth password YOURPASSWORD
+
+# Optional:
+#UDP Encapsulate
+#UDP Encapsulation Port 10000
+#Noninteractive
+#No Detach
+#Debug 99
+#Interface name tun0
+#Script /etc/vpnc/vpnc-script
diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/long-help b/meta-networking/recipes-connectivity/vpnc/vpnc/long-help
new file mode 100644
index 0000000..fbec254
--- /dev/null
+++ b/meta-networking/recipes-connectivity/vpnc/vpnc/long-help
@@ -0,0 +1,168 @@
+Usage: vpnc [--version] [--print-config] [--help] [--long-help] [options] [config files]
+
+Options:
+  --gateway <ip/hostname>
+      IP/name of your IPSec gateway
+  conf-variable: IPSec gateway <ip/hostname>
+
+  --id <ASCII string>
+      your group name
+  conf-variable: IPSec ID <ASCII string>
+
+  (configfile only option) 
+      your group password (cleartext)
+  conf-variable: IPSec secret <ASCII string>
+
+  (configfile only option) 
+      your group password (obfuscated)
+  conf-variable: IPSec obfuscated secret <hex string>
+
+  --username <ASCII string>
+      your username
+  conf-variable: Xauth username <ASCII string>
+
+  (configfile only option) 
+      your password (cleartext)
+  conf-variable: Xauth password <ASCII string>
+
+  (configfile only option) 
+      your password (obfuscated)
+  conf-variable: Xauth obfuscated password <hex string>
+
+  --domain <ASCII string>
+      (NT-) Domain name for authentication
+  conf-variable: Domain <ASCII string>
+
+  --xauth-inter 
+      enable interactive extended authentication (for challenge response auth)
+  conf-variable: Xauth interactive
+
+  --vendor <cisco/netscreen>
+      vendor of your IPSec gateway
+    Default: cisco
+  conf-variable: Vendor <cisco/netscreen>
+
+  --natt-mode <natt/none/force-natt/cisco-udp>
+      Which NAT-Traversal Method to use:
+       * natt -- NAT-T as defined in RFC3947
+       * none -- disable use of any NAT-T method
+       * force-natt -- always use NAT-T encapsulation even
+                       without presence of a NAT device
+                       (useful if the OS captures all ESP traffic)
+       * cisco-udp -- Cisco proprietary UDP encapsulation, commonly over Port 10000
+      Note: cisco-tcp encapsulation is not yet supported
+    Default: natt
+  conf-variable: NAT Traversal Mode <natt/none/force-natt/cisco-udp>
+
+  --script <command>
+      command is executed using system() to configure the interface,
+      routing and so on. Device name, IP, etc. are passed using enviroment
+      variables, see README. This script is executed right after ISAKMP is
+      done, but before tunneling is enabled. It is called when vpnc
+      terminates, too
+    Default: /etc/vpnc/vpnc-script
+  conf-variable: Script <command>
+
+  --dh <dh1/dh2/dh5>
+      name of the IKE DH Group
+    Default: dh2
+  conf-variable: IKE DH Group <dh1/dh2/dh5>
+
+  --pfs <nopfs/dh1/dh2/dh5/server>
+      Diffie-Hellman group to use for PFS
+    Default: server
+  conf-variable: Perfect Forward Secrecy <nopfs/dh1/dh2/dh5/server>
+
+  --enable-1des 
+      enables weak single DES encryption
+  conf-variable: Enable Single DES
+
+  --enable-no-encryption 
+      enables using no encryption for data traffic (key exchanged must be encrypted)
+  conf-variable: Enable no encryption
+
+  --application-version <ASCII string>
+      Application Version to report. Note: Default string is generated at runtime.
+    Default: Cisco Systems VPN Client 0.5.3-394:Linux
+  conf-variable: Application version <ASCII string>
+
+  --ifname <ASCII string>
+      visible name of the TUN/TAP interface
+  conf-variable: Interface name <ASCII string>
+
+  --ifmode <tun/tap>
+      mode of TUN/TAP interface:
+       * tun: virtual point to point interface (default)
+       * tap: virtual ethernet interface
+    Default: tun
+  conf-variable: Interface mode <tun/tap>
+
+  --debug <0/1/2/3/99>
+      Show verbose debug messages
+       *  0: Do not print debug information.
+       *  1: Print minimal debug information.
+       *  2: Show statemachine and packet/payload type information.
+       *  3: Dump everything exluding authentication data.
+       * 99: Dump everything INCLUDING AUTHENTICATION data (e.g. PASSWORDS).
+  conf-variable: Debug <0/1/2/3/99>
+
+  --no-detach 
+      Don't detach from the console after login
+  conf-variable: No Detach
+
+  --pid-file <filename>
+      store the pid of background process in <filename>
+    Default: /var/run/vpnc/pid
+  conf-variable: Pidfile <filename>
+
+  --local-addr <ip/hostname>
+      local IP to use for ISAKMP / ESP / ... (0.0.0.0 == automatically assign)
+    Default: 0.0.0.0
+  conf-variable: Local Addr <ip/hostname>
+
+  --local-port <0-65535>
+      local ISAKMP port number to use (0 == use random port)
+    Default: 500
+  conf-variable: Local Port <0-65535>
+
+  --udp-port <0-65535>
+      Local UDP port number to use (0 == use random port).
+      This is only relevant if cisco-udp nat-traversal is used.
+      This is the _local_ port, the remote udp port is discovered automatically.
+      It is especially not the cisco-tcp port.
+    Default: 10000
+  conf-variable: Cisco UDP Encapsulation Port <0-65535>
+
+  --dpd-idle <0,10-86400>
+      Send DPD packet after not receiving anything for <idle> seconds.
+      Use 0 to disable DPD completely (both ways).
+    Default: 300
+  conf-variable: DPD idle timeout (our side) <0,10-86400>
+
+  --non-inter 
+      Don't ask anything, exit on missing options
+  conf-variable: Noninteractive
+
+  --auth-mode <psk/cert/hybrid>
+      Authentication mode:
+       * psk:    pre-shared key (default)
+       * cert:   server + client certificate (not implemented yet)
+       * hybrid: server certificate + xauth (if built with openssl support)
+    Default: psk
+  conf-variable: IKE Authmode <psk/cert/hybrid>
+
+  --ca-file <filename>
+      filename and path to the CA-PEM-File
+  conf-variable: CA-File <filename>
+
+  --ca-dir <directory>
+      path of the trusted CA-Directory
+    Default: /etc/ssl/certs
+  conf-variable: CA-Dir <directory>
+
+  --target-network <target network/netmask>
+      Target network in dotted decimal or CIDR notation
+    Default: 0.0.0.0/0.0.0.0
+  conf-variable: IPSEC target network <target network/netmask>
+
+Report bugs to vpnc@unix-ag.uni-kl.de
diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch
new file mode 100644
index 0000000..f394e6a
--- /dev/null
+++ b/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch
@@ -0,0 +1,11 @@
+--- vpnc-0.5.1/makeman.pl.old	2008-03-16 02:17:59.000000000 -0500
++++ vpnc-0.5.1/makeman.pl	2008-03-16 02:29:34.000000000 -0500
+@@ -29,7 +29,7 @@ my $vpnc = './vpnc';
+ # indenting lists (those originally starting with an asterisk). I hope
+ # this pays off when converting the manpage to HTML or such.
+ 
+-open my $LONGHELP, '-|', "$vpnc --long-help";
++open my $LONGHELP, '-|', "cat ../long-help";
+ my $vpnc_options    = '';
+ my $relative_indent = 0;
+ my $indent_needed   = 0;
diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch
new file mode 100644
index 0000000..3de65ec
--- /dev/null
+++ b/meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch
@@ -0,0 +1,35 @@
+--- a/Makefile~	2009-01-20 18:44:30.000000000 +0100
++++ b/Makefile	2009-01-20 18:44:30.000000000 +0100
+@@ -119,21 +119,21 @@
+ 	else \
+ 		install vpnc-script $(DESTDIR)$(ETCDIR); \
+ 	fi
+-	install -m600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf
+-	install -m755 vpnc-disconnect $(DESTDIR)$(SBINDIR)
+-	install -m755 pcf2vpnc $(DESTDIR)$(BINDIR)
+-	install -m644 vpnc.8 $(DESTDIR)$(MANDIR)/man8
+-	install -m644 pcf2vpnc.1 $(DESTDIR)$(MANDIR)/man1
+-	install -m644 cisco-decrypt.1 $(DESTDIR)$(MANDIR)/man1
+-	install -m644 COPYING $(DESTDIR)$(DOCDIR)
++	install -m 600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf
++	install -m 755 vpnc-disconnect $(DESTDIR)$(SBINDIR)
++	install -m 755 pcf2vpnc $(DESTDIR)$(BINDIR)
++	install -m 644 vpnc.8 $(DESTDIR)$(MANDIR)/man8
++	install -m 644 pcf2vpnc.1 $(DESTDIR)$(MANDIR)/man1
++	install -m 644 cisco-decrypt.1 $(DESTDIR)$(MANDIR)/man1
++	install -m 644 COPYING $(DESTDIR)$(DOCDIR)
+ 
+ install : install-common
+-	install -m755 vpnc $(DESTDIR)$(SBINDIR)
+-	install -m755 cisco-decrypt $(DESTDIR)$(BINDIR)
++	install -m 755 vpnc $(DESTDIR)$(SBINDIR)
++	install -m 755 cisco-decrypt $(DESTDIR)$(BINDIR)
+ 
+ install-strip : install-common
+-	install -s -m755 vpnc $(DESTDIR)$(SBINDIR)
+-	install -s -m755 cisco-decrypt $(DESTDIR)$(BINDIR)
++	install -s -m 755 vpnc $(DESTDIR)$(SBINDIR)
++	install -s -m 755 cisco-decrypt $(DESTDIR)$(BINDIR)
+ 
+ uninstall :
+ 	rm -f $(DESTDIR)$(SBINDIR)/vpnc \
diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
new file mode 100644
index 0000000..1b2b8bf
--- /dev/null
+++ b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "A client for the Cisco3000 VPN Concentrator"
+HOMEPAGE = "http://www.unix-ag.uni-kl.de/~massar/vpnc/"
+AUTHOR = "Maurice Massar vpnc@unix-ag.uni-kl.de"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL-2.0+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=173b74cb8ac640a9992c03f3bce22a33"
+DEPENDS = "libgcrypt"
+RDEPENDS_${PN} = "kernel-module-tun"
+
+CFLAGS_append = ' -DVERSION=\\"${PV}\\"'
+LDFLAGS_append = " -lgcrypt -lgpg-error"
+
+do_install () {
+	sed -i s:m600:m\ 600:g Makefile	
+	oe_runmake 'DESTDIR=${D}' 'PREFIX=/usr' install
+	rm -f ${D}${sysconfdir}/vpnc/vpnc.conf #This file is useless
+	install ${WORKDIR}/default.conf ${D}${sysconfdir}/vpnc/default.conf
+}
+
+CONFFILES_${PN} = "${sysconfdir}/vpnc/default.conf"
+
+SRC_URI = "http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${PV}.tar.gz \
+           file://makeman.patch \
+           file://vpnc-install.patch \
+           file://long-help \
+           file://default.conf"
+
+SRC_URI[md5sum] = "4378f9551d5b077e1770bbe09995afb3"
+SRC_URI[sha256sum] = "46cea3bd02f207c62c7c6f2f22133382602baeda1dc320747809e94881414884"
-- 
1.8.0

[PATCH 04/58] fluidsynth: import from OE-Classic

[Martin Jansa]

* needed for epiano
* added LIC_FILES_CHSKUm
* fixed LICENSE

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-multimedia/fluidsynth/fluidsynth_1.0.8.bb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.0.8.bb

diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.0.8.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.0.8.bb
new file mode 100644
index 0000000..f5d6e53
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.0.8.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Fluidsynth is a software synthesizer"
+HOMEPAGE = "http://www.fluidsynth.org/"
+SECTION = "libs/multimedia"
+LICENSE = "LGPLv-2.0+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=dda26baa823649da9a68947707650272"
+
+DEPENDS = "alsa-lib ncurses"
+
+SRC_URI = "http://savannah.nongnu.org/download/fluid/${P}.tar.gz"
+SRC_URI[md5sum] = "e2abfd2e69fd8b28d965df968d7d44ee"
+SRC_URI[sha256sum] = "45e7c9967d0fb0344f4da539ab343fb979384b36a429a8594c94cf466dff4320"
+
+inherit autotools pkgconfig lib_package
+
+#Has broken libtool usage
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
-- 
1.8.0

[PATCH 05/58] packagekit: import from OE-Classic

[Martin Jansa]

* add LIC_FILES_CHKSUM
* drop versions from DEPENDS
* use opkg as the only IPKG_VARIANT
* depend on polkit (renamed from policykit)
* disable unpackaged ruck
* fix packaging of PN-staticdev

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../packagekit/packagekit-0.5.6/configurefix.patch |  13 +
 .../packagekit/packagekit-0.5.6/opkgfixes.patch    | 422 +++++++++++++++++++++
 .../packagekit/packagekit_0.5.6.bb                 |  58 +++
 3 files changed, 493 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch
 create mode 100644 meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch
 create mode 100644 meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb

diff --git a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch b/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch
new file mode 100644
index 0000000..48f9591
--- /dev/null
+++ b/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch
@@ -0,0 +1,13 @@
+Index: PackageKit-0.6.0/configure.ac
+===================================================================
+--- PackageKit-0.6.0.orig/configure.ac	2010-01-04 16:32:18.000000000 +0000
++++ PackageKit-0.6.0/configure.ac	2010-01-29 11:33:48.000000000 +0000
+@@ -90,7 +90,7 @@
+ 							enable_strict=$default_strict)
+ if test x$enable_strict != xno; then
+ 	if test "$GCC" = "yes"; then
+-		WARNINGFLAGS_CPP="$WARNINGFLAGS_CPP -Werror"
++		:
+ 	fi
+ fi
+ 
diff --git a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch b/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch
new file mode 100644
index 0000000..5a73a19
--- /dev/null
+++ b/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch
@@ -0,0 +1,422 @@
+Index: PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c
+===================================================================
+--- PackageKit-0.6.0.orig/backends/opkg/pk-backend-opkg.c	2010-01-29 09:39:33.000000000 +0000
++++ PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c	2010-01-29 11:30:51.000000000 +0000
+@@ -29,8 +29,7 @@
+ 
++#include <stdio.h>
+ #include <libopkg/opkg.h>
+ 
+-static opkg_t *opkg;
+-
+ enum {
+ 	SEARCH_NAME,
+ 	SEARCH_DESCRIPTION,
+@@ -62,7 +60,7 @@
+  * check an opkg package for known GUI dependancies
+  */
+ static gboolean
+-opkg_is_gui_pkg (opkg_package_t *pkg)
++opkg_is_gui_pkg (pkg_t *pkg)
+ {
+ 
+   /* TODO: check appropriate tag */
+@@ -84,7 +82,7 @@
+  * check an opkg package to determine if it is a development package
+  */
+ static gboolean
+-opkg_is_devel_pkg (opkg_package_t *pkg)
++opkg_is_devel_pkg (pkg_t *pkg)
+ {
+   if (g_strrstr (pkg->name, "-dev"))
+       return TRUE;
+@@ -105,7 +103,7 @@
+  * returns true if the tag is present
+  */
+ static gboolean 
+-opkg_check_tag (opkg_package_t *pkg, const gchar *tag)
++opkg_check_tag (pkg_t *pkg, const gchar *tag)
+ {
+ 	if (pkg->tags && tag)
+ 		return (g_strrstr (pkg->tags, tag) != NULL);
+@@ -118,7 +116,7 @@
+ {
+ 	switch (err)
+ 	{
+-	case OPKG_NO_ERROR:
++/*	case OPKG_NO_ERROR:
+ 		break;
+ 	case OPKG_PACKAGE_NOT_INSTALLED:
+ 		pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
+@@ -140,7 +138,7 @@
+ 		break;
+ 	case OPKG_PACKAGE_NOT_AVAILABLE:
+ 		pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, NULL);
+-		break;
++		break;*/
+ 	default:
+ 		opkg_unknown_error (backend, err, "Update package");
+ 	}
+@@ -152,7 +150,7 @@
+ static void
+ backend_initialize (PkBackend *backend)
+ {
+-	opkg = opkg_new ();
++	int opkg = opkg_new ();
+ 
+ 	if (!opkg) {
+ 		pk_backend_error_code (backend,
+@@ -162,8 +160,8 @@
+ 	}
+ 
+ #ifdef OPKG_OFFLINE_ROOT
+-	opkg_set_option (opkg, (char *) "offline_root", OPKG_OFFLINE_ROOT);
+-	opkg_re_read_config_files (opkg);
++	opkg_set_option ((char *) "offline_root", OPKG_OFFLINE_ROOT);
++	opkg_re_read_config_files ();
+ #endif
+ 
+ }
+@@ -174,22 +172,22 @@
+ static void
+ backend_destroy (PkBackend *backend)
+ {
+-	opkg_free (opkg);
++	opkg_free ();
+ }
+ 
+ 
+ static void
+-pk_opkg_progress_cb (opkg_t *_opkg, const opkg_progress_data_t *pdata, void *data)
++pk_opkg_progress_cb (const opkg_progress_data_t *pdata, void *data)
+ {
+-	PkBackend *backend = PK_BACKEND (data);
++	PkBackend *backend = (PkBackend*) data;
+ 	if (!backend)
+ 		return;
+ 
+ 	pk_backend_set_percentage (backend, pdata->percentage);
+-	if (pdata->package)
++	if (pdata->pkg)
+ 	{
+ 		gchar *uid;
+-		opkg_package_t *pkg = pdata->package;
++		pkg_t *pkg = pdata->pkg;
+ 		gint status = PK_INFO_ENUM_UNKNOWN;
+ 
+ 		uid = g_strdup_printf ("%s;%s;%s;",
+@@ -225,12 +223,12 @@
+ {
+ 	int ret;
+ 
+-	ret = opkg_update_package_lists (opkg, pk_opkg_progress_cb, backend);
++	ret = opkg_update_package_lists (pk_opkg_progress_cb, backend);
+ 
+ 	if (ret) {
+-		if (ret == OPKG_DOWNLOAD_FAILED)
+-			pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL);
+-		else
++//		if (ret == OPKG_DOWNLOAD_FAILED)
++//			pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL);
++//		else
+ 			opkg_unknown_error (backend, ret, "Refreshing cache");
+ 	}
+ 	pk_backend_finished (backend);
+@@ -256,7 +254,7 @@
+  */
+ 
+ static void
+-pk_opkg_package_list_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data)
++pk_opkg_package_list_cb (pkg_t *pkg, void *data)
+ {
+ 	SearchParams *params = (SearchParams*) data;
+ 	gchar *uid;
+@@ -298,7 +296,7 @@
+ 	uid = g_strdup_printf ("%s;%s;%s;",
+ 		pkg->name, pkg->version, pkg->architecture);
+ 
+-	if (pkg->installed)
++	if (pkg->state_status == SS_INSTALLED)
+ 		status = PK_INFO_ENUM_INSTALLED;
+ 	else
+ 		status = PK_INFO_ENUM_AVAILABLE;
+@@ -318,10 +316,10 @@
+                 opkg_is_gui_pkg (pkg))
+ 		goto end_handle;
+ 	if (pk_bitfield_contain(filters, PK_FILTER_ENUM_INSTALLED) && 
+-                (!pkg->installed))
++                (pkg->state_status != SS_INSTALLED))
+ 		goto end_handle;
+ 	if (pk_bitfield_contain(filters, PK_FILTER_ENUM_NOT_INSTALLED) && 
+-                (pkg->installed))
++                (pkg->state_status == SS_INSTALLED))
+ 		goto end_handle;
+ 
+ 	pk_backend_package (params->backend, status, uid, pkg->description);
+@@ -338,7 +336,7 @@
+ 
+ 	params = pk_backend_get_pointer (backend, "search-params");
+ 
+-	opkg_list_packages (opkg, pk_opkg_package_list_cb, params);
++	opkg_list_packages (pk_opkg_package_list_cb, params);
+ 
+ 	pk_backend_finished (params->backend);
+ 
+@@ -349,7 +347,7 @@
+ }
+ 
+ static void
+-backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search)
++backend_search_name (PkBackend *backend, PkBitfield filters, gchar **search)
+ {
+ 	SearchParams *params;
+ 
+@@ -360,7 +358,7 @@
+ 	params = g_new0 (SearchParams, 1);
+ 	params->filters = filters;
+ 	params->search_type = SEARCH_NAME;
+-	params->needle = g_utf8_strdown (search, -1);
++	params->needle = g_utf8_strdown (search[0], -1);
+ 	params->backend = backend;
+ 
+ 	pk_backend_set_pointer (backend, "search-params", params);
+@@ -371,7 +369,7 @@
+  * backend_search_description:
+  */
+ static void
+-backend_search_description (PkBackend *backend, PkBitfield filters, const gchar *search)
++backend_search_description (PkBackend *backend, PkBitfield filters, gchar **search)
+ {
+ 	SearchParams *params;
+ 
+@@ -382,7 +380,7 @@
+ 	params = g_new0 (SearchParams, 1);
+ 	params->filters = filters;
+ 	params->search_type = SEARCH_DESCRIPTION;
+-	params->needle = g_utf8_strdown (search, -1);
++	params->needle = g_utf8_strdown (search[0], -1);
+ 	params->backend = backend;
+ 
+ 	pk_backend_set_pointer (backend, "search-params", params);
+@@ -390,7 +388,7 @@
+ }
+ 
+ static void
+-backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *search)
++backend_search_group (PkBackend *backend, PkBitfield filters, gchar **search)
+ {
+ 	SearchParams *params;
+ 
+@@ -401,7 +399,7 @@
+ 	params = g_new0 (SearchParams, 1);
+ 	params->filters = filters;
+ 	params->search_type = SEARCH_TAG;
+-	params->needle = g_strdup_printf ("group::%s", search);
++	params->needle = g_strdup_printf ("group::%s", search[0]);
+ 	params->backend = backend;
+ 
+ 	pk_backend_set_pointer (backend, "search-params", params);
+@@ -412,9 +410,9 @@
+ static gboolean
+ backend_install_packages_thread (PkBackend *backend)
+ {
+-	PkPackageId *pi;
+ 	gint err, i;
+ 	gchar **package_ids;
++	gchar **parts;
+ 
+ 	package_ids = pk_backend_get_strv (backend, "pkids");
+ 
+@@ -424,13 +422,13 @@
+ 	{
+ 		pk_backend_package (backend, PK_INFO_ENUM_INSTALLING, package_ids[i], NULL);
+ 
+-		pi = pk_package_id_new_from_string (package_ids[i]);
++		parts = pk_package_id_split (package_ids[i]);
+ 
+-		err = opkg_install_package (opkg, pi->name, pk_opkg_progress_cb, backend);
++		err = opkg_install_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
+ 		if (err)
+ 			handle_install_error (backend, err);
+ 
+-		pk_package_id_free (pi);
++		g_strfreev (parts);
+ 		if (err != 0)
+ 			break;
+ 	}
+@@ -453,9 +451,9 @@
+ static gboolean
+ backend_remove_packages_thread (PkBackend *backend)
+ {
+-	PkPackageId *pi;
+ 	gint err, i;
+ 	gchar **package_ids;
++	gchar **parts;
+ 	gboolean allow_deps;
+ 	gboolean autoremove;
+ 	gpointer *data;
+@@ -467,29 +465,30 @@
+ 	autoremove = GPOINTER_TO_INT (data[2]);
+ 	g_free (data);
+ 
+-	opkg_set_option (opkg, (char *)"autoremove", &autoremove);
+-	opkg_set_option (opkg, (char *)"force_removal_of_dependent_packages", &allow_deps);
++	opkg_set_option ((char *)"autoremove", &autoremove);
++	opkg_set_option ((char *)"force_removal_of_dependent_packages", &allow_deps);
+ 
+ 	err = 0;
+ 
+ 	for (i = 0; package_ids[i]; i++)
+ 	{
+-		pi = pk_package_id_new_from_string (package_ids[i]);
+ 		pk_backend_package (backend, PK_INFO_ENUM_REMOVING, package_ids[i], NULL);
+ 
+-		err = opkg_remove_package (opkg, pi->name, pk_opkg_progress_cb, backend);
++		parts = pk_package_id_split (package_ids[i]);
++
++		err = opkg_remove_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
+ 
+ 		switch (err)
+ 		{
+-		case OPKG_NO_ERROR:
+-			break;
+-		case OPKG_PACKAGE_NOT_INSTALLED:
+-			pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
+-			break;
++		//case OPKG_NO_ERROR:
++		//	break;
++		//case OPKG_PACKAGE_NOT_INSTALLED:
++		//	pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
++		//	break;
+ 		default:
+ 			opkg_unknown_error (backend, err, "Remove");
+ 		}
+-		pk_package_id_free (pi);
++		g_strfreev (parts);
+ 
+ 		if (err != 0)
+ 			break;
+@@ -540,7 +539,7 @@
+ 	gint err;
+ 
+ 	/* FIXME: support only_trusted */
+-	err = opkg_upgrade_all (opkg, pk_opkg_progress_cb, backend);
++	err = opkg_upgrade_all (pk_opkg_progress_cb, backend);
+ 
+ 	if (err)
+ 		opkg_unknown_error (backend, err, "Upgrading system");
+@@ -564,29 +563,28 @@
+ static gboolean
+ backend_update_package_thread (PkBackend *backend)
+ {
+-	PkPackageId *pi;
++        gchar **parts;
+ 	gint err = 0;
+ 	const gchar *package_id;
+ 
+ 	/* FIXME: support only_trusted */
+ 	package_id = pk_backend_get_string (backend, "pkgid");
+-	pi = pk_package_id_new_from_string (package_id);
++	parts = pk_package_id_split (package_id);
+ 
+-	if (!pi->name || !pi->version)
++	if (!parts)
+ 	{
+ 		pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
+ 				"Package not found");
+-		pk_package_id_free (pi);
+ 		pk_backend_finished (backend);
+ 		return FALSE;
+ 	}
+ 
+-	err = opkg_upgrade_package (opkg, pi->name, pk_opkg_progress_cb, backend);
++	err = opkg_upgrade_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
+ 	if (err)
+ 		handle_install_error (backend, err);
+ 
+ 
+-	pk_package_id_free (pi);
++	g_strfreev (parts);
+ 	pk_backend_finished (backend);
+ 	return (err != 0);
+ }
+@@ -610,13 +608,13 @@
+  */
+ 
+ static void
+-pk_opkg_list_upgradable_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data)
++pk_opkg_list_upgradable_cb (pkg_t *pkg, void *data)
+ {
+-	PkBackend *backend = PK_BACKEND (data);
++	PkBackend *backend = (PkBackend*) data;
+ 	gchar *uid;
+ 	gint status;
+ 
+-	if (pkg->installed)
++	if (pkg->state_status == SS_INSTALLED)
+ 		status = PK_INFO_ENUM_INSTALLED;
+ 	else
+ 		status = PK_INFO_ENUM_AVAILABLE;
+@@ -631,7 +629,7 @@
+ static gboolean
+ backend_get_updates_thread (PkBackend *backend)
+ {
+-	opkg_list_upgradable_packages (opkg, pk_opkg_list_upgradable_cb, backend);
++	opkg_list_upgradable_packages (pk_opkg_list_upgradable_cb, backend);
+ 	pk_backend_finished (backend);
+ 	return TRUE;
+ }
+@@ -668,16 +666,18 @@
+ static gboolean
+ backend_get_details_thread (PkBackend *backend)
+ {
+-	PkPackageId *pi;
+ 	gchar **package_ids;
++        gchar **parts;
+ 	int group_index;
+ 	PkGroupEnum group = 0;
+-	opkg_package_t *pkg;
++	pkg_t *pkg;
+ 	gchar *newid;
+ 
+         package_ids = pk_backend_get_strv(backend, "package_ids");
+-	pi = pk_package_id_new_from_string (package_ids[0]);
+-	if (pi == NULL)
++	parts = pk_package_id_split (package_ids[0]);
++
++
++	if (!parts)
+ 	{
+ 		pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_ID_INVALID, "invalid package id");
+ 		pk_backend_finished (backend);
+@@ -685,8 +685,8 @@
+ 	}
+ 
+ 
+-	pkg = opkg_find_package (opkg, pi->name, pi->version, pi->arch, pi->data);
+-	pk_package_id_free (pi);
++	pkg = opkg_find_package (parts[PK_PACKAGE_ID_NAME], parts[PK_PACKAGE_ID_VERSION], parts[PK_PACKAGE_ID_ARCH], parts[PK_PACKAGE_ID_DATA]);
++	g_strfreev (parts);
+ 
+ 	if (!pkg)
+ 	{
+@@ -695,7 +695,7 @@
+ 		return FALSE;
+ 	}
+ 
+-	newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->repository);
++	newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->src->name);
+ 
+ 	if (pkg->tags) {
+ 		for (group_index = 0; group < PK_GROUP_ENUM_LAST; group_index++) {
+@@ -706,9 +706,8 @@
+ 		}
+ 	}
+ 
+-	pk_backend_details (backend, newid, NULL, group, pkg->description, pkg->url, pkg->size);
++	pk_backend_details (backend, newid, NULL, group, pkg->description, NULL, pkg->size);
+ 	g_free (newid);
+-	opkg_package_free(pkg);
+ 	pk_backend_finished (backend);
+ 	return TRUE;
+ }
diff --git a/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb b/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb
new file mode 100644
index 0000000..cc66b4c
--- /dev/null
+++ b/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb
@@ -0,0 +1,58 @@
+DESCRIPTION = "PackageKit package management abstraction"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL-2.0+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+DEPENDS = "gtk+ python polkit dbus dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native"
+RDEPENDS_${PN} = "opkg"
+
+inherit gnome pythonnative
+
+SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz;name=archive \
+           file://configurefix.patch \
+           file://opkgfixes.patch"
+
+SRC_URI[archive.md5sum] = "6c8d9c48e21b82abeea15c3fd5066242"
+SRC_URI[archive.sha256sum] = "0eafd1be5516a41ebc0f0c3acff0b0763da105a4178b5eee0ff16d66ccd04408"
+
+S = "${WORKDIR}/PackageKit-${PV}"
+
+EXTRA_OECONF = "--with-security-framework=dummy \
+                --with-default-backend=opkg \
+                --enable-opkg \
+                --disable-tests \
+                --disable-ruck \
+                --disable-qt \
+                --disable-gstreamer-plugin \
+                --disable-local  \
+                --disable-networkmanager \
+                ac_cv_path_XMLTO=no \
+                "
+
+#do_configure_prepend() {
+#	mkdir -p m4
+#	echo "EXTRA_DIST=" > gtk-doc.make
+#}
+
+do_configure_append() {
+	for i in $(find . -name Makefile) ; do
+	        sed -i -e s:${STAGING_DIR_NATIVE}::g \
+               -e s:${bindir}/mkdir:${STAGING_BINDIR_NATIVE}/mkdir:g \
+               -e s:/usr/bin/intltool-merge:${STAGING_BINDIR_NATIVE}/intltool-merge:g \
+	$i
+	done
+}
+
+PACKAGES =+ "${PN}-website"
+FILES_${PN}-website = "${datadir}/PackageKit/website"
+
+PACKAGES =+ "${PN}-python"
+FILES_${PN}-python = "${libdir}/python*"
+
+PACKAGES =+ "${PN}-gtkmodule"
+FILES_${PN}-gtkmodule = "${libdir}/gtk-2.0/*/*.so"
+
+FILES_${PN} += "${libdir}/packagekit-backend/*.so ${libdir}/pm-utils ${datadir}/dbus-1/system-services/ ${datadir}/PolicyKit ${datadir}/PackageKit"
+FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so ${libdir}/gtk-2.0/*/.debug"
+FILES_${PN}-dev += "${libdir}/packagekit-backend/*.la ${libdir}/gtk-2.0/*/*.la"
+FILES_${PN}-staticdev += "${libdir}/packagekit-backend/*.a ${libdir}/gtk-2.0/*/*.a"
-- 
1.8.0

[PATCH 06/58] pyrtm: import from OE-Classic

[Martin Jansa]

* needed for rtmom
* add LIC_FILES_CHKSUM

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-devtools/python/pyrtm_0.2.bb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/python/pyrtm_0.2.bb

diff --git a/meta-oe/recipes-devtools/python/pyrtm_0.2.bb b/meta-oe/recipes-devtools/python/pyrtm_0.2.bb
new file mode 100644
index 0000000..0cc5e8e
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/pyrtm_0.2.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Python interface for Remember The Milk API."
+AUTHOR = "Sridhar Ratnakumar / srid"
+HOMEPAGE = "http://pypi.python.org/pypi/pyrtm"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=a53cbc7cb75660694e138ba973c148df"
+DEPENDS = "python-native"
+
+inherit distutils
+
+SRC_URI = "http://pypi.python.org/packages/source/p/${PN}/${P}.tar.gz"
+SRC_URI[md5sum] = "34423f39caf7df8a9db8e243be9cf1a0"
+SRC_URI[sha256sum] = "d9d46d096a38cb692b55f4ee9f364d54348298e9497b11c1ef057539b5de1567"
-- 
1.8.0

[PATCH 07/58] usb-modeswitch-data: upgrade to 20121109

[Martin Jansa]

* older archive no longer available on SRC_URI

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...sb-modeswitch-data_20120120.bb => usb-modeswitch-data_20121109.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/usb-modeswitch/{usb-modeswitch-data_20120120.bb => usb-modeswitch-data_20121109.bb} (74%)

diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20120120.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb
similarity index 74%
rename from meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20120120.bb
rename to meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb
index bf3249f..8a6fc13 100644
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20120120.bb
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 inherit allarch
 
 SRC_URI = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${PV}.tar.bz2"
-SRC_URI[md5sum] = "c899cc9c71bb35f3ec600b7cd1455c65"
-SRC_URI[sha256sum] = "bce6b8cbbf293fe519584b63815fe7f665e8238e6e138151d8cf7cc85a7a7b0f"
+SRC_URI[md5sum] = "a7d23a03157871013a0d708ab2b1b6df"
+SRC_URI[sha256sum] = "a74346a471d540ba9da7d7b332ad35ea05ff7375297c0da87da5be675293d5a5"
 
 do_install() {
 	oe_runmake install DESTDIR=${D}
-- 
1.8.0

[PATCH 08/58] usb-modeswitch: upgrade to 1.2.5

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../0001-usbmodeswitch-leave-stripping-to-packager.patch |  7 ++-----
 ...2-usb-modeswitch-leave-script-munging-to-recipe.patch | 16 +++++-----------
 .../{usb-modeswitch_1.2.2.bb => usb-modeswitch_1.2.5.bb} |  6 +++---
 3 files changed, 10 insertions(+), 19 deletions(-)
 rename meta-oe/recipes-support/usb-modeswitch/{usb-modeswitch_1.2.2.bb => usb-modeswitch_1.2.5.bb} (78%)

diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-usbmodeswitch-leave-stripping-to-packager.patch b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-usbmodeswitch-leave-stripping-to-packager.patch
index 063aba5..0cbacf0 100644
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-usbmodeswitch-leave-stripping-to-packager.patch
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-usbmodeswitch-leave-stripping-to-packager.patch
@@ -15,15 +15,12 @@ diff --git a/Makefile b/Makefile
 index 2072976..a71780a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -46,7 +46,7 @@ distclean:
+@@ -46,7 +46,7 @@
  	cd jim && $(MAKE) distclean
  
- install-common:
+ install-common: all
 -	install -D -s --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
 +	install -D --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
  	install -D --mode=755 usb_modeswitch.sh $(UDEVDIR)/usb_modeswitch
  	install -D --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf
  	install -D --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1
--- 
-1.7.2.5
-
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0002-usb-modeswitch-leave-script-munging-to-recipe.patch b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0002-usb-modeswitch-leave-script-munging-to-recipe.patch
index d6f2ff2..f9396b2 100644
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0002-usb-modeswitch-leave-script-munging-to-recipe.patch
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0002-usb-modeswitch-leave-script-munging-to-recipe.patch
@@ -15,7 +15,7 @@ diff --git a/Makefile b/Makefile
 index a71780a..a26b8de 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -51,23 +51,12 @@ install-common:
+@@ -51,20 +51,9 @@
  	install -D --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf
  	install -D --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1
  	install -d $(DESTDIR)/var/lib/usb_modeswitch
@@ -32,14 +32,8 @@ index a71780a..a26b8de 100644
 -	sed 's_!/usr/bin/tclsh_!'"$$SHELL"'_' <usb_modeswitch.tcl >usb_modeswitch_dispatcher
  	install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
  
- install-binary:
- 	install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
- 
--install: all install-common install-script
-+install: all install-common
+-install: install-common install-script
++install: install-common
  
- install-shared: shared install-common install-binary
- 
--- 
-1.7.2.5
-
+ install-shared: dispatcher-dynamic install-common
+ 	install -D -s --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.2.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb
similarity index 78%
rename from meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.2.bb
rename to meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb
index 2e19370..b0c9e95 100644
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.2.bb
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb
@@ -7,14 +7,14 @@ DEPENDS = "virtual/libusb0"
 SRC_URI = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${PV}.tar.bz2 \
            file://0001-usbmodeswitch-leave-stripping-to-packager.patch \
            file://0002-usb-modeswitch-leave-script-munging-to-recipe.patch"
-SRC_URI[md5sum] = "4f3d3b9342b59b488089a8a81abda3ae"
-SRC_URI[sha256sum] = "b46b08b0899bbacfe9081ed907f8d0f3fac9e647c4d0f3705c85804cb3a431e0"
+SRC_URI[md5sum] = "c393603908eceab95444c5bde790f6f0"
+SRC_URI[sha256sum] = "ce47a3dec3e4c93e0a2fcea64278d0e289e6e78d8e1381c54f03986e443ab90f"
 
 do_install() {
 	sed 's_!/usr/bin_!'"${bindir}"'_' <usb_modeswitch.tcl >usb_modeswitch_dispatcher
 	oe_runmake install DESTDIR=${D}
 }
 
-FILES_${PN} = "${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch ${sbindir}"
+FILES_${PN} = "${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch"
 RDEPENDS_${PN} = "tcl"
 RRECOMMENDS_${PN} = "usb-modeswitch-data"
-- 
1.8.0

[PATCH 09/58] cheese: rename eds-dbus to evolution-data-server in DEPENDS

[Martin Jansa]

* was renamed in oe-core
  commit 6189a8a05620974c098d548c26502453f371fe26
  Author: Saul Wold <sgw@linux.intel.com>
  Date:   Thu Apr 19 17:26:01 2012 -0700

    evolation-data-server: Rename from eds-dbus

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
index d6d61fd..4ac667b 100644
--- a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
+++ b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
@@ -2,7 +2,9 @@ DESCRIPTION = "Take photos and videos with your webcam, with fun graphical effec
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf"
 
-DEPENDS = "gtk+ gstreamer gst-plugins-base libcanberra udev librsvg gnome-desktop eds-dbus"
+DEPENDS = "gtk+ gstreamer gst-plugins-base libcanberra udev librsvg gnome-desktop evolution-data-server"
+
+PR = "r1"
 
 inherit gnome
 
-- 
1.8.0

[PATCH 10/58] gnome-terminal: add SRC_URI checksums

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb b/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
index 73f0b99..ac4cc00 100644
--- a/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
+++ b/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
@@ -14,3 +14,5 @@ do_configure_prepend () {
 	rm -f ${S}/src/terminal-type-builtins.c
 }
 
+SRC_URI[archive.md5sum] = "0395af0d444ed4fbfabf65d3583119c8"
+SRC_URI[archive.sha256sum] = "ecddbf523700820524b2646451c307c5b55078b9cebe5fa464ef626b4b4cbda2"
-- 
1.8.0

[PATCH 11/58] libnotify3: add SRC_URI checksum

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb b/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb
index 2ff6879..4c46ec4 100644
--- a/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb
+++ b/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb
@@ -9,3 +9,5 @@ BPN = "libnotify"
 
 inherit gnome lib_package
 
+SRC_URI[archive.md5sum] = "d20676bde7bd2d276508d019dc7276f1"
+SRC_URI[archive.sha256sum] = "322541fdf276eb803686df81763a5186af041b2ee3e9cc5fa1dc86c550388c88"
-- 
1.8.0

[PATCH 12/58] gcalctool: add SRC_URI checksums

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
index 981a073..61b28e4 100644
--- a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
+++ b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
@@ -7,6 +7,9 @@ PR = "r0"
 SRC_URI = "http://download.gnome.org/sources/${PN}/5.8/${PN}-${PV}.tar.gz \
 	file://fix-includedir.patch"
 
+SRC_URI[md5sum] = "dd9d4f326d7d925a5ad9fbb1c5b32142"
+SRC_URI[sha256sum] = "8806e7696eeee62f2df21135fc488ba99f7d55dfd2a40bb9615e2edd95391589"
+
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gnome"
-- 
1.8.0

[PATCH 13/58] libgtkstylus: add SRC_URI checksums

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb b/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
index 8567b13..4b5a750 100644
--- a/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
+++ b/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
@@ -9,6 +9,8 @@ inherit autotools
 
 SRC_URI = "http://burtonini.com/temp/${PN}-${PV}.tar.gz \
 	file://gtkstylus.sh"
+SRC_URI[md5sum] = "fa1c82cd9fd2fafd7ff10d78eb5781c5"
+SRC_URI[sha256sum] = "383e0a22a537f653b8d41688277560f95678a042967198085ec7caa1a5cc2f4c"
 
 do_install_append() {
 	install -d ${D}/${sysconfdir}/X11/Xsession.d
-- 
1.8.0

[PATCH 14/58] qconnman: update git repo URL

[Martin Jansa]

* it was probably renamed on github, old SRCREV works

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-qt/qconnman/qconnman.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-qt/qconnman/qconnman.inc b/meta-oe/recipes-qt/qconnman/qconnman.inc
index 06ad5fd..f26274b 100644
--- a/meta-oe/recipes-qt/qconnman/qconnman.inc
+++ b/meta-oe/recipes-qt/qconnman/qconnman.inc
@@ -10,6 +10,6 @@ inherit autotools
 
 PV = "0.0+gitr${SRCPV}"
 SRCREV = "f976b18c7c5584627224784801803e9fd3ebe0ff"
-SRC_URI = "git://github.com/OSSystems/qconnman.git"
+SRC_URI = "git://github.com/OSSystems/qconnman-ui.git"
 
 S = "${WORKDIR}/git/"
-- 
1.8.0

[PATCH 15/58] edje-viewer: add LIC_FILES_CHKSUM and drop BSD from LICENSE

[Martin Jansa]

* COPYING does not say anything from BSD license, only MIT

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/edje-viewer_svn.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-efl/recipes-efl/e17/edje-viewer_svn.bb b/meta-efl/recipes-efl/e17/edje-viewer_svn.bb
index c2670e0..0315f66 100644
--- a/meta-efl/recipes-efl/e17/edje-viewer_svn.bb
+++ b/meta-efl/recipes-efl/e17/edje-viewer_svn.bb
@@ -1,5 +1,8 @@
 DESCRIPTION = "Edje_Viewer is just that."
-LICENSE = "MIT BSD"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 \
+                    file://COPYING-PLAIN;md5=e01359041001e8bf24c09acca556e792"
+
 DEPENDS = "elementary"
 PV = "0.0.0+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
-- 
1.8.0

[PATCH 16/58] uptime: add LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/uptime_svn.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-efl/recipes-efl/e17/uptime_svn.bb b/meta-efl/recipes-efl/e17/uptime_svn.bb
index c6d7434..a296a5e 100644
--- a/meta-efl/recipes-efl/e17/uptime_svn.bb
+++ b/meta-efl/recipes-efl/e17/uptime_svn.bb
@@ -1,4 +1,7 @@
 LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 \
+                    file://COPYING-PLAIN;md5=c910b645eda0005ccec46f75203dc96e"
+
 PV = "0.0.2+svnr${SRCREV}"
 PR = "${INC_PR}.0"
 
-- 
1.8.0

[PATCH 17/58] forecast: add LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/forecasts_svn.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-efl/recipes-efl/e17/forecasts_svn.bb b/meta-efl/recipes-efl/e17/forecasts_svn.bb
index a6316ed..a030952 100644
--- a/meta-efl/recipes-efl/e17/forecasts_svn.bb
+++ b/meta-efl/recipes-efl/e17/forecasts_svn.bb
@@ -1,4 +1,7 @@
 LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 \
+                    file://COPYING-PLAIN;md5=51328cfb73bfec3eed7cfd3dbed73988"
+
 PV = "0.2.0+svnr${SRCREV}"
 PR = "${INC_PR}.0"
 
-- 
1.8.0

[PATCH 18/58] cpu: add LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/cpu_svn.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-efl/recipes-efl/e17/cpu_svn.bb b/meta-efl/recipes-efl/e17/cpu_svn.bb
index ccc6e7e..c0ad6a4 100644
--- a/meta-efl/recipes-efl/e17/cpu_svn.bb
+++ b/meta-efl/recipes-efl/e17/cpu_svn.bb
@@ -1,4 +1,7 @@
 LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 \
+                    file://COPYING-PLAIN;md5=c910b645eda0005ccec46f75203dc96e"
+
 PV = "0.0.1+svnr${SRCREV}"
 PR = "${INC_PR}.0"
 
-- 
1.8.0

[PATCH 19/58] diskio: add LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/diskio_svn.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta-efl/recipes-efl/e17/diskio_svn.bb b/meta-efl/recipes-efl/e17/diskio_svn.bb
index f748a29..01a6576 100644
--- a/meta-efl/recipes-efl/e17/diskio_svn.bb
+++ b/meta-efl/recipes-efl/e17/diskio_svn.bb
@@ -1,9 +1,8 @@
 LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 \
+                    file://COPYING-PLAIN;md5=68be76d8126face2fbbecdf1bcbe2b10"
+
 PV = "0.0.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 
 require e-module.inc
-
-
-
-
-- 
1.8.0

[PATCH 20/58] exquisite: add LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/exquisite_svn.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-efl/recipes-efl/e17/exquisite_svn.bb b/meta-efl/recipes-efl/e17/exquisite_svn.bb
index a25c4b3..62453b8 100644
--- a/meta-efl/recipes-efl/e17/exquisite_svn.bb
+++ b/meta-efl/recipes-efl/e17/exquisite_svn.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "A psplash replacement for display"
 LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=14defa372a91118e755133bc8e6aff83"
 DEPENDS = "eet evas ecore embryo edje"
 PV = "0.0.1+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
-- 
1.8.0

[PATCH 21/58] ephoto: update LICENSE and LIC_FILES_CHKSUM

[Martin Jansa]

* COPYNG.icons was changed to GPL-3.0 in r60781

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/ephoto_svn.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-efl/recipes-efl/e17/ephoto_svn.bb b/meta-efl/recipes-efl/e17/ephoto_svn.bb
index 4694398..def68af 100644
--- a/meta-efl/recipes-efl/e17/ephoto_svn.bb
+++ b/meta-efl/recipes-efl/e17/ephoto_svn.bb
@@ -1,9 +1,9 @@
-LICENSE = "MIT CC-BY-SA2.5"
+LICENSE = "MIT GPL-3.0"
 PV = "0.1.0+svnr${SRCREV}"
 PR = "${INC_PR}.0"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=df45d9de58df0b48f515eae8d2421257"
-LIC_FILES_CHKSUM = "file://COPYING.icons;md5=d4e4f10748f3146a089aaa23c9ade59b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fdffcddb366d0cc78e0e46c4ea70c8d9 \
+                    file://COPYING.icons;md5=8f0e2cd40e05189ec81232da84bd6e1a"
 
 require e-module.inc
 
-- 
1.8.0

[PATCH 22/58] exalt: fix LICENSE and add LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/exalt_svn.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-efl/recipes-efl/e17/exalt_svn.bb b/meta-efl/recipes-efl/e17/exalt_svn.bb
index a5590e1..973bb67 100644
--- a/meta-efl/recipes-efl/e17/exalt_svn.bb
+++ b/meta-efl/recipes-efl/e17/exalt_svn.bb
@@ -1,7 +1,9 @@
 DESCRIPTION = "Exalt is a network manager for the windows manager Enlightenment DR17."
 HOMEPAGE = "http://watchwolf.fr/wiki/doku.php?id=exalt"
 
-LICENSE = "LGPLv2"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+
 DEPENDS = "elementary vpnc wpa-supplicant ecore eet edbus"
 RDEPENDS_${PN} = "vpnc wpa-supplicant"
 
-- 
1.8.0

[PATCH 23/58] news: fix LICENSE and add LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/news_svn.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta-efl/recipes-efl/e17/news_svn.bb b/meta-efl/recipes-efl/e17/news_svn.bb
index e45cd44..9b89d80 100644
--- a/meta-efl/recipes-efl/e17/news_svn.bb
+++ b/meta-efl/recipes-efl/e17/news_svn.bb
@@ -1,4 +1,6 @@
-LICENSE = "MIT"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
 PV = "0.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 
@@ -8,6 +10,3 @@ do_configure_prepend() {
     sed -i -e /po/d configure.ac 
     sed -i -e s:\ po::g Makefile.am
 }
-
-
-
-- 
1.8.0

[PATCH 24/58] flame: add LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/flame_svn.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-efl/recipes-efl/e17/flame_svn.bb b/meta-efl/recipes-efl/e17/flame_svn.bb
index 11769c6..97683dd 100644
--- a/meta-efl/recipes-efl/e17/flame_svn.bb
+++ b/meta-efl/recipes-efl/e17/flame_svn.bb
@@ -1,4 +1,7 @@
 LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 \
+                    file://COPYING-PLAIN;md5=c910b645eda0005ccec46f75203dc96e"
+
 PV = "0.0.3+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 
-- 
1.8.0

[PATCH 25/58] rain: add LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/rain_svn.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-efl/recipes-efl/e17/rain_svn.bb b/meta-efl/recipes-efl/e17/rain_svn.bb
index 917fe38..d5e6803 100644
--- a/meta-efl/recipes-efl/e17/rain_svn.bb
+++ b/meta-efl/recipes-efl/e17/rain_svn.bb
@@ -1,4 +1,8 @@
 LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 \
+                    file://COPYING-PLAIN;md5=c910b645eda0005ccec46f75203dc96e"
+
 PV = "0.0.3+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 
-- 
1.8.0

[PATCH 26/58] libeweather: add LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/efl/libeweather_svn.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-efl/recipes-efl/efl/libeweather_svn.bb b/meta-efl/recipes-efl/efl/libeweather_svn.bb
index c498278..934efa1 100644
--- a/meta-efl/recipes-efl/efl/libeweather_svn.bb
+++ b/meta-efl/recipes-efl/efl/libeweather_svn.bb
@@ -1,5 +1,8 @@
 DESCRIPTION = "EFL-based weather widget library"
-LICENSE = "LGPL"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
+                    file://COPYING-PLAIN;md5=c910b645eda0005ccec46f75203dc96e"
+
 DEPENDS = "ecore edje"
 PV = "0.0.0+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
-- 
1.8.0

[PATCH 27/58] epeg: add LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/efl/epeg_svn.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-efl/recipes-efl/efl/epeg_svn.bb b/meta-efl/recipes-efl/efl/epeg_svn.bb
index fc2a896..41152ff 100644
--- a/meta-efl/recipes-efl/efl/epeg_svn.bb
+++ b/meta-efl/recipes-efl/efl/epeg_svn.bb
@@ -1,5 +1,8 @@
 DESCRIPTION = "Epeg is a small library for handling thumbnails."
 LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 \
+                    file://COPYING-PLAIN;md5=f59cacc08235a546b0c34a5422133035"
+
 DEPENDS = "jpeg"
 PV = "0.9.0+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
-- 
1.8.0

[PATCH 28/58] xorg-sgml-doctools: add LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb b/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
index 55f4bac..502723c 100644
--- a/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
+++ b/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
@@ -2,6 +2,8 @@ require xorg-doc-common.inc
 PE = "1"
 PR = "${INC_PR}.0"
 
+LIC_FILES_CHKSUM = "file://COPYING;md5=c8c6c808cd3c797a07b24e443af1c449"
+
 SRC_URI[md5sum] = "2588efb3f49f7fc6ecf41ce42e0b2e5e"
 SRC_URI[sha256sum] = "84fd94e5c50556e6f77501485f8a48724cf3c95c6d58480bc280258ba14580c8"
 
-- 
1.8.0

[PATCH 29/58] engrave: add LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/efl/engrave_svn.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-efl/recipes-efl/efl/engrave_svn.bb b/meta-efl/recipes-efl/efl/engrave_svn.bb
index 2ebb0a1..f0f5d4f 100644
--- a/meta-efl/recipes-efl/efl/engrave_svn.bb
+++ b/meta-efl/recipes-efl/efl/engrave_svn.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "Engrave is an Edje Editing Library"
 LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=edf2d968b9eb026bfa82cccbd0e6f9f5"
 # also requires yacc and lex on host
 DEPENDS = "evas ecore"
 PV = "0.0.0+svnr${SRCPV}"
-- 
1.8.0

[PATCH 30/58] edb: add LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/efl/edb_svn.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-efl/recipes-efl/efl/edb_svn.bb b/meta-efl/recipes-efl/efl/edb_svn.bb
index 9963563..aade344 100644
--- a/meta-efl/recipes-efl/efl/edb_svn.bb
+++ b/meta-efl/recipes-efl/efl/edb_svn.bb
@@ -1,5 +1,8 @@
 DESCRIPTION = "Edb is the Enlightenment database library"
 LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d8a7c08df3bc3280208b959be7215c25 \
+                    file://COPYING-PLAIN;md5=f59cacc08235a546b0c34a5422133035"
+
 DEPENDS = "zlib"
 PV = "1.0.5.050+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
-- 
1.8.0

[PATCH 31/58] gnome-terminal: add LICENSE version and LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb b/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
index ac4cc00..a177797 100644
--- a/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
+++ b/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "GNOME Terminal"
-LICENSE = "GPL"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5b51eba4ba4cafe64073227530c061ed"
 DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte"
 PR = "r2"
 
-- 
1.8.0

[PATCH 32/58] notification: remove recipe, notification module is now part of e-wm

[Martin Jansa]

* merged to e in r64475

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/notification_svn.bb | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/e17/notification_svn.bb

diff --git a/meta-efl/recipes-efl/e17/notification_svn.bb b/meta-efl/recipes-efl/e17/notification_svn.bb
deleted file mode 100644
index 1f4567a..0000000
--- a/meta-efl/recipes-efl/e17/notification_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-LICENSE = "MIT"
-PV = "0.2.0+svnr${SRCPV}"
-PR = "${INC_PR}.0"
-
-require e-module.inc
-
-do_configure_prepend() {
-    sed -i -e /po/d configure.ac
-    sed -i -e s:\ po::g Makefile.am
-}
-
-
-
-- 
1.8.0

[PATCH 33/58] waker: remove recipe, source was removed in r70549

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/waker_svn.bb | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/e17/waker_svn.bb

diff --git a/meta-efl/recipes-efl/e17/waker_svn.bb b/meta-efl/recipes-efl/e17/waker_svn.bb
deleted file mode 100644
index 1d6d846..0000000
--- a/meta-efl/recipes-efl/e17/waker_svn.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "An EFL base at/alarm wakeup daemon"
-LICENSE = "LGPL"
-DEPENDS = "ecore edbus"
-SECTION = "console"
-PV = "0.0.0+svnr${SRCPV}"
-SRCREV = "${EFL_SRCREV}"
-
-inherit efl
-
-SRC_URI = "\
-  ${E_SVN}/trunk/TMP/st;module=${SRCNAME};protocol=http \
-  file://0001-waker-remove-old-ecore_string_init-and-ecore_string_.patch \
-"
-S = "${WORKDIR}/${SRCNAME}"
-
-FILES_${PN} += "${bindir}/* ${libdir}/lib*.so.*"
-FILES_${PN} += "/etc/X11/Xsession.d/80x-enlightenment-wakerd"
-- 
1.8.0

[PATCH 34/58] elementary-alarm: remove recipe, source was removed in r70549

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/elementary-alarm_svn.bb | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/e17/elementary-alarm_svn.bb

diff --git a/meta-efl/recipes-efl/e17/elementary-alarm_svn.bb b/meta-efl/recipes-efl/e17/elementary-alarm_svn.bb
deleted file mode 100644
index 6c44109..0000000
--- a/meta-efl/recipes-efl/e17/elementary-alarm_svn.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "An Elementary based Alarm app"
-LICENSE = "GPL"
-DEPENDS = "elementary"
-SECTION = "x11"
-PV = "0.0.0+svnr${SRCPV}"
-SRCREV = "${EFL_SRCREV}"
-
-inherit e
-SRC_URI = "${E_SVN}/trunk/TMP/st;module=${SRCNAME};protocol=http;scmdata=keep"
-S = "${WORKDIR}/${SRCNAME}"
-
-RDEPENDS_${PN} = "waker"
-FILES_${PN} += "${bindir}/*"
-FILES_${PN} += "${datadir}/${PN}"
-FILES_${PN} += "${datadir}/icons/*"
-FILES_${PN} += "${datadir}/applications/*"
-FILES_${PN} += "${datadir}/${PN}/sounds/*"
-- 
1.8.0

[PATCH 35/58] epdfview: move from meta-efl to meta-gnome

[Martin Jansa]

* as suggested in http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-November/042449.html

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-apps/epdfview}/epdfview/browser_command.patch                 | 0
 .../efl => meta-gnome/recipes-apps/epdfview}/epdfview/fix-format.patch    | 0
 .../recipes-apps/epdfview}/epdfview/glib-single-include.patch             | 0
 .../efl => meta-gnome/recipes-apps/epdfview}/epdfview/swap-colors.patch   | 0
 .../efl => meta-gnome/recipes-apps/epdfview}/epdfview_0.1.8.bb            | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename {meta-efl/recipes-efl/efl => meta-gnome/recipes-apps/epdfview}/epdfview/browser_command.patch (100%)
 rename {meta-efl/recipes-efl/efl => meta-gnome/recipes-apps/epdfview}/epdfview/fix-format.patch (100%)
 rename {meta-efl/recipes-efl/efl => meta-gnome/recipes-apps/epdfview}/epdfview/glib-single-include.patch (100%)
 rename {meta-efl/recipes-efl/efl => meta-gnome/recipes-apps/epdfview}/epdfview/swap-colors.patch (100%)
 rename {meta-efl/recipes-efl/efl => meta-gnome/recipes-apps/epdfview}/epdfview_0.1.8.bb (100%)

diff --git a/meta-efl/recipes-efl/efl/epdfview/browser_command.patch b/meta-gnome/recipes-apps/epdfview/epdfview/browser_command.patch
similarity index 100%
rename from meta-efl/recipes-efl/efl/epdfview/browser_command.patch
rename to meta-gnome/recipes-apps/epdfview/epdfview/browser_command.patch
diff --git a/meta-efl/recipes-efl/efl/epdfview/fix-format.patch b/meta-gnome/recipes-apps/epdfview/epdfview/fix-format.patch
similarity index 100%
rename from meta-efl/recipes-efl/efl/epdfview/fix-format.patch
rename to meta-gnome/recipes-apps/epdfview/epdfview/fix-format.patch
diff --git a/meta-efl/recipes-efl/efl/epdfview/glib-single-include.patch b/meta-gnome/recipes-apps/epdfview/epdfview/glib-single-include.patch
similarity index 100%
rename from meta-efl/recipes-efl/efl/epdfview/glib-single-include.patch
rename to meta-gnome/recipes-apps/epdfview/epdfview/glib-single-include.patch
diff --git a/meta-efl/recipes-efl/efl/epdfview/swap-colors.patch b/meta-gnome/recipes-apps/epdfview/epdfview/swap-colors.patch
similarity index 100%
rename from meta-efl/recipes-efl/efl/epdfview/swap-colors.patch
rename to meta-gnome/recipes-apps/epdfview/epdfview/swap-colors.patch
diff --git a/meta-efl/recipes-efl/efl/epdfview_0.1.8.bb b/meta-gnome/recipes-apps/epdfview/epdfview_0.1.8.bb
similarity index 100%
rename from meta-efl/recipes-efl/efl/epdfview_0.1.8.bb
rename to meta-gnome/recipes-apps/epdfview/epdfview_0.1.8.bb
-- 
1.8.0

[PATCH 36/58] gnome-vfs: fix QA warnings in packaging

[Martin Jansa]

gnome-vfs-2.24.4: gnome-vfs: Files/directories were installed but not shipped
  /usr/lib/gnome-vfs-2.0/modules/libcomputer.la
  /usr/lib/gnome-vfs-2.0/modules/libvfs-test.a
  /usr/lib/gnome-vfs-2.0/modules/libcomputer.a
  /usr/lib/gnome-vfs-2.0/modules/libdns-sd.la
  /usr/lib/gnome-vfs-2.0/modules/libgzip.la
  /usr/lib/gnome-vfs-2.0/modules/libtar.la
  /usr/lib/gnome-vfs-2.0/modules/libsftp.la
  /usr/lib/gnome-vfs-2.0/modules/libnntp.a
  /usr/lib/gnome-vfs-2.0/modules/libhttp.la
  /usr/lib/gnome-vfs-2.0/modules/libsftp.a
  /usr/lib/gnome-vfs-2.0/modules/libftp.la
  /usr/lib/gnome-vfs-2.0/modules/libnetwork.a
  /usr/lib/gnome-vfs-2.0/modules/libbzip2.a
  /usr/lib/gnome-vfs-2.0/modules/libgzip.a
  /usr/lib/gnome-vfs-2.0/modules/libnetwork.la
  /usr/lib/gnome-vfs-2.0/modules/libfile.la
  /usr/lib/gnome-vfs-2.0/modules/libvfs-test.la
  /usr/lib/gnome-vfs-2.0/modules/libnntp.la
  /usr/lib/gnome-vfs-2.0/modules/libfile.a
  /usr/lib/gnome-vfs-2.0/modules/libftp.a
  /usr/lib/gnome-vfs-2.0/modules/libhttp.a
  /usr/lib/gnome-vfs-2.0/modules/libbzip2.la
  /usr/lib/gnome-vfs-2.0/modules/libdns-sd.a
  /usr/lib/gnome-vfs-2.0/modules/libtar.a

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
index 531a2d7..62d63ae 100644
--- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
+++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
@@ -13,7 +13,7 @@ DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib"
 RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info"
 # Some legacy packages will require gnome-mime-data to be installed, but use of
 # it is deprecated.
-PR = "r1"
+PR = "r2"
 
 inherit gnome
 
@@ -35,10 +35,11 @@ EXTRA_OECONF = " --disable-hal \
                  gvfs_cv_HAVE_POSIX_ACLS=no \
 		 "
 
-FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services"
-FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug"
-FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include"
-FILES_${PN}-doc += " ${datadir}/gtk-doc"
+FILES_${PN} += "${libdir}/vfs ${datadir}/dbus-1/services"
+FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug"
+FILES_${PN}-dev += "${libdir}/gnome-vfs-2.0/include/* ${libdir}/gnome-vfs-2.0/modules/*.la"
+FILES_${PN}-staticdev += "${libdir}/gnome-vfs-2.0/modules/*.a"
+FILES_${PN}-doc += "${datadir}/gtk-doc"
 
 PACKAGES_DYNAMIC += "^gnome-vfs-plugin-.*"
 
-- 
1.8.0

[PATCH 37/58] fuse: remove /dev/fuse in do_install_append

[Martin Jansa]

* it's not packaged and created on target dynamically
* fixes QA:
  fuse-2.9.2: fuse: Files/directories were installed but not shipped
    /dev
    /dev/fuse

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/fuse/fuse_2.9.2.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-oe/recipes-support/fuse/fuse_2.9.2.bb b/meta-oe/recipes-support/fuse/fuse_2.9.2.bb
index bd0095b..23b9447 100644
--- a/meta-oe/recipes-support/fuse/fuse_2.9.2.bb
+++ b/meta-oe/recipes-support/fuse/fuse_2.9.2.bb
@@ -5,6 +5,8 @@ LICENSE = "GPLv2 & LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 
+PR = "r1"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz \
            file://gold-unversioned-symbol.patch \
           "
@@ -31,3 +33,7 @@ FILES_fuse-utils = "${bindir} ${base_sbindir}"
 FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug"
 DEBIAN_NOAUTONAME_fuse-utils = "1"
 DEBIAN_NOAUTONAME_fuse-utils-dbg = "1"
+
+do_install_append() {
+  rm -rf ${D}${base_prefix}/dev
+}
-- 
1.8.0

[PATCH 38/58] libbonobo: fix QA warnings in packaging

[Martin Jansa]

* fixes:
libbonobo-2.24.3: non -staticdev package contains static .a library: libbonobo-dev path '/work/armv7a-vfp-neon-oe-linux-gnueabi/libbonobo/2.24.3-r0/packages-split/libbonobo-dev/usr/lib/orbit-2.0/Bonobo_module.a'
libbonobo-2.24.3: non -staticdev package contains static .a library: libbonobo-dev path '/work/armv7a-vfp-neon-oe-linux-gnueabi/libbonobo/2.24.3-r0/packages-split/libbonobo-dev/usr/lib/bonobo/monikers/libmoniker_std_2.a'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/bonobo/libbonobo.inc       | 4 ++--
 meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo.inc b/meta-gnome/recipes-gnome/bonobo/libbonobo.inc
index 91ce737..d9a8618 100644
--- a/meta-gnome/recipes-gnome/bonobo/libbonobo.inc
+++ b/meta-gnome/recipes-gnome/bonobo/libbonobo.inc
@@ -16,8 +16,8 @@ ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
 FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug \
 	${libdir}/bonobo-2.0/samples/.debug ${libdir}/orbit-2.0/.debug"
-FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
-	${libdir}/bonobo-2.0/samples"
+FILES_${PN}-dev += "${libdir}/orbit-2.0/*.la ${libdir}/bonobo/monikers/*.la ${libdir}/bonobo-2.0/samples"
+FILES_${PN}-staticdev += "${libdir}/orbit-2.0/*.a ${libdir}/bonobo/monikers/*.a"
 
 LEAD_SONAME = "libbonobo-2.so"
 
diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb
index c878286..253b46a 100644
--- a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb
+++ b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb
@@ -1,3 +1,5 @@
 require libbonobo.inc
+PR = "r1"
+
 SRC_URI[archive.md5sum] = "b217cef6a187505290c66c5bf8225d38"
 SRC_URI[archive.sha256sum] = "5310957fa90691689c0557218b8833f681666cae160bd84e1f2c2705189a4ebe"
-- 
1.8.0

[PATCH 39/58] gnome/libgnomecanvas: delete, there is newer version in libgnome/libgnomecanvas

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb

diff --git a/meta-gnome/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb b/meta-gnome/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb
deleted file mode 100644
index 9562956..0000000
--- a/meta-gnome/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome/libs"
-DESCRIPTION = "A powerful object-oriented display"
-PR = "r2"
-
-inherit gnome
-
-DEPENDS = "gtk+ libglade libart-lgpl"
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
-FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/"
-FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas.*a"
-- 
1.8.0

[PATCH 40/58] libgnomecanvas: fix QA warnings from packaging

[Martin Jansa]

* fixes:
libgnomecanvas-2.26.0: non -staticdev package contains static .a library: libgnomecanvas-dev path '/work/armv7a-vfp-neon-oe-linux-gnueabi/libgnomecanvas/2.26.0-r0/packages-split/libgnomecanvas-dev/usr/lib/libglade/2.0/libcanvas.a'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.26.0.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.26.0.bb b/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.26.0.bb
index 79e9e8a..efb88ff 100644
--- a/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.26.0.bb
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.26.0.bb
@@ -5,13 +5,16 @@ SECTION = "x11/gnome/libs"
 
 inherit gnome
 
+PR = "r1"
+
 DEPENDS = "gtk+ libglade libart-lgpl xineramaproto"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
 FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
 FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/"
-FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas.*a"
+FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas*.la"
+FILES_${PN}-staticdev += "${libdir}/libglade/*/libcanvas*.a"
 
 do_configure_prepend() {
     sed -i -e s:docs::g ${S}/Makefile.am
-- 
1.8.0

[PATCH 41/58] libgnome: fix QA warnings from packaging

[Martin Jansa]

* fixes:
libgnome-2.32.1: non -staticdev package contains static .a library: libgnome-dev path '/work/armv7a-vfp-neon-oe-linux-gnueabi/libgnome/2.32.1-r0/packages-split/libgnome-dev/usr/lib/bonobo/monikers/libmoniker_extra_2.a'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb b/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb
index 4acbfa7..0c0a0df 100644
--- a/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb
@@ -5,6 +5,8 @@ SECTION = "x11/gnome/libs"
 
 inherit gnome lib_package
 
+PR = "r1"
+
 SRC_URI[archive.md5sum] = "a4345e6087ae6195d65a4674ffdca559"
 SRC_URI[archive.sha256sum] = "b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4"
 
@@ -20,6 +22,6 @@ do_configure_prepend() {
 
 FILES_${PN} += "${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so \
                 ${datadir}/gnome-background-properties ${datadir}/pixmaps"
-FILES_${PN}-dev += "${libdir}/bonobo/monikers/*a"
+FILES_${PN}-dev += "${libdir}/bonobo/monikers/*.la"
+FILES_${PN}-staticdev += "${libdir}/bonobo/monikers/*.a"
 FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug"
-
-- 
1.8.0

[PATCH 42/58] libbonoboui: fix QA warnings from packaging

[Martin Jansa]

* fixes:
libbonoboui-2.24.3: non -staticdev package contains static .a library: libbonoboui-dev path '/work/armv7a-vfp-neon-oe-linux-gnueabi/libbonoboui/2.24.3-r1/packages-split/libbonoboui-dev/usr/lib/libglade/2.0/libbonobo.a'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.3.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.3.bb b/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.3.bb
index 328183f..fbbe806 100644
--- a/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.3.bb
+++ b/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.3.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
 inherit gnome pkgconfig gtk-doc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[archive.md5sum] = "3a754b1df0a4d5fd4836a05020a0bb4a"
 SRC_URI[archive.sha256sum] = "0be51ee3069a2ef21d98561ee28036dd263ac08b401776fe9164e084825ffd84"
@@ -13,7 +13,8 @@ SRC_URI[archive.sha256sum] = "0be51ee3069a2ef21d98561ee28036dd263ac08b401776fe91
 DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gconf libxml2 libglade"
 
 FILES_${PN} += "${libdir}/libglade/2.0/*.so"
-FILES_${PN}-dev += "${libdir}/libglade/2.0/* ${datadir}/gnome-2.0/ui \
+FILES_${PN}-dev += "${libdir}/libglade/2.0/*.la ${datadir}/gnome-2.0/ui \
                     ${libdir}/bonobo-2.0/samples"
+FILES_${PN}-staticdev += "${libdir}/libglade/2.0/*.a"
 FILES_${PN}-dbg += "${libdir}/bonobo-2.0/samples/.debug \
                     ${libdir}/libglade/2.0/.debug"
-- 
1.8.0

[PATCH 43/58] libgnomeui: fix QA warnings from packaging

[Martin Jansa]

* fixes:
libgnomeui-2.24.3: non -staticdev package contains static .a library:
libgnomeui-dev path
'/work/armv7a-vfp-neon-oe-linux-gnueabi/libgnomeui/2.24.3-r0/packages-split/libgnomeui-dev/usr/lib/libglade/2.0/libgnome.a'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/libgnome/libgnomeui.inc       | 3 ++-
 meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc b/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc
index 5d0053b..bf9ae69 100644
--- a/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc
@@ -10,7 +10,8 @@ inherit gnome
 FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
                 ${libdir}/libglade/*/lib*.so \
                 ${datadir}/pixmaps/gnome-about-logo.png"
-FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la"
+FILES_${PN}-staticdev += "${libdir}/libglade/*/*.a"
 FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
 
 SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch"
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb b/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb
index 56f2840..597c2ff 100644
--- a/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb
@@ -1,4 +1,6 @@
 require libgnomeui.inc
 
+PR = "r1"
+
 SRC_URI[archive.md5sum] = "ceab6f4370581d1a03c09f15cc103099"
 SRC_URI[archive.sha256sum] = "04c81f3bb5a337cdf3ed1230916f82d29857ee95eb884f58dd2f5c6860efe803"
-- 
1.8.0

[PATCH 44/58] pcsc-lite: add bbappend in meta-systemd

[Martin Jansa]

* fixes packaging QA warning, when systemd is autodetected:
pcsc-lite-1.8.6: pcsc-lite: Files/directories were installed but not shipped
  /lib
  /lib/systemd
  /lib/systemd/system
  /lib/systemd/system/pcscd.service
  /lib/systemd/system/pcscd.socket

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend      | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend

diff --git a/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend b/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend
new file mode 100644
index 0000000..b8150b7
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend
@@ -0,0 +1,6 @@
+inherit systemd
+
+PRINC := "${@int(PRINC) + 1}"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "pcscd.socket"
-- 
1.8.0

[PATCH 45/58] entrance: rename xserver-nodm.service to entrance.service so it does not conflict with xserver-nodm-init in sysroot

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../efl/entrance/{xserver-nodm.service => entrance.service}           | 0
 meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend           | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta-systemd/meta-efl/recipes-efl/efl/entrance/{xserver-nodm.service => entrance.service} (100%)

diff --git a/meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service b/meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service
similarity index 100%
rename from meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service
rename to meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service
diff --git a/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend b/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
index ac0d2bc..df96e34 100644
--- a/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
+++ b/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
@@ -4,10 +4,10 @@ PRINC := "${@int(PRINC) + 1}"
 
 inherit systemd
 
-SRC_URI += "file://xserver-nodm.service"
+SRC_URI += "file://entrance.service"
 
 SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "xserver-nodm.service"
+SYSTEMD_SERVICE = "entrance.service"
 
 RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd"
 RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd"
-- 
1.8.0

[PATCH 46/58] systemd: add PACKAGES_DYNAMIC

[Martin Jansa]

* some packages can RDEPEND on e.g. libudev

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-systemd/recipes-core/systemd/systemd_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-systemd/recipes-core/systemd/systemd_git.bb b/meta-systemd/recipes-core/systemd/systemd_git.bb
index bfd1b30..51d3371 100644
--- a/meta-systemd/recipes-core/systemd/systemd_git.bb
+++ b/meta-systemd/recipes-core/systemd/systemd_git.bb
@@ -105,6 +105,7 @@ python populate_packages_prepend (){
     systemdlibdir = d.getVar("base_libdir", True)
     do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
 }
+PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*"
 
 PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze"
 
-- 
1.8.0

[PATCH 47/58] exalt-client: add LIC_FILES_CHKSUM

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/exalt-client_svn.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-efl/recipes-efl/e17/exalt-client_svn.bb b/meta-efl/recipes-efl/e17/exalt-client_svn.bb
index 4938900..852ed04 100644
--- a/meta-efl/recipes-efl/e17/exalt-client_svn.bb
+++ b/meta-efl/recipes-efl/e17/exalt-client_svn.bb
@@ -1,4 +1,6 @@
-LICENSE = "LGPLv2"
+LICENSE = "LGPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+
 PV = "0.0.1+svnr${SRCPV}"
 
 require e-module.inc
-- 
1.8.0

[PATCH 48/58] systemd: reenable python and add python-systemd-journald

[Martin Jansa]

* we need inherit pythonnative to find right python-native

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-systemd/recipes-core/systemd/systemd_git.bb | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/meta-systemd/recipes-core/systemd/systemd_git.bb b/meta-systemd/recipes-core/systemd/systemd_git.bb
index 51d3371..341e85d 100644
--- a/meta-systemd/recipes-core/systemd/systemd_git.bb
+++ b/meta-systemd/recipes-core/systemd/systemd_git.bb
@@ -19,9 +19,15 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r10"
+PR = "r11"
 
-inherit useradd pkgconfig autotools perlnative
+# need to export these variables for python-config to work
+export BUILD_SYS
+export HOST_SYS
+export STAGING_INCDIR
+export STAGING_LIBDIR
+
+inherit useradd pkgconfig autotools perlnative pythonnative python-dir
 
 SRCREV = "4d92e078e9d7e9a9d346065ea5e4afbafbdadb48"
 SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \
@@ -67,7 +73,7 @@ EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
                  --disable-tcpwrap \
                  --enable-split-usr \
                  --disable-microhttpd \
-                 --without-python \
+                 --with-python \
                "
 
 # There's no docbook-xsl-native, so for the xsltproc check to false
@@ -107,7 +113,7 @@ python populate_packages_prepend (){
 }
 PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*"
 
-PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze"
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze python-${PN}-journal"
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "-r lock"
@@ -116,6 +122,9 @@ FILES_${PN}-analyze = "${bindir}/systemd-analyze"
 RDEPENDS_${PN}-analyze = "python-dbus"
 RRECOMMENDS_${PN}-analyze = "python-pycairo"
 
+FILES_python-${PN}-journal = "${PYTHON_SITEPACKAGES_DIR}/systemd/*.py* ${PYTHON_SITEPACKAGES_DIR}/systemd/*.so"
+RDEPENDS_python-${PN}-journal = "python-core"
+
 FILES_${PN}-initramfs = "/init"
 RDEPENDS_${PN}-initramfs = "${PN}"
 
@@ -168,9 +177,8 @@ FILES_${PN} = " ${base_bindir}/* \
                 ${base_libdir}/udev/rules.d/73-seat-late.rules \
                 ${base_libdir}/udev/rules.d/99-systemd.rules \
                "
-
-FILES_${PN}-dbg += "${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/"
-FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd"
+FILES_${PN}-dbg += "${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/ ${PYTHON_SITEPACKAGES_DIR}/systemd/.debug/"
+FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd ${PYTHON_SITEPACKAGES_DIR}/systemd/*.la"
 
 RDEPENDS_${PN} += "dbus-systemd udev-systemd"
 
-- 
1.8.0

[PATCH 49/58] xf86-input-void: fix SRC_URI checksums

[Martin Jansa]

* does someone have old xf86-input-void-1.4.0.tar.bz2 with old checksums to compare them?

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb
index ccd27f1..89c7806 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb
@@ -4,5 +4,5 @@ PR = "${INC_PR}.0"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=4be6a915bfbf111cd88706fc6a6f141b"
 
-SRC_URI[md5sum] = "3056bc7c57db8c5d56039648c0530c45"
-SRC_URI[sha256sum] = "aba69784ac83f5951af3e164312adb4b8b1c91a8f79ab35dc5165c534e14c674"
+SRC_URI[md5sum] = "93821f21e807260b05431c62437a8b32"
+SRC_URI[sha256sum] = "2ab95865252c64cc88050fa0089a74e063c357b71907bf9be7886047c4987505"
-- 
1.8.0

[PATCH 50/58] lightmediascaner: move .a files from PN-dev to PN-staticdev

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb b/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb
index 905f39e..8fdce18 100644
--- a/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb
+++ b/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 DEPENDS = "sqlite3 flac virtual/libiconv"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://git.profusion.mobi/cgit.cgi/lightmediascanner.git/snapshot/release_${PV}.tar.bz2 \
 "
@@ -27,6 +27,7 @@ PACKAGES =+ "${PN}-test"
 FILES_${PN}-test = "${bindir}/test-lms"
 
 FILES_${PN}-dbg += "${libdir}/${PN}/plugins/.debug"
+FILES_${PN}-staticdev += "${libdir}/${PN}/plugins/*.a"
 
 # otherwise fails with ERROR: could not add conversion charset 'UTF-16BE': Invalid argument
 RDEPENDS_${PN}-test_append_libc-glibc = " glibc-gconv-utf-16"
-- 
1.8.0

[PATCH 51/58] tangogps: fix doc instalation

[Martin Jansa]

* incorectly installs doc to /usr/doc and isn't picked by FILES_
tangogps-0.99.4: tangogps: Files/directories were installed but not shipped
  /usr/doc
  /usr/doc/tangogps
  /usr/doc/tangogps/INSTALL
  /usr/doc/tangogps/NEWS
  /usr/doc/tangogps/TODO
  /usr/doc/tangogps/README
  /usr/doc/tangogps/ChangeLog
  /usr/doc/tangogps/AUTHORS
  /usr/doc/tangogps/COPYING

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb b/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
index 1fb7633..546abbc 100644
--- a/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
+++ b/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
@@ -5,7 +5,7 @@ SECTION = "x11/applications"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 DEPENDS = "curl gtk+ sqlite3 libexif libsoup-2.4 bluez4"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.tangogps.org/downloads/${P}.tar.gz \
            file://remove.unused.header.patch \
@@ -17,3 +17,7 @@ SRC_URI[sha256sum] = "660fdf89ef3c379f2fc0c2a9d0c9d3bfa5345835786b72bf9f513ba9ec
 inherit autotools pkgconfig gconf
 
 RRECOMMENDS_${PN} = "gpsd"
+
+do_install_append() {
+	mv ${D}${prefix}/doc ${D}${datadir} || true
+}
-- 
1.8.0

[PATCH 52/58] lightmediascaner: move .a files from PN-dev to PN-staticdev

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb b/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
index 4b5a750..891b625 100644
--- a/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
+++ b/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 DEPENDS = "gtk+"
 LICENSE = "LGPL-2.0+"
 LIC_FILES_CHKSUM = "file://tap.c;beginline=1;endline=20;md5=71756eeb144e9eeb177c69aa672b1635"
-PR = "r3"
+PR = "r4"
 
 inherit autotools
 
@@ -23,5 +23,5 @@ GTKVER = "2.10.0"
 FILES_${PN} = "${sysconfdir} \
                ${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.so.*"
 FILES_${PN}-dbg += "${libdir}/gtk-2.0/${GTKVER}/modules/.debug"
-FILES_${PN}-dev += "${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.so \
-                    ${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.*a"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.so"
+FILES_${PN}-staticdev += "${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.*a"
-- 
1.8.0

[PATCH 53/58] gvim: fix unpackaged files QA warning

[Martin Jansa]

* there is a lot of stuff installed to /usr/share/vim, but gvim does not have this in FILES_PN

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/vim/gvim_7.2.446.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-oe/recipes-support/vim/gvim_7.2.446.bb b/meta-oe/recipes-support/vim/gvim_7.2.446.bb
index 94215b4..fbc763a 100644
--- a/meta-oe/recipes-support/vim/gvim_7.2.446.bb
+++ b/meta-oe/recipes-support/vim/gvim_7.2.446.bb
@@ -3,8 +3,12 @@ VIMX = "--with-x"
 
 require vim_${PV}.bb
 
+PR = "${INC_PR}.4"
+
 DEPENDS += "gtk+ xt"
 
+FILES_${PN} += "${datadir}/vim"
+
 EXTRA_OECONF += "--enable-gtk2-test"
 
 RREPLACES_${PN} = "vim vim-tiny"
-- 
1.8.0

[PATCH 54/58] libcanberra: package also gtk-3.0 if it gets built

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb b/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb
index 8b796ac..8a03c99 100644
--- a/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb
+++ b/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb
@@ -6,7 +6,7 @@ DEPENDS = "alsa-lib gstreamer gtk+ libtool libvorbis gconf"
 SECTION = "libs/multimedia"
 AUTHOR = "Lennart Poettering"
 HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra"
-PR = "r1"
+PR = "r2"
 
 inherit autotools vala
 
@@ -42,15 +42,19 @@ FILES_${PN}-gtk = "\
   ${bindir}/* \
   ${libdir}/libcanberra-gtk.so.* \
   ${libdir}/gtk-2.0/modules/* \
+  ${libdir}/gtk-3.0/modules/* \
   ${datadir}/gnome \
   ${datadir}/gdm \
 "
 
 FILES_${PN}-dev += "\
+  ${libdir}/gtk-2.0/modules/*.la \
+  ${libdir}/gtk-3.0/modules/*.la \
   ${libdir}/${P}/*.la \
 "
 
 FILES_${PN}-dbg += "\
   ${libdir}/gtk-2.0/modules/.debug \
+  ${libdir}/gtk-3.0/modules/.debug \
   ${libdir}/${P}/.debug \
 "
-- 
1.8.0

[PATCH 55/58] lua5.1: fix packaging QA warnings

[Martin Jansa]

* Fixes:
  lua5.1-5.1.4: lua5.1: Files/directories were installed but not shipped
    /usr/share/lua
    /usr/share/lua/5.1
    /usr/lib/lua
    /usr/lib/lua/5.1

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-devtools/lua/lua5.1_5.1.4.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/lua/lua5.1_5.1.4.bb b/meta-oe/recipes-devtools/lua/lua5.1_5.1.4.bb
index eca7755..0dc81db 100644
--- a/meta-oe/recipes-devtools/lua/lua5.1_5.1.4.bb
+++ b/meta-oe/recipes-devtools/lua/lua5.1_5.1.4.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=90c3badc6055c699194c4a7cea583296"
 HOMEPAGE = "http://www.lua.org/"
 
 DEPENDS += "readline"
-PR = "r10"
+PR = "r11"
 SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \
            file://bitwise_operators.patch \
            file://lua5.1.pc \
@@ -38,6 +38,10 @@ do_install () {
 		install
 	install -d ${D}${libdir}/pkgconfig
 	install -m 0644 ${WORKDIR}/lua5.1.pc ${D}${libdir}/pkgconfig/lua5.1.pc
+	rmdir ${D}${libdir}/lua/5.1
+	rmdir ${D}${libdir}/lua
+	rmdir ${D}${datadir}/lua/5.1
+	rmdir ${D}${datadir}/lua
 }
 BBCLASSEXTEND = "native"
 
-- 
1.8.0

[PATCH 56/58] util-linux: add meta-systemd bbappend for new version which installs uuidd.service and socket

[Martin Jansa]

* fixes:
util-linux-2.22.1: util-linux: Files/directories were installed but not shipped
  /lib/systemd
  /lib/systemd/system
  /lib/systemd/system/uuidd.socket
  /lib/systemd/system/uuidd.service

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../oe-core/recipes-core/util-linux/util-linux_2.22.1.bbappend    | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.1.bbappend

diff --git a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.1.bbappend b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.1.bbappend
new file mode 100644
index 0000000..809a554
--- /dev/null
+++ b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.1.bbappend
@@ -0,0 +1,8 @@
+inherit systemd
+
+PRINC := "${@int(PRINC) + 1}"
+
+SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
+EXTRA_OECONF += "--enable-socket-activation --with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "uuidd.socket"
-- 
1.8.0

[PATCH 57/58] eject: drop 2nd LICENSE field

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/eject/eject_2.1.5.bb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
index 0373d23..3f17fe8 100644
--- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
+++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
@@ -1,11 +1,8 @@
 DESCRIPTION = "Eject allows removable media (typically a CD-ROM, floppy disk, tape, or JAZ or ZIP disk) to be ejected under software control."
 HOMEPAGE = "http://eject.sourceforge.net/"
 LICENSE = "GPLv2"
-
-LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-
 inherit autotools gettext update-alternatives
 
 SRC_URI = "http://sources.openembedded.org/${P}.tar.gz"
-- 
1.8.0

[PATCH 58/58] eject: use new update-alternatives and add u-a for eject

[Martin Jansa]

* eject conflicts with util-linux now

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/eject/eject_2.1.5.bb | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
index 3f17fe8..3f2c90d 100644
--- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
+++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
@@ -12,12 +12,11 @@ SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e
 
 S = "${WORKDIR}/${PN}"
 
-do_install_append() {
-  mv ${D}/${bindir}/volname ${D}/${bindir}/volname.${PN}
-}
+PR = "r1"
 
-ALTERNATIVE_NAME = "volname"
-ALTERNATIVE_LINK = "${bindir}/volname"
-ALTERNATIVE_PATH = "${bindir}/volname.${PN}"
-ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_${PN} = "volname eject"
+ALTERNATIVE_LINK_NAME[volname] = "${bindir}/volname"
+ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
+ALTERNATIVE_PRIORITY[volname] = "100"
+ALTERNATIVE_PRIORITY[eject] = "100"
 
-- 
1.8.0

[PATCH 59/64] libcanberra: skip dev-so QA for PN-gtk

[Martin Jansa]

* fixes:
libcanberra-0.26: non -dev/-dbg/-nativesdk package contains symlink .so: libcanberra-gtk path '/work/armv7a-vfp-neon-oe-linux-gnueabi/libcanberra/0.26-r2/packages-split/libcanberra-gtk/usr/lib/gtk-3.0/modules/libcanberra-gtk-module.so'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb b/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb
index 8a03c99..5cf9a55 100644
--- a/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb
+++ b/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb
@@ -47,6 +47,9 @@ FILES_${PN}-gtk = "\
   ${datadir}/gdm \
 "
 
+# /usr/lib/gtk-3.0/modules/libcanberra-gtk-module.so > /usr/lib/gtk-3.0/modules/libcanberra-gtk3-module.so
+INSANE_SKIP_${PN}-gtk = "dev-so"
+
 FILES_${PN}-dev += "\
   ${libdir}/gtk-2.0/modules/*.la \
   ${libdir}/gtk-3.0/modules/*.la \
-- 
1.8.0

[PATCH 60/64] python-twisted: fix packaging QA warnings

[Martin Jansa]

* package topfiles and egg-info in PN-core
* fix find call (without braces it removes only last match -name ".h") and
  _epoll.c, _initgroups.c are left in image
* fixes
python-twisted-10.2.0: python-twisted: Files/directories were installed but not shipped
  /usr/lib/python2.7/site-packages/Twisted-10.2.0-py2.7.egg-info
  /usr/lib/python2.7/site-packages/Twisted-10.2.0-py2.7.egg-info/top_level.txt
  /usr/lib/python2.7/site-packages/Twisted-10.2.0-py2.7.egg-info/dependency_links.txt
  /usr/lib/python2.7/site-packages/Twisted-10.2.0-py2.7.egg-info/requires.txt
  /usr/lib/python2.7/site-packages/Twisted-10.2.0-py2.7.egg-info/SOURCES.txt
  /usr/lib/python2.7/site-packages/Twisted-10.2.0-py2.7.egg-info/PKG-INFO
  /usr/lib/python2.7/site-packages/Twisted-10.2.0-py2.7.egg-info/not-zip-safe
  /usr/lib/python2.7/site-packages/twisted/topfiles
  /usr/lib/python2.7/site-packages/twisted/python/_epoll.c
  /usr/lib/python2.7/site-packages/twisted/python/_initgroups.c
  /usr/lib/python2.7/site-packages/twisted/topfiles/NEWS
  /usr/lib/python2.7/site-packages/twisted/topfiles/README
  /usr/lib/python2.7/site-packages/twisted/topfiles/ChangeLog.Old
  /usr/lib/python2.7/site-packages/twisted/topfiles/CREDITS

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-devtools/python/python-twisted_10.2.0.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-devtools/python/python-twisted_10.2.0.bb b/meta-oe/recipes-devtools/python/python-twisted_10.2.0.bb
index 1455982..5215dd6 100644
--- a/meta-oe/recipes-devtools/python/python-twisted_10.2.0.bb
+++ b/meta-oe/recipes-devtools/python/python-twisted_10.2.0.bb
@@ -7,7 +7,7 @@ SECTION = "console/network"
 #twisted/topfiles/NEWS:655: - Relicensed: Now under the MIT license, rather than LGPL.
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c3159ad36d96a939fcd8f2c2c9b9d08a"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/10.2/Twisted-${PV}.tar.bz2 "
 SRC_URI[md5sum] = "73da62c793269eade8121da336b01ba5"
@@ -19,7 +19,7 @@ inherit setuptools
 
 do_install_append() {
     # remove some useless files before packaging
-    find ${D} -name "*.bat" -o -name "*.c" -o -name "*.h" -exec rm {} \;
+    find ${D} \( -name "*.bat" -o -name "*.c" -o -name "*.h" \) -exec rm -f {} \;
 }
 
 PACKAGES += "\
@@ -167,6 +167,8 @@ ${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py* \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.py* \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/*.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/topfiles \
+${libdir}/${PYTHON_DIR}/site-packages/Twisted*egg-info \
 "
 
 FILES_${PN}-lore = " \
-- 
1.8.0

[PATCH 61/64] e-base.bbclass: bump EFL_SRCREV for E17 alpha8

[Martin Jansa]

* changelog: http://enlightenment.org/p.php?p=news/show&l=en&news_id=69

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/classes/e-base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass
index 7b42e44..ab0063b 100644
--- a/meta-efl/classes/e-base.bbclass
+++ b/meta-efl/classes/e-base.bbclass
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 SRCVER ?= "${PV}"
 
-EFL_SRCREV ?= "79912"
+EFL_SRCREV ?= "80174"
 
 ARM_INSTRUCTION_SET = "arm"
 
-- 
1.8.0

[PATCH 62/64] enjoy: depend on edbus2

[Martin Jansa]

* ported to edbus2 in r80102

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/enjoy_svn.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-efl/recipes-efl/e17/enjoy_svn.bb b/meta-efl/recipes-efl/e17/enjoy_svn.bb
index cfeb001..8dff593 100644
--- a/meta-efl/recipes-efl/e17/enjoy_svn.bb
+++ b/meta-efl/recipes-efl/e17/enjoy_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Enjoy music player"
 LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
-DEPENDS = "evas ecore edje elementary emotion lightmediascanner"
+DEPENDS = "evas ecore edje elementary emotion lightmediascanner edbus2"
 SRCREV = "${EFL_SRCREV}"
 PV = "0.0+svnr${SRCPV}"
 
-- 
1.8.0

[PATCH 63/64] python-efl: fix do_configure_prepend to be reentrant

[Martin Jansa]

* without '=' it added ${STAGING_DIR_HOST} prefix again when
  do_configure was executed twice in the same WORKDIR
  causing issues when looking for header files in python-edje,
  python-ecore, python-elementary and python-emotion
  ./python-edje/configure.ac:CYTHON_EDJE_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "python-evas >= ${python_evas_version}"`
  ./python-ecore/configure.ac:CYTHON_ECORE_EVAS_INCLUDEDIR=""
  ./python-ecore/configure.ac:CYTHON_ECORE_EVAS_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "python-evas >= ${python_evas_version}"`
  ./python-elementary/configure.ac:CYTHON_ELEMENTARY_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "python-evas >= ${python_evas_version}"`
  ./python-emotion/configure.ac:CYTHON_EMOTION_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "python-evas >= ${python_evas_version}"`

* config.log diffs confirms duplicated ${STAGING_DIR_HOST} prefix
  < CYTHON_ECORE_EVAS_INCLUDEDIR='/OE/jansa-test/shr-core/tmp-eglibc/sysroots/tuna/usr/include/python-evas'
  ---
  > CYTHON_ECORE_EVAS_INCLUDEDIR='/OE/jansa-test/shr-core/tmp-eglibc/sysroots/tuna/OE/jansa-test/shr-core/tmp-eglibc/sysroots/tuna/usr/include/python-evas'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-devtools/python/python-efl.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-efl/recipes-devtools/python/python-efl.inc b/meta-efl/recipes-devtools/python/python-efl.inc
index 77d4114..2bcc434 100644
--- a/meta-efl/recipes-devtools/python/python-efl.inc
+++ b/meta-efl/recipes-devtools/python/python-efl.inc
@@ -6,7 +6,7 @@ AUTHOR = "Gustavo Sverzut Barbieri <barbieri@gmail.com>"
 # the extension modules.
 DEPENDS = "python-cython-native python-pyrex-native python-numeric eina"
 RDEPENDS_${PN} += "python-lang"
-INC_PR = "r0"
+INC_PR = "r1"
 
 # necessary to let the call for python-config succeed
 export BUILD_SYS
@@ -24,7 +24,7 @@ S = "${WORKDIR}/${SRCNAME}-${SRCVER}"
 
 do_configure_prepend() {
     # prefix CYTHON_.*_INCLUDEDIR with path to STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly
-    sed -i "s#\`\$PKG_CONFIG --variable=includedir \"python-evas#${STAGING_DIR_HOST}\`\$PKG_CONFIG --variable=includedir \"python-evas#g" ${S}/configure.ac
+    sed -i "s#=\`\$PKG_CONFIG --variable=includedir \"python-evas#=${STAGING_DIR_HOST}\`\$PKG_CONFIG --variable=includedir \"python-evas#g" ${S}/configure.ac
 }
 
 do_install_append() {
-- 
1.8.0

[PATCH 64/64] maliit-plugins: Don't build the documentation as it requires Doxygen

[Martin Jansa]

From: Samuel Stirtzel <s.stirtzel@googlemail.com>

Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/maliit/maliit-plugins_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
index 2fb52c7..7a1a430 100644
--- a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
+++ b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
@@ -18,6 +18,7 @@ PV = "0.92.3+git${SRCPV}"
 EXTRA_QMAKEVARS_PRE = "\
     PREFIX=${prefix} \
     LIBDIR=${libdir} \
+    CONFIG+=nodoc \
     "
 
 FILES_${PN} += "\
-- 
1.8.0

[PATCH 65/77] samba: remove empty /sbin

[Martin Jansa]

* fixes:
samba-3.6.8: samba: Files/directories were installed but not shipped
  /sbin

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-connectivity/samba/samba.inc      | 1 +
 meta-oe/recipes-connectivity/samba/samba_3.6.8.bb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
index faa2be0..d39a84a 100644
--- a/meta-oe/recipes-connectivity/samba/samba.inc
+++ b/meta-oe/recipes-connectivity/samba/samba.inc
@@ -88,6 +88,7 @@ do_install_append() {
         install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_winbind.so ${D}${libdir}/libnss_winbind.so.2
         install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_wins.so ${D}${libdir}/libnss_wins.so.2
 
+	rmdir ${D}${base_sbindir}
 }
 
 
diff --git a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
index 7c54dae..7985199 100644
--- a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
+++ b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
@@ -3,7 +3,7 @@ require samba-basic.inc
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "\
     file://config-h.patch \
-- 
1.8.0

[PATCH 66/77] gpm: include /usr/share/emacs/site-lisp in PN

[Martin Jansa]

* fixes:
gpm-1.99.7: gpm: Files/directories were installed but not shipped
  /usr/share
  /usr/share/emacs
  /usr/share/emacs/site-lisp

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/gpm/gpm_1.99.7.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
index bd42de3..38cd2c3 100644
--- a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
+++ b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
@@ -5,6 +5,8 @@ SECTION = "console/utils"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://gpm2/core/main.c;endline=19;md5=66d3c205c4e7ee5704b2ee351dfed72f"
 
+PR = "r1"
+
 DEPENDS = "ncurses"
 
 SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \
@@ -41,3 +43,4 @@ do_install () {
 SRC_URI[md5sum] = "9fdddf5f53cb11d40bb2bb671d3ac544"
 SRC_URI[sha256sum] = "6071378b24494e36ca3ef6377606e7e565040413c86704753a162d2180af32ee"
 
+FILES_${PN} += "${datadir}/emacs"
-- 
1.8.0

[PATCH 67/77] desktop-file-utils: don't build /usr/share/emacs/site-lisp/desktop-entry-mode.el

[Martin Jansa]

* fixes:
desktop-file-utils-0.18: desktop-file-utils: Files/directories were installed but not shipped
  /usr/share/emacs
  /usr/share/emacs/site-lisp
  /usr/share/emacs/site-lisp/desktop-entry-mode.el
  /usr/share/emacs/site-lisp/desktop-entry-mode.elc
  when emacs is available

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-gnome/desktop-file-utils/desktop-file-utils_0.18.bb       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-gnome/recipes-gnome/desktop-file-utils/desktop-file-utils_0.18.bb b/meta-gnome/recipes-gnome/desktop-file-utils/desktop-file-utils_0.18.bb
index 14af764..ddd388c 100644
--- a/meta-gnome/recipes-gnome/desktop-file-utils/desktop-file-utils_0.18.bb
+++ b/meta-gnome/recipes-gnome/desktop-file-utils/desktop-file-utils_0.18.bb
@@ -5,10 +5,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = "glib-2.0"
 
+PR = "r1"
+
 SRC_URI = "http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.bz2"
 SRC_URI[md5sum] = "d966b743eb394650f98d5dd56b9aece1"
 SRC_URI[sha256sum] = "d9449956c1c8caa75281a3322b2bb433db42610942f0ceeaa65ccd9636c04231"
 
 inherit autotools
 
+CACHED_CONFIGUREVARS += "ac_cv_prog_EMACS=no"
+
 BBCLASSEXTEND = "native"
-- 
1.8.0

[PATCH 68/77] systemd: add target python to depends

[Martin Jansa]

* pythonnative adds only python-native to DEPENDS, but we need target python for working python-config
checking for python-config... /OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/python-native/python-config
Traceback (most recent call last):
  File "/OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/python-native/python-config", line 24, in <module>
    pyver = sysconfig.get_config_var('VERSION')
  File "/OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/python2.7/distutils/sysconfig.py", line 602, in get_config_var
    return get_config_vars().get(name)
  File "/OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/python2.7/distutils/sysconfig.py", line 518, in get_config_vars
    func()
  File "/OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/python2.7/distutils/sysconfig.py", line 416, in _init_posix
    raise DistutilsPlatformError(my_msg)
distutils.errors.DistutilsPlatformError: invalid Python installation: unable to open /OE/jansa-test/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/config/Makefile (No such file or directory)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-systemd/recipes-core/systemd/systemd_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-systemd/recipes-core/systemd/systemd_git.bb b/meta-systemd/recipes-core/systemd/systemd_git.bb
index 341e85d..9005abd 100644
--- a/meta-systemd/recipes-core/systemd/systemd_git.bb
+++ b/meta-systemd/recipes-core/systemd/systemd_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
 
 PROVIDES = "udev"
 
-DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers usbutils glib-2.0 libgcrypt"
+DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers usbutils glib-2.0 libgcrypt python"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
@@ -19,7 +19,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r11"
+PR = "r12"
 
 # need to export these variables for python-config to work
 export BUILD_SYS
-- 
1.8.0

[PATCH 69/77] vim-tiny: package /usr/share/vim in PN-data

[Martin Jansa]

* keep it separate from PN so PN is tiny
* fixes warning about a lot of unpackaged files

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb b/meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb
index 25a9205..d29b801 100644
--- a/meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb
+++ b/meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb
@@ -2,4 +2,10 @@ VIMFEATURES = "tiny"
 
 require vim_${PV}.bb
 
+PR = "${INC_PR}.4"
+
 RCONFLICTS_${PN} = "gvim vim"
+
+PACKAGES =+ "${PN}-data"
+
+FILES_${PN}-data = "${datadir}/vim"
-- 
1.8.0

[PATCH 70/77] efl.bbclass: fix FILES for PN-staticdev

[Martin Jansa]

* ${libdir}/${BPN}/*.a is there by default and it's PN-staticdev not PN-static

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/classes/efl.bbclass | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta-efl/classes/efl.bbclass b/meta-efl/classes/efl.bbclass
index bc2f640..bdb5834 100644
--- a/meta-efl/classes/efl.bbclass
+++ b/meta-efl/classes/efl.bbclass
@@ -49,9 +49,7 @@ FILES_${PN}-dev   += "${bindir}/${PN}-config \
                       ${libdir}/edje/modules/${PN}/*/module.la \
 "
 
-FILES_${PN}-static += "${libdir}/${PN}/*.a \
-                       ${libdir}/${PN}/*/*.a \
-"
+FILES_${PN}-staticdev += "${libdir}/${BPN}/*/*.a"
 
 FILES_${PN}-dbg +=   "${libdir}/${PN}/.debug \
                       ${libdir}/${PN}/*/.debug \
-- 
1.8.0

[PATCH 71/77] exalt-client: fix FILES for PN-staticdev

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/exalt-client_svn.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-efl/recipes-efl/e17/exalt-client_svn.bb b/meta-efl/recipes-efl/e17/exalt-client_svn.bb
index 852ed04..b8c204d 100644
--- a/meta-efl/recipes-efl/e17/exalt-client_svn.bb
+++ b/meta-efl/recipes-efl/e17/exalt-client_svn.bb
@@ -18,7 +18,7 @@ FILES_${PN} += "${libdir}/enlightenment/modules/*/*.desktop \
                 ${libdir}/enlightenment/modules/*/*.edj \
                 ${libdir}/enlightenment/modules/*/*/*.so"
 
-FILES_${PN}-static += "${libdir}/enlightenment/modules/*/*/*.a"
+FILES_${PN}-staticdev += "${libdir}/enlightenment/modules/*/*/*.a"
 FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.la"
 FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug"
  
-- 
1.8.0

[PATCH 72/77] gnome-disk-utility: disable failing docs generation

[Martin Jansa]

* xmlto does not work correctly
  https://bugzilla.yoctoproject.org/show_bug.cgi?id=2416

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
index dab938f..b7be956 100644
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9115d11797a5e6b746b4e9b90194564"
 
 DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 libatasmart nautilus"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnome
 SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d"
@@ -17,7 +17,7 @@ SRC_URI += "\
      file://sysrooted-pkg-config.patch \
      "
 
-EXTRA_OECONF += "--disable-scrollkeeper"
+EXTRA_OECONF += "--disable-scrollkeeper --disable-docbook-docs"
 
 PACKAGES =+ "${PN}-nautilus-extension"
 FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so"
-- 
1.8.0

[PATCH 73/77] gnome-disk-utility: fix unpackaged files

[Martin Jansa]

* WARNING: QA Issue: gnome-disk-utility: Files/directories were installed but not shipped
  /usr/lib/nautilus/extensions-2.0/libnautilus-gdu.la
  /usr/lib/nautilus/extensions-2.0/libnautilus-gdu.a
  /usr/lib/nautilus/extensions-2.0/.debug
  /usr/lib/nautilus/extensions-2.0/.debug/libnautilus-gdu.so

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
index b7be956..4a3efaf 100644
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9115d11797a5e6b746b4e9b90194564"
 
 DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 libatasmart nautilus"
 
-PR = "r2"
+PR = "r3"
 
 inherit gnome
 SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d"
@@ -21,3 +21,6 @@ EXTRA_OECONF += "--disable-scrollkeeper --disable-docbook-docs"
 
 PACKAGES =+ "${PN}-nautilus-extension"
 FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so"
+FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la"
+FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.a"
+FILES_${PN}-dbg += "${libdir}/nautilus/extensions-2.0/.debug"
-- 
1.8.0

[PATCH 74/77] gnome-session: disable failing docs generation

[Martin Jansa]

* xmlto does not work correctly
  https://bugzilla.yoctoproject.org/show_bug.cgi?id=2416

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb
index 6c10156..e1fa519 100644
--- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb
@@ -2,17 +2,17 @@ DESCRIPTION = "Gnome session manager"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-PR = "r2"
+PR = "r3"
 
 SECTION = "x11/gnome"
 DEPENDS = "libxtst gtk+ glib-2.0 upower dbus-glib gconf pango gdk-pixbuf-native startup-notification"
 
-inherit gnome 
+inherit gnome
 
 SRC_URI[archive.md5sum] = "222bad6b446cb19a6b9028ea24538002"
 SRC_URI[archive.sha256sum] = "22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a"
 
-EXTRA_OECONF = " --with-gtk=2.0 ac_cv_path_GCONF_SANITY_CHECK=set "
+EXTRA_OECONF = " --with-gtk=2.0 ac_cv_path_GCONF_SANITY_CHECK=set --disable-docbook-docs"
 
 do_configure_append() {
 	for i in $(find ${S} -name "Makefile") ; do
-- 
1.8.0

[PATCH 75/77] gdm: disable failing docs generation

[Martin Jansa]

* xmlto does not work correctly
  https://bugzilla.yoctoproject.org/show_bug.cgi?id=2416

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
index bdf249e..c03bb61 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb"
 
-PR = "r9"
+PR = "r10"
 
 inherit gnome update-rc.d
 
@@ -25,7 +25,8 @@ SRC_URI[archive.sha256sum] = "034d23af0ea18d86e5543e707212d9297ec7d83f221808968a
 EXTRA_OECONF = " --enable-authentication-scheme=shadow \
                  --enable-debug=yes \
                  --with-console-kit \
-                 --disable-scrollkeeper "
+                 --disable-scrollkeeper \
+                 --disable-docbook-docs"
 
 do_install_prepend() {
 	mkdir -p ${D}/var/lib/gdm/.gconf.mandatory
-- 
1.8.0

[PATCH 76/77] cheese: disable scrollkeeper

[Martin Jansa]

* we don't provide scrollkeeper-native

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
index 4ac667b..f447817 100644
--- a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
+++ b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf"
 
 DEPENDS = "gtk+ gstreamer gst-plugins-base libcanberra udev librsvg gnome-desktop evolution-data-server"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnome
 
@@ -14,3 +14,4 @@ SRC_URI[archive.sha256sum] = "48f03470c6f527caa0e3b269d3afcff86ae0939a74f66ce030
 FILES_${PN} += "${datadir}/dbus-1"
 RRECOMMENDS_${PN} = "gst-plugins-good-meta gst-plugins-base-meta"
 
+EXTRA_OECONF += "--disable-scrollkeeper"
-- 
1.8.0

[PATCH 77/77] gnome-themes: fix path to icon-name-mapping

[Martin Jansa]

* it was pointing to
  UTILS_PATH=/OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/gnome-themes
  after libexecdir change in oe-core

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb
index 9cc091f..8c15754 100644
--- a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GNOME themes"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2b543dc97eb7594d026af39d9b54204b"
 
-PR = "r2"
+PR = "r3"
 
 SECTION = "x11/gnome"
 DEPENDS = "gtk-engines icon-naming-utils icon-naming-utils-native glib-2.0 intltool-native libxml-simple-perl-native"
@@ -13,7 +13,7 @@ EXTRA_OECONF += "--enable-all-themes --disable-hicolor-check"
 inherit gnome perlnative
 
 do_configure_prepend() {
-	sed -i -e 's:`$PKG_CONFIG --variable=program_path icon-naming-utils`:${STAGING_DIR_NATIVE}${libexecdir}:g' configure.in
+	sed -i -e 's:`$PKG_CONFIG --variable=program_path icon-naming-utils`:${STAGING_DIR_NATIVE}${libdir}/icon-naming-utils:g' configure.in
 }
 
 PACKAGES =+ " gnome-theme-crux gnome-theme-highcontrast gnome-theme-highcontrastinverse gnome-theme-highcontrastlargeprint gnome-theme-highcontrastlargeprintinverse gnome-theme-largeprint gnome-theme-mist"
-- 
1.8.0

[PATCHv2 72/85] gnome-disk-utility: disable failing docs generation

[Martin Jansa]

* xmlto does not work correctly
  https://bugzilla.yoctoproject.org/show_bug.cgi?id=2416

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
index dab938f..58bf526 100644
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9115d11797a5e6b746b4e9b90194564"
 
 DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 libatasmart nautilus"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnome
 SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d"
@@ -19,5 +19,9 @@ SRC_URI += "\
 
 EXTRA_OECONF += "--disable-scrollkeeper"
 
+do_configure_prepend() {
+       sed -i -e "s: help : :g" ${S}/Makefile.am
+}
+
 PACKAGES =+ "${PN}-nautilus-extension"
 FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so"
-- 
1.8.0

[PATCHv2 73/85] gnome-disk-utility: fix unpackaged files

[Martin Jansa]

* WARNING: QA Issue: gnome-disk-utility: Files/directories were installed but not shipped
  /usr/lib/nautilus/extensions-2.0/libnautilus-gdu.la
  /usr/lib/nautilus/extensions-2.0/libnautilus-gdu.a
  /usr/lib/nautilus/extensions-2.0/.debug
  /usr/lib/nautilus/extensions-2.0/.debug/libnautilus-gdu.so

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
index 58bf526..595d9dc 100644
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9115d11797a5e6b746b4e9b90194564"
 
 DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 libatasmart nautilus"
 
-PR = "r2"
+PR = "r3"
 
 inherit gnome
 SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d"
@@ -25,3 +25,6 @@ do_configure_prepend() {
 
 PACKAGES =+ "${PN}-nautilus-extension"
 FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so"
+FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la"
+FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a"
+FILES_${PN}-dbg += "${libdir}/nautilus/extensions-2.0/.debug"
-- 
1.8.0

[PATCHv2 75/85] gdm: disable failing docs generation

[Martin Jansa]

* xmlto does not work correctly
  https://bugzilla.yoctoproject.org/show_bug.cgi?id=2416

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
index bdf249e..863db2e 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb"
 
-PR = "r9"
+PR = "r10"
 
 inherit gnome update-rc.d
 
@@ -25,7 +25,11 @@ SRC_URI[archive.sha256sum] = "034d23af0ea18d86e5543e707212d9297ec7d83f221808968a
 EXTRA_OECONF = " --enable-authentication-scheme=shadow \
                  --enable-debug=yes \
                  --with-console-kit \
-                 --disable-scrollkeeper "
+                 --disable-scrollkeeper"
+
+do_configure_prepend() {
+	sed -i -e "s:\bdocs::g" ${S}/Makefile.am
+}
 
 do_install_prepend() {
 	mkdir -p ${D}/var/lib/gdm/.gconf.mandatory
-- 
1.8.0

[PATCH 78/85] cheese: disable help build

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
index f447817..1e8a98b 100644
--- a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
+++ b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
@@ -15,3 +15,7 @@ FILES_${PN} += "${datadir}/dbus-1"
 RRECOMMENDS_${PN} = "gst-plugins-good-meta gst-plugins-base-meta"
 
 EXTRA_OECONF += "--disable-scrollkeeper"
+
+do_configure_prepend() {
+	sed -i -e "s: help : :g" ${S}/Makefile.am
+}
-- 
1.8.0

[PATCH 79/85] gnome-mplayer: fix unpackaged files warning

[Martin Jansa]

* fixes:
gnome-mplayer-1.0.5: gnome-mplayer: Files/directories were installed but not shipped
  /usr/lib
  /usr/lib/nautilus
  /usr/lib/nautilus/extensions-2.0
  /usr/lib/nautilus/extensions-2.0/libgnome-mplayer-properties-page.so
  /usr/lib/nautilus/extensions-2.0/.debug
  /usr/lib/nautilus/extensions-2.0/.debug/libgnome-mplayer-properties-page.so

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb b/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb
index b755dfa..2eded51 100644
--- a/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb
+++ b/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb
@@ -5,6 +5,8 @@ SECTION = "multimedia"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
+PR = "r1"
+
 DEPENDS = "gmtk gtk+ alsa-lib libnotify glib-2.0 dbus-glib virtual/libx11 libxscrnsaver"
 
 SRC_URI = "http://${PN}.googlecode.com/files/${P}.tar.gz"
@@ -14,6 +16,11 @@ SRC_URI[sha256sum] = "ac3c179345baecb4ca5237782aa33e83253a87bf8b42ce6eb3a9207a34
 EXTRA_OECONF = "--with-gio --with-alsa --with-dbus --with-libnotify"
 
 FILES_${PN} += "${datadir}/gnome-control-center/default-apps/${PN}.xml"
+PACKAGES =+ "${PN}-nautilus-extension"
+FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so"
+FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la"
+FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a"
+FILES_${PN}-dbg += "${libdir}/nautilus/extensions-2.0/.debug"
 
 inherit gettext pkgconfig mime gtk-icon-cache autotools
 
-- 
1.8.0

[PATCH 80/85] libwmf: fix QA warnings

[Martin Jansa]

* fixes:
libwmf-0.2.8.4: non -staticdev package contains static .a library: libwmf-dev path '/work/armv4t-oe-linux-gnueabi/libwmf/0.2.8.4-r2/packages-split/libwmf-dev/usr/lib/gtk-2.0/2.10.0/loaders/io-wmf.a'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
index cedfd3b..c06b906 100644
--- a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
+++ b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS_virtclass-native = "libpng-native jpeg-native"
 DEPENDS = "libpng jpeg expat gtk+"
@@ -21,6 +21,7 @@ SRC_URI[tarball.md5sum] = "d1177739bf1ceb07f57421f0cee191e0"
 SRC_URI[tarball.sha256sum] = "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8"
 
 FILES_${PN}-dbg += "${libdir}/gtk-2.0/2.10.0/loaders/.debug"
-FILES_${PN}-dev += "${libdir}/gtk-2.0/2.10.0/loaders/*.la ${libdir}/gtk-2.0/2.10.0/loaders/*.a"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/2.10.0/loaders/*.la"
+FILES_${PN}-staticdev += "${libdir}/gtk-2.0/2.10.0/loaders/*.a"
 FILES_${PN} += "${libdir}/gtk-2.0/2.10.0/loaders/*.so"
 
-- 
1.8.0

[PATCH 81/85] gateone: fix unpackaged files

[Martin Jansa]

* fixes:
gateone-1.1: gateone: Files/directories were installed but not shipped
  /usr
  /usr/lib
  /usr/lib/python2.7
  /usr/lib/python2.7/site-packages
  /usr/lib/python2.7/site-packages/gateone-1.1-py2.7.egg-info

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-connectivity/gateone/gateone_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-connectivity/gateone/gateone_git.bb b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
index f6aa377..f0f727a 100644
--- a/meta-oe/recipes-connectivity/gateone/gateone_git.bb
+++ b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "HTML5 (plugin-free) web-based terminal emulator and SSH client"
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ee5b168fc7de89a0cadc49e27830aa2c"
 
-PR = "r8"
+PR = "r9"
 
 PV = "1.1"
 SRCREV = "bb74e1095adb66b04b51ed6ff10ae0aa96afdd46"
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/liftoff/GateOne.git \
 
 S = "${WORKDIR}/git"
 
-inherit distutils allarch
+inherit distutils allarch python-dir
 
 export prefix = "${localstatedir}/lib"
 
@@ -26,7 +26,7 @@ do_install_append() {
 	install -m 0644 ${WORKDIR}/server.conf ${D}/var/lib/gateone/server.conf
 }
 
-FILES_${PN} = "${localstatedir}/lib ${localstatedir}/log ${base_libdir} ${sysconfdir}"
+FILES_${PN} = "${localstatedir}/lib ${localstatedir}/log ${base_libdir} ${sysconfdir} ${PYTHON_SITEPACKAGES_DIR}"
 RDEPENDS_${PN} = "file \
                   mime-support \
                   openssh-ssh \
-- 
1.8.0

[PATCH 82/85] lmbench: fix unpackaged files

[Martin Jansa]

* fixes:
lmbench-3.0-a9: lmbench: Files/directories were installed but not shipped
  /usr/man
  /usr/lib/lmbench

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
index 7efdad5..611013e 100644
--- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
+++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
 
 inherit autotools
 
+PR = "r1"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \
 	   file://lmbench-run \
 	   file://rename-line-binary.patch \
@@ -18,7 +20,7 @@ SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8
 
 EXTRA_OEMAKE = 'CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" LD="${LD}" OS="${TARGET_SYS}" \
-		TARGET="${TARGET_OS}" BASE="${prefix}"'
+		TARGET="${TARGET_OS}" BASE="${prefix}" MANDIR="${mandir}"'
 
 do_configure() {
 	:
@@ -40,7 +42,6 @@ do_install () {
 	oe_runmake 'BASE=${D}${prefix}' \
 		    -C src install
 	mv ${D}${bindir}/line ${D}${bindir}/lm_line
-	mv ${D}${prefix}/man/* ${D}${mandir}/
 	install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/
 	sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${PN},;' \
 	       -e 's,^BINDIR=.*$,BINDIR=${libdir}/${PN},;' \
@@ -51,4 +52,4 @@ do_install () {
 }
 
 RDEPENDS_${PN} = "debianutils"
-FILES_${PN} += "${datadir}/lmbench"
+FILES_${PN} += "${datadir}/lmbench ${libdir}/lmbench"
-- 
1.8.0

[PATCH 83/85] xdotool: fix unpackaged files

[Martin Jansa]

* fixes:
xdotool-1.20100416.2809: xdotool: Files/directories were installed but not shipped
  /usr/man
  /usr/man/man1
  /usr/man/man1/xdotool.1

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb b/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb
index cb3f83c..4f13058 100644
--- a/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb
+++ b/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb
@@ -5,11 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=2f9cbf7e9401cec8a38666a08851ce6b"
 SECTION = "x11"
 DEPENDS = "virtual/libx11 libxtst"
 
+PR = "r1"
+
 SRC_URI = "http://semicomplete.googlecode.com/files/xdotool-${PV}.tar.gz"
 SRC_URI[md5sum] = "1d5be641e512c343abfe5f78b39e6f19"
 SRC_URI[sha256sum] = "42d7271fbc796e53db71bb221f311b9ff3c51d90a71c9487a9bd3101ca39894f"
 
-EXTRA_OEMAKE = "PREFIX=${prefix}"
+EXTRA_OEMAKE = "PREFIX=${prefix} INSTALLMAN=${mandir}"
 
 do_install() {
 	oe_runmake -e install DESTDIR=${D} PREFIX=${prefix}
-- 
1.8.0

[PATCH 84/85] libxml++: fix unpackaged files

[Martin Jansa]

* fixes:
libxml++-2.35.3: libxml++: Files/directories were installed but not shipped
  /usr/share/devhelp
  /usr/share/devhelp/books
  /usr/share/devhelp/books/libxml++-2.6
  /usr/share/devhelp/books/libxml++-2.6/libxml++-2.6.devhelp2
  /usr/lib/libxml++-2.6
  /usr/lib/libxml++-2.6/include
  /usr/lib/libxml++-2.6/include/libxml++config.h

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-core/libxml/libxml++_2.35.3.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-core/libxml/libxml++_2.35.3.bb b/meta-oe/recipes-core/libxml/libxml++_2.35.3.bb
index 9a33baa..fb9cdd9 100644
--- a/meta-oe/recipes-core/libxml/libxml++_2.35.3.bb
+++ b/meta-oe/recipes-core/libxml/libxml++_2.35.3.bb
@@ -4,15 +4,19 @@ HOMEPAGE = "http://libxmlplusplus.sourceforge.net"
 BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml%2B%2B"
 SECTION = "libs"
 LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 "
+
+PR = "r1"
 
 SHRT_VER = "${@d.getVar('PV',True).split('.')[0]}.${@d.getVar('PV',True).split('.')[1]}"
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz"
 
 SRC_URI[md5sum] = "196a2dcdc84ab987fe3852b3f29cafd7"
 SRC_URI[sha256sum] = "715a4214bbff90365cc8406a28e427febd90461006d608fbdcdcea7fc9891eaf"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 "
 
 DEPENDS = "libxml2 glibmm"
 
 inherit autotools pkgconfig
 
+FILES_${PN}-doc += "${datadir}/devhelp"
+FILES_${PN}-dev += "${libdir}/libxml++-2.6/include/libxml++config.h"
-- 
1.8.0

[PATCH 85/85] qwt: fix unpackaged files

[Martin Jansa]

* fixes:
qwt-6.0.1: qwt: Files/directories were installed but not shipped
  /usr/features
  /usr/doc
  /usr/plugins
  /usr/features/qwtconfig.pri
  /usr/features/qwtmathml.prf
  /usr/features/qwt.prf
  /usr/plugins/designer
  /usr/plugins/designer/libqwt_designer_plugin.so
  /usr/plugins/designer/.debug
  /usr/plugins/designer/.debug/libqwt_designer_plugin.so

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb | 2 ++
 meta-oe/recipes-qt/qwt/qwt.inc        | 6 +++++-
 meta-oe/recipes-qt/qwt/qwt_6.0.1.bb   | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb b/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
index 7f0e43b..af9d956 100644
--- a/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
+++ b/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
@@ -2,6 +2,8 @@ inherit qt4e
 
 require qwt.inc
 
+PR = "r1"
+
 SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c"
 SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2"
 
diff --git a/meta-oe/recipes-qt/qwt/qwt.inc b/meta-oe/recipes-qt/qwt/qwt.inc
index 50f4e2a..02a4049 100644
--- a/meta-oe/recipes-qt/qwt/qwt.inc
+++ b/meta-oe/recipes-qt/qwt/qwt.inc
@@ -22,6 +22,7 @@ do_install() {
     oe_runmake -e install
     install -d ${D}${datadir}/doc/${PN}
     mv ${D}${prefix}/doc/* ${D}${datadir}/doc/${PN}/
+    rmdir ${D}${prefix}/doc
     cd ${S}/examples
     install -d ${D}/${bindir}
     cd bin${QT_LIBINFIX}/
@@ -30,5 +31,8 @@ do_install() {
     done
 }
 
-PACKAGES_prepend = "${PN}-examples "
+PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins"
 FILES_${PN}-examples = "${bindir}/*"
+FILES_${PN}-features = "${prefix}/features"
+FILES_${PN}-plugins = "${prefix}/plugins"
+FILES_${PN}-dbg = "${prefix}/plugins/designer/.debug"
diff --git a/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb b/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb
index e7eb7b7..f38816a 100644
--- a/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb
+++ b/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb
@@ -2,6 +2,8 @@ inherit qt4x11
 
 require qwt.inc
 
+PR = "r1"
+
 SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c"
 SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2"
 
-- 
1.8.0

Re: [PATCH 68/77] systemd: add target python to depends

[Anders Darander]

* Martin Jansa <martin.jansa@gmail.com> [121205 19:32]:
> * pythonnative adds only python-native to DEPENDS, but we need target python for working python-config
> checking for python-config... /OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/python-native/python-config
> Traceback (most recent call last):
>   File "/OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/python-native/python-config", line 24, in <module>
>     pyver = sysconfig.get_config_var('VERSION')
>   File "/OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/python2.7/distutils/sysconfig.py", line 602, in get_config_var
>     return get_config_vars().get(name)
>   File "/OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/python2.7/distutils/sysconfig.py", line 518, in get_config_vars
>     func()
>   File "/OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/python2.7/distutils/sysconfig.py", line 416, in _init_posix
>     raise DistutilsPlatformError(my_msg)
> distutils.errors.DistutilsPlatformError: invalid Python installation: unable to open /OE/jansa-test/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/config/Makefile (No such file or directory)

Which steps are introducing these errors?

I'm curious as systemd has been built without this native python
previously, and we're also adding --without-python to EXTRA_OECONF.
Thus, to me it seems fishy if we should need to add that depends.
Though, there might be a good reason, I guess. 

As usual I'm slightly worried about build time...

Cheers,
Anders

-- 
Anders Darander
ChargeStorm AB / eStorm AB

Re: [PATCH 68/77] systemd: add target python to depends

[Martin Jansa]

   Yes but there is patch to reenable python support in systemd in this
   patchset. The main motivation was to fix python-pyudev build, but it's
   not enough, so I'm open to remove both patches from patchset.
   Cheers

   -- Sent from my HP TouchPad
   __________________________________________________________________

   On 6.12.2012 6:48, Anders Darander <anders@chargestorm.se> wrote:
   * Martin Jansa <martin.jansa@gmail.com> [121205 19:32]:
   > * pythonnative adds only python-native to DEPENDS, but we need target
   python for working python-config
   > checking for python-config...
   /OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/python
   -native/python-config
   > Traceback (most recent call last):
   > File
   "/OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/pytho
   n-native/python-config", line 24, in <module>
   > pyver = sysconfig.get_config_var('VERSION')
   > File
   "/OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/pytho
   n2.7/distutils/sysconfig.py", line 602, in get_config_var
   > return get_config_vars().get(name)
   > File
   "/OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/pytho
   n2.7/distutils/sysconfig.py", line 518, in get_config_vars
   > func()
   > File
   "/OE/jansa-test/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/pytho
   n2.7/distutils/sysconfig.py", line 416, in _init_posix
   > raise DistutilsPlatformError(my_msg)
   > distutils.errors.DistutilsPlatformError: invalid Python installation:
   unable to open
   /OE/jansa-test/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/
   config/Makefile (No such file or directory)
   Which steps are introducing these errors?
   I'm curious as systemd has been built without this native python
   previously, and we're also adding --without-python to EXTRA_OECONF.
   Thus, to me it seems fishy if we should need to add that depends.
   Though, there might be a good reason, I guess.
   As usual I'm slightly worried about build time...
   Cheers,
   Anders
   --
   Anders Darander
   ChargeStorm AB / eStorm AB
   _______________________________________________
   Openembedded-devel mailing list
   Openembedded-devel@lists.openembedded.org
   http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

[PATCHv2 05/90] packagekit: import from OE-Classic

[Martin Jansa]

* add LIC_FILES_CHKSUM
* drop versions from DEPENDS
* use opkg as the only IPKG_VARIANT
* depend on polkit (renamed from policykit)
* disable unpackaged ruck
* fix packaging of PN-staticdev

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../packagekit/packagekit-0.5.6/configurefix.patch |  13 +
 .../packagekit/packagekit-0.5.6/opkgfixes.patch    | 422 +++++++++++++++++++++
 .../packagekit/packagekit_0.5.6.bb                 |  57 +++
 3 files changed, 492 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch
 create mode 100644 meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch
 create mode 100644 meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb

diff --git a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch b/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch
new file mode 100644
index 0000000..48f9591
--- /dev/null
+++ b/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch
@@ -0,0 +1,13 @@
+Index: PackageKit-0.6.0/configure.ac
+===================================================================
+--- PackageKit-0.6.0.orig/configure.ac	2010-01-04 16:32:18.000000000 +0000
++++ PackageKit-0.6.0/configure.ac	2010-01-29 11:33:48.000000000 +0000
+@@ -90,7 +90,7 @@
+ 							enable_strict=$default_strict)
+ if test x$enable_strict != xno; then
+ 	if test "$GCC" = "yes"; then
+-		WARNINGFLAGS_CPP="$WARNINGFLAGS_CPP -Werror"
++		:
+ 	fi
+ fi
+ 
diff --git a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch b/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch
new file mode 100644
index 0000000..5a73a19
--- /dev/null
+++ b/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch
@@ -0,0 +1,422 @@
+Index: PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c
+===================================================================
+--- PackageKit-0.6.0.orig/backends/opkg/pk-backend-opkg.c	2010-01-29 09:39:33.000000000 +0000
++++ PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c	2010-01-29 11:30:51.000000000 +0000
+@@ -29,8 +29,7 @@
+ 
++#include <stdio.h>
+ #include <libopkg/opkg.h>
+ 
+-static opkg_t *opkg;
+-
+ enum {
+ 	SEARCH_NAME,
+ 	SEARCH_DESCRIPTION,
+@@ -62,7 +60,7 @@
+  * check an opkg package for known GUI dependancies
+  */
+ static gboolean
+-opkg_is_gui_pkg (opkg_package_t *pkg)
++opkg_is_gui_pkg (pkg_t *pkg)
+ {
+ 
+   /* TODO: check appropriate tag */
+@@ -84,7 +82,7 @@
+  * check an opkg package to determine if it is a development package
+  */
+ static gboolean
+-opkg_is_devel_pkg (opkg_package_t *pkg)
++opkg_is_devel_pkg (pkg_t *pkg)
+ {
+   if (g_strrstr (pkg->name, "-dev"))
+       return TRUE;
+@@ -105,7 +103,7 @@
+  * returns true if the tag is present
+  */
+ static gboolean 
+-opkg_check_tag (opkg_package_t *pkg, const gchar *tag)
++opkg_check_tag (pkg_t *pkg, const gchar *tag)
+ {
+ 	if (pkg->tags && tag)
+ 		return (g_strrstr (pkg->tags, tag) != NULL);
+@@ -118,7 +116,7 @@
+ {
+ 	switch (err)
+ 	{
+-	case OPKG_NO_ERROR:
++/*	case OPKG_NO_ERROR:
+ 		break;
+ 	case OPKG_PACKAGE_NOT_INSTALLED:
+ 		pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
+@@ -140,7 +138,7 @@
+ 		break;
+ 	case OPKG_PACKAGE_NOT_AVAILABLE:
+ 		pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, NULL);
+-		break;
++		break;*/
+ 	default:
+ 		opkg_unknown_error (backend, err, "Update package");
+ 	}
+@@ -152,7 +150,7 @@
+ static void
+ backend_initialize (PkBackend *backend)
+ {
+-	opkg = opkg_new ();
++	int opkg = opkg_new ();
+ 
+ 	if (!opkg) {
+ 		pk_backend_error_code (backend,
+@@ -162,8 +160,8 @@
+ 	}
+ 
+ #ifdef OPKG_OFFLINE_ROOT
+-	opkg_set_option (opkg, (char *) "offline_root", OPKG_OFFLINE_ROOT);
+-	opkg_re_read_config_files (opkg);
++	opkg_set_option ((char *) "offline_root", OPKG_OFFLINE_ROOT);
++	opkg_re_read_config_files ();
+ #endif
+ 
+ }
+@@ -174,22 +172,22 @@
+ static void
+ backend_destroy (PkBackend *backend)
+ {
+-	opkg_free (opkg);
++	opkg_free ();
+ }
+ 
+ 
+ static void
+-pk_opkg_progress_cb (opkg_t *_opkg, const opkg_progress_data_t *pdata, void *data)
++pk_opkg_progress_cb (const opkg_progress_data_t *pdata, void *data)
+ {
+-	PkBackend *backend = PK_BACKEND (data);
++	PkBackend *backend = (PkBackend*) data;
+ 	if (!backend)
+ 		return;
+ 
+ 	pk_backend_set_percentage (backend, pdata->percentage);
+-	if (pdata->package)
++	if (pdata->pkg)
+ 	{
+ 		gchar *uid;
+-		opkg_package_t *pkg = pdata->package;
++		pkg_t *pkg = pdata->pkg;
+ 		gint status = PK_INFO_ENUM_UNKNOWN;
+ 
+ 		uid = g_strdup_printf ("%s;%s;%s;",
+@@ -225,12 +223,12 @@
+ {
+ 	int ret;
+ 
+-	ret = opkg_update_package_lists (opkg, pk_opkg_progress_cb, backend);
++	ret = opkg_update_package_lists (pk_opkg_progress_cb, backend);
+ 
+ 	if (ret) {
+-		if (ret == OPKG_DOWNLOAD_FAILED)
+-			pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL);
+-		else
++//		if (ret == OPKG_DOWNLOAD_FAILED)
++//			pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL);
++//		else
+ 			opkg_unknown_error (backend, ret, "Refreshing cache");
+ 	}
+ 	pk_backend_finished (backend);
+@@ -256,7 +254,7 @@
+  */
+ 
+ static void
+-pk_opkg_package_list_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data)
++pk_opkg_package_list_cb (pkg_t *pkg, void *data)
+ {
+ 	SearchParams *params = (SearchParams*) data;
+ 	gchar *uid;
+@@ -298,7 +296,7 @@
+ 	uid = g_strdup_printf ("%s;%s;%s;",
+ 		pkg->name, pkg->version, pkg->architecture);
+ 
+-	if (pkg->installed)
++	if (pkg->state_status == SS_INSTALLED)
+ 		status = PK_INFO_ENUM_INSTALLED;
+ 	else
+ 		status = PK_INFO_ENUM_AVAILABLE;
+@@ -318,10 +316,10 @@
+                 opkg_is_gui_pkg (pkg))
+ 		goto end_handle;
+ 	if (pk_bitfield_contain(filters, PK_FILTER_ENUM_INSTALLED) && 
+-                (!pkg->installed))
++                (pkg->state_status != SS_INSTALLED))
+ 		goto end_handle;
+ 	if (pk_bitfield_contain(filters, PK_FILTER_ENUM_NOT_INSTALLED) && 
+-                (pkg->installed))
++                (pkg->state_status == SS_INSTALLED))
+ 		goto end_handle;
+ 
+ 	pk_backend_package (params->backend, status, uid, pkg->description);
+@@ -338,7 +336,7 @@
+ 
+ 	params = pk_backend_get_pointer (backend, "search-params");
+ 
+-	opkg_list_packages (opkg, pk_opkg_package_list_cb, params);
++	opkg_list_packages (pk_opkg_package_list_cb, params);
+ 
+ 	pk_backend_finished (params->backend);
+ 
+@@ -349,7 +347,7 @@
+ }
+ 
+ static void
+-backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search)
++backend_search_name (PkBackend *backend, PkBitfield filters, gchar **search)
+ {
+ 	SearchParams *params;
+ 
+@@ -360,7 +358,7 @@
+ 	params = g_new0 (SearchParams, 1);
+ 	params->filters = filters;
+ 	params->search_type = SEARCH_NAME;
+-	params->needle = g_utf8_strdown (search, -1);
++	params->needle = g_utf8_strdown (search[0], -1);
+ 	params->backend = backend;
+ 
+ 	pk_backend_set_pointer (backend, "search-params", params);
+@@ -371,7 +369,7 @@
+  * backend_search_description:
+  */
+ static void
+-backend_search_description (PkBackend *backend, PkBitfield filters, const gchar *search)
++backend_search_description (PkBackend *backend, PkBitfield filters, gchar **search)
+ {
+ 	SearchParams *params;
+ 
+@@ -382,7 +380,7 @@
+ 	params = g_new0 (SearchParams, 1);
+ 	params->filters = filters;
+ 	params->search_type = SEARCH_DESCRIPTION;
+-	params->needle = g_utf8_strdown (search, -1);
++	params->needle = g_utf8_strdown (search[0], -1);
+ 	params->backend = backend;
+ 
+ 	pk_backend_set_pointer (backend, "search-params", params);
+@@ -390,7 +388,7 @@
+ }
+ 
+ static void
+-backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *search)
++backend_search_group (PkBackend *backend, PkBitfield filters, gchar **search)
+ {
+ 	SearchParams *params;
+ 
+@@ -401,7 +399,7 @@
+ 	params = g_new0 (SearchParams, 1);
+ 	params->filters = filters;
+ 	params->search_type = SEARCH_TAG;
+-	params->needle = g_strdup_printf ("group::%s", search);
++	params->needle = g_strdup_printf ("group::%s", search[0]);
+ 	params->backend = backend;
+ 
+ 	pk_backend_set_pointer (backend, "search-params", params);
+@@ -412,9 +410,9 @@
+ static gboolean
+ backend_install_packages_thread (PkBackend *backend)
+ {
+-	PkPackageId *pi;
+ 	gint err, i;
+ 	gchar **package_ids;
++	gchar **parts;
+ 
+ 	package_ids = pk_backend_get_strv (backend, "pkids");
+ 
+@@ -424,13 +422,13 @@
+ 	{
+ 		pk_backend_package (backend, PK_INFO_ENUM_INSTALLING, package_ids[i], NULL);
+ 
+-		pi = pk_package_id_new_from_string (package_ids[i]);
++		parts = pk_package_id_split (package_ids[i]);
+ 
+-		err = opkg_install_package (opkg, pi->name, pk_opkg_progress_cb, backend);
++		err = opkg_install_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
+ 		if (err)
+ 			handle_install_error (backend, err);
+ 
+-		pk_package_id_free (pi);
++		g_strfreev (parts);
+ 		if (err != 0)
+ 			break;
+ 	}
+@@ -453,9 +451,9 @@
+ static gboolean
+ backend_remove_packages_thread (PkBackend *backend)
+ {
+-	PkPackageId *pi;
+ 	gint err, i;
+ 	gchar **package_ids;
++	gchar **parts;
+ 	gboolean allow_deps;
+ 	gboolean autoremove;
+ 	gpointer *data;
+@@ -467,29 +465,30 @@
+ 	autoremove = GPOINTER_TO_INT (data[2]);
+ 	g_free (data);
+ 
+-	opkg_set_option (opkg, (char *)"autoremove", &autoremove);
+-	opkg_set_option (opkg, (char *)"force_removal_of_dependent_packages", &allow_deps);
++	opkg_set_option ((char *)"autoremove", &autoremove);
++	opkg_set_option ((char *)"force_removal_of_dependent_packages", &allow_deps);
+ 
+ 	err = 0;
+ 
+ 	for (i = 0; package_ids[i]; i++)
+ 	{
+-		pi = pk_package_id_new_from_string (package_ids[i]);
+ 		pk_backend_package (backend, PK_INFO_ENUM_REMOVING, package_ids[i], NULL);
+ 
+-		err = opkg_remove_package (opkg, pi->name, pk_opkg_progress_cb, backend);
++		parts = pk_package_id_split (package_ids[i]);
++
++		err = opkg_remove_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
+ 
+ 		switch (err)
+ 		{
+-		case OPKG_NO_ERROR:
+-			break;
+-		case OPKG_PACKAGE_NOT_INSTALLED:
+-			pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
+-			break;
++		//case OPKG_NO_ERROR:
++		//	break;
++		//case OPKG_PACKAGE_NOT_INSTALLED:
++		//	pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
++		//	break;
+ 		default:
+ 			opkg_unknown_error (backend, err, "Remove");
+ 		}
+-		pk_package_id_free (pi);
++		g_strfreev (parts);
+ 
+ 		if (err != 0)
+ 			break;
+@@ -540,7 +539,7 @@
+ 	gint err;
+ 
+ 	/* FIXME: support only_trusted */
+-	err = opkg_upgrade_all (opkg, pk_opkg_progress_cb, backend);
++	err = opkg_upgrade_all (pk_opkg_progress_cb, backend);
+ 
+ 	if (err)
+ 		opkg_unknown_error (backend, err, "Upgrading system");
+@@ -564,29 +563,28 @@
+ static gboolean
+ backend_update_package_thread (PkBackend *backend)
+ {
+-	PkPackageId *pi;
++        gchar **parts;
+ 	gint err = 0;
+ 	const gchar *package_id;
+ 
+ 	/* FIXME: support only_trusted */
+ 	package_id = pk_backend_get_string (backend, "pkgid");
+-	pi = pk_package_id_new_from_string (package_id);
++	parts = pk_package_id_split (package_id);
+ 
+-	if (!pi->name || !pi->version)
++	if (!parts)
+ 	{
+ 		pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
+ 				"Package not found");
+-		pk_package_id_free (pi);
+ 		pk_backend_finished (backend);
+ 		return FALSE;
+ 	}
+ 
+-	err = opkg_upgrade_package (opkg, pi->name, pk_opkg_progress_cb, backend);
++	err = opkg_upgrade_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
+ 	if (err)
+ 		handle_install_error (backend, err);
+ 
+ 
+-	pk_package_id_free (pi);
++	g_strfreev (parts);
+ 	pk_backend_finished (backend);
+ 	return (err != 0);
+ }
+@@ -610,13 +608,13 @@
+  */
+ 
+ static void
+-pk_opkg_list_upgradable_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data)
++pk_opkg_list_upgradable_cb (pkg_t *pkg, void *data)
+ {
+-	PkBackend *backend = PK_BACKEND (data);
++	PkBackend *backend = (PkBackend*) data;
+ 	gchar *uid;
+ 	gint status;
+ 
+-	if (pkg->installed)
++	if (pkg->state_status == SS_INSTALLED)
+ 		status = PK_INFO_ENUM_INSTALLED;
+ 	else
+ 		status = PK_INFO_ENUM_AVAILABLE;
+@@ -631,7 +629,7 @@
+ static gboolean
+ backend_get_updates_thread (PkBackend *backend)
+ {
+-	opkg_list_upgradable_packages (opkg, pk_opkg_list_upgradable_cb, backend);
++	opkg_list_upgradable_packages (pk_opkg_list_upgradable_cb, backend);
+ 	pk_backend_finished (backend);
+ 	return TRUE;
+ }
+@@ -668,16 +666,18 @@
+ static gboolean
+ backend_get_details_thread (PkBackend *backend)
+ {
+-	PkPackageId *pi;
+ 	gchar **package_ids;
++        gchar **parts;
+ 	int group_index;
+ 	PkGroupEnum group = 0;
+-	opkg_package_t *pkg;
++	pkg_t *pkg;
+ 	gchar *newid;
+ 
+         package_ids = pk_backend_get_strv(backend, "package_ids");
+-	pi = pk_package_id_new_from_string (package_ids[0]);
+-	if (pi == NULL)
++	parts = pk_package_id_split (package_ids[0]);
++
++
++	if (!parts)
+ 	{
+ 		pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_ID_INVALID, "invalid package id");
+ 		pk_backend_finished (backend);
+@@ -685,8 +685,8 @@
+ 	}
+ 
+ 
+-	pkg = opkg_find_package (opkg, pi->name, pi->version, pi->arch, pi->data);
+-	pk_package_id_free (pi);
++	pkg = opkg_find_package (parts[PK_PACKAGE_ID_NAME], parts[PK_PACKAGE_ID_VERSION], parts[PK_PACKAGE_ID_ARCH], parts[PK_PACKAGE_ID_DATA]);
++	g_strfreev (parts);
+ 
+ 	if (!pkg)
+ 	{
+@@ -695,7 +695,7 @@
+ 		return FALSE;
+ 	}
+ 
+-	newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->repository);
++	newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->src->name);
+ 
+ 	if (pkg->tags) {
+ 		for (group_index = 0; group < PK_GROUP_ENUM_LAST; group_index++) {
+@@ -706,9 +706,8 @@
+ 		}
+ 	}
+ 
+-	pk_backend_details (backend, newid, NULL, group, pkg->description, pkg->url, pkg->size);
++	pk_backend_details (backend, newid, NULL, group, pkg->description, NULL, pkg->size);
+ 	g_free (newid);
+-	opkg_package_free(pkg);
+ 	pk_backend_finished (backend);
+ 	return TRUE;
+ }
diff --git a/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb b/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb
new file mode 100644
index 0000000..f7c8063
--- /dev/null
+++ b/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "PackageKit package management abstraction"
+SECTION = "libs"
+LICENSE = "GPL-2.0+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+DEPENDS = "gtk+ python polkit dbus dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native"
+RDEPENDS_${PN} = "opkg"
+
+inherit gnome pythonnative
+
+SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz;name=archive \
+           file://configurefix.patch \
+           file://opkgfixes.patch"
+
+SRC_URI[archive.md5sum] = "6c8d9c48e21b82abeea15c3fd5066242"
+SRC_URI[archive.sha256sum] = "0eafd1be5516a41ebc0f0c3acff0b0763da105a4178b5eee0ff16d66ccd04408"
+
+S = "${WORKDIR}/PackageKit-${PV}"
+
+EXTRA_OECONF = "--with-security-framework=dummy \
+                --with-default-backend=opkg \
+                --enable-opkg \
+                --disable-tests \
+                --disable-ruck \
+                --disable-qt \
+                --disable-gstreamer-plugin \
+                --disable-local  \
+                --disable-networkmanager \
+                ac_cv_path_XMLTO=no \
+                "
+
+#do_configure_prepend() {
+#	mkdir -p m4
+#	echo "EXTRA_DIST=" > gtk-doc.make
+#}
+
+do_configure_append() {
+	for i in $(find . -name Makefile) ; do
+	        sed -i -e s:${STAGING_DIR_NATIVE}::g \
+               -e s:${bindir}/mkdir:${STAGING_BINDIR_NATIVE}/mkdir:g \
+               -e s:/usr/bin/intltool-merge:${STAGING_BINDIR_NATIVE}/intltool-merge:g \
+	$i
+	done
+}
+
+PACKAGES =+ "${PN}-website"
+FILES_${PN}-website = "${datadir}/PackageKit/website"
+
+PACKAGES =+ "${PN}-python"
+FILES_${PN}-python = "${libdir}/python*"
+
+PACKAGES =+ "${PN}-gtkmodule"
+FILES_${PN}-gtkmodule = "${libdir}/gtk-2.0/*/*.so"
+
+FILES_${PN} += "${libdir}/packagekit-backend/*.so ${libdir}/pm-utils ${datadir}/dbus-1/system-services/ ${datadir}/PolicyKit ${datadir}/PackageKit"
+FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so ${libdir}/gtk-2.0/*/.debug"
+FILES_${PN}-dev += "${libdir}/packagekit-backend/*.la ${libdir}/gtk-2.0/*/*.la"
+FILES_${PN}-staticdev += "${libdir}/packagekit-backend/*.a ${libdir}/gtk-2.0/*/*.a"
-- 
1.8.0

[PATCHv2 85/90] qwt: fix unpackaged files

[Martin Jansa]

* fixes:
qwt-6.0.1: qwt: Files/directories were installed but not shipped
  /usr/features
  /usr/doc
  /usr/plugins
  /usr/features/qwtconfig.pri
  /usr/features/qwtmathml.prf
  /usr/features/qwt.prf
  /usr/plugins/designer
  /usr/plugins/designer/libqwt_designer_plugin.so
  /usr/plugins/designer/.debug
  /usr/plugins/designer/.debug/libqwt_designer_plugin.so

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb | 2 ++
 meta-oe/recipes-qt/qwt/qwt.inc        | 6 +++++-
 meta-oe/recipes-qt/qwt/qwt_6.0.1.bb   | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb b/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
index 7f0e43b..af9d956 100644
--- a/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
+++ b/meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
@@ -2,6 +2,8 @@ inherit qt4e
 
 require qwt.inc
 
+PR = "r1"
+
 SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c"
 SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2"
 
diff --git a/meta-oe/recipes-qt/qwt/qwt.inc b/meta-oe/recipes-qt/qwt/qwt.inc
index 50f4e2a..d9d47f0 100644
--- a/meta-oe/recipes-qt/qwt/qwt.inc
+++ b/meta-oe/recipes-qt/qwt/qwt.inc
@@ -22,6 +22,7 @@ do_install() {
     oe_runmake -e install
     install -d ${D}${datadir}/doc/${PN}
     mv ${D}${prefix}/doc/* ${D}${datadir}/doc/${PN}/
+    rmdir ${D}${prefix}/doc
     cd ${S}/examples
     install -d ${D}/${bindir}
     cd bin${QT_LIBINFIX}/
@@ -30,5 +31,8 @@ do_install() {
     done
 }
 
-PACKAGES_prepend = "${PN}-examples "
+PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins "
 FILES_${PN}-examples = "${bindir}/*"
+FILES_${PN}-features = "${prefix}/features"
+FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so"
+FILES_${PN}-dbg += "${prefix}/plugins/designer/.debug"
diff --git a/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb b/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb
index e7eb7b7..f38816a 100644
--- a/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb
+++ b/meta-oe/recipes-qt/qwt/qwt_6.0.1.bb
@@ -2,6 +2,8 @@ inherit qt4x11
 
 require qwt.inc
 
+PR = "r1"
+
 SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c"
 SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2"
 
-- 
1.8.0

[PATCH 86/90] vlc: disable kde-solid

[Martin Jansa]

* fixes:
  WARNING: QA Issue: vlc: Files/directories were installed but not shipped
  /usr/share/kde4
  /usr/share/kde4/apps
  /usr/share/kde4/apps/solid
  /usr/share/kde4/apps/solid/actions
  /usr/share/kde4/apps/solid/actions/vlc-opendvd.desktop
  /usr/share/kde4/apps/solid/actions/vlc-openvcd.desktop
  /usr/share/kde4/apps/solid/actions/vlc-opencda.desktop

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-multimedia/vlc/vlc.inc       | 2 +-
 meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-oe/recipes-multimedia/vlc/vlc.inc
index 7353f90..1ccda70 100644
--- a/meta-oe/recipes-multimedia/vlc/vlc.inc
+++ b/meta-oe/recipes-multimedia/vlc/vlc.inc
@@ -62,6 +62,7 @@ EXTRA_OECONF = "\
 	--enable-dbus \
 	--disable-hal \	
 	--without-contrib \
+	--without-kde-solid \
 	--disable-opengl --disable-glx \
 	--enable-realrtsp \
 	ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
@@ -82,4 +83,3 @@ do_configure() {
 	sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
 	sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
 }
-
diff --git a/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb b/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb
index 6ef0b6b..7bb6b16 100644
--- a/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb
+++ b/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
 
 require vlc.inc
 
-PR = "r2"
+PR = "r3"
 
 # work around build failure
 EXTRA_OECONF += " --enable-libxml2=no"
-- 
1.8.0

[PATCH 87/90] vlc: add fluidsynth and alsa-lib to DEPENDS for reproducible builds

[Martin Jansa]

* fluidsynth can be autodetected

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-multimedia/vlc/vlc.inc       | 2 +-
 meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-oe/recipes-multimedia/vlc/vlc.inc
index 1ccda70..00d8663 100644
--- a/meta-oe/recipes-multimedia/vlc/vlc.inc
+++ b/meta-oe/recipes-multimedia/vlc/vlc.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.videolan.org"
 LICENSE = "GPLv2"
 SECTION = "multimedia"
 
-DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm \
+DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
 
 SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
diff --git a/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb b/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb
index 7bb6b16..11ecaa4 100644
--- a/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb
+++ b/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
 
 require vlc.inc
 
-PR = "r3"
+PR = "r4"
 
 # work around build failure
 EXTRA_OECONF += " --enable-libxml2=no"
-- 
1.8.0

[PATCH 88/90] openbox: fix PR format and use new update-alternatives syntax

[Martin Jansa]

* fixes:
  NOTE: recipe openbox-3.5.0-1: task do_package: Started
  WARNING: openbox: Use of ALTERNATIVE_NAME is deprecated, see
  update-alternatives.bbclass for more info.
* bump PE if you care about upgrade path from wrong PR, introduced in
  commit 3becce8504033dfac7c497fa12675f873a5df9e0
  Author: Mario Domenech Goulart <mario@ossystems.com.br>
  Date:   Mon Dec 3 16:03:23 2012 +0000

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb b/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb
index a2c5a66..1fe2e17 100644
--- a/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb
+++ b/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb
@@ -9,14 +9,13 @@ SRC_URI = "http://icculus.org/openbox/releases/openbox-${PV}.tar.gz"
 SRC_URI[md5sum] = "00441b53cf14c03566c8e82643544ff9"
 SRC_URI[sha256sum] = "6fa90016530b3aa6102e254079461977439398531fb23e7ec076ff2c140fea0a"
 
-PR = "1"
+PR = "r2"
 
 inherit autotools gettext update-alternatives
 
-ALTERNATIVE_PATH = "${bindir}/openbox"
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "10"
+ALTERNATIVE_${PN}-core = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/openbox"
+ALTERNATIVE_PRIORITY[x-window-manager] = "10"
 
 EXTRA_OECONF += "--with-plugins=none"
 
-- 
1.8.0

[PATCH 89/90] fluidsynth: upgrade to 1.1.1

[Martin Jansa]

* and drop special do_configure, now with libtool working with sysroot
  argument, we need this otherwise libfluidsynth.la references
  /usr/lib/libasound.la directly instead of =/usr/lib/libasound.la and
  e.g. vlc build fails

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../fluidsynth/{fluidsynth_1.0.8.bb => fluidsynth_1.1.1.bb}    | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
 rename meta-multimedia/recipes-multimedia/fluidsynth/{fluidsynth_1.0.8.bb => fluidsynth_1.1.1.bb} (62%)

diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.0.8.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.1.bb
similarity index 62%
rename from meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.0.8.bb
rename to meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.1.bb
index f5d6e53..a989e76 100644
--- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.0.8.bb
+++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.1.bb
@@ -7,13 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dda26baa823649da9a68947707650272"
 DEPENDS = "alsa-lib ncurses"
 
 SRC_URI = "http://savannah.nongnu.org/download/fluid/${P}.tar.gz"
-SRC_URI[md5sum] = "e2abfd2e69fd8b28d965df968d7d44ee"
-SRC_URI[sha256sum] = "45e7c9967d0fb0344f4da539ab343fb979384b36a429a8594c94cf466dff4320"
+SRC_URI[md5sum] = "0db3da78028d255026230809c6e21b44"
+SRC_URI[sha256sum] = "55638cb04f39f4df76c081e22ca7feeea58ddd20ebf779a7db2d38b1ff374cd6"
 
 inherit autotools pkgconfig lib_package
-
-#Has broken libtool usage
-do_configure() {
-	gnu-configize
-	oe_runconf
-}
-- 
1.8.0

[PATCH 90/90] gcalctool: upgrade to 5.32.0

[Martin Jansa]

* 5.8.17 required scrollkeeper which we don't provide as scrollkeeper-native
* inherit gsettings to package glib-2.0/shemas and compile them on target
* add LICENSE version and LIC_FILES_CHKSUM
* use SHRT_VER
* replace local patch with sed (other chunk is already resolved upstream)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb | 18 ++++++++++++++++++
 meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb | 15 ---------------
 2 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb
 delete mode 100644 meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb

diff --git a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb
new file mode 100644
index 0000000..88cf1d6
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "gcalctool is a powerful calculator"
+SECTION = "x11"
+DEPENDS = "gtk+ gnome-doc-utils"
+
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
+SRC_URI = "http://download.gnome.org/sources/${PN}/${SHRT_VER}/${PN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "48db927c6e7ee1d5395f953a8c184c98"
+SRC_URI[sha256sum] = "346f645c0fdef900642f6e9a2c18e7ba9a7ca9bc62fe2b08eb418f065a425c89"
+
+inherit autotools pkgconfig gsettings
+
+do_configure_prepend() {
+	sed -i -e "s: help: :g" ${S}/Makefile.am
+}
diff --git a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
deleted file mode 100644
index 61b28e4..0000000
--- a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11"
-DEPENDS = "gtk+ gnome-doc-utils"
-DESCRIPTION = "gcalctool is a powerful calculator"
-PR = "r0"
-
-SRC_URI = "http://download.gnome.org/sources/${PN}/5.8/${PN}-${PV}.tar.gz \
-	file://fix-includedir.patch"
-
-SRC_URI[md5sum] = "dd9d4f326d7d925a5ad9fbb1c5b32142"
-SRC_URI[sha256sum] = "8806e7696eeee62f2df21135fc488ba99f7d55dfd2a40bb9615e2edd95391589"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-gnome"
-- 
1.8.0

[PATCH 00/90] [meta-oe] Small fixes from bitbake world - updated cover letter

[Martin Jansa]

As builder was finishing more recipes in world build, I've 
added few more commits to this branch and also sent some v2

Here is updated cover letter.

I've also forget to set [meta-oe] prefix for individual commits, 
only cover letter has it, but I guess that nobody will try to apply
90 commits from patchwork.. and merging this branch should work fine.

The following changes since commit 9c2eee256d52e7ee40163542381d8d2691bd5bfe:

  Revert "qt4: rename bbappends to match new 4.8.4 version from oe-core" (2012-12-10 11:48:15 +0100)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib jansa/pull
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Martin Jansa (89):
  e-base.bbclass: bump EFL_SRCREV for E17 alpha6
  e-base.bbclass: bump EFL_SRCREV for E17 alpha7
  vpnc: import from OE-classic
  fluidsynth: import from OE-Classic
  packagekit: import from OE-Classic
  pyrtm: import from OE-Classic
  usb-modeswitch-data: upgrade to 20121109
  usb-modeswitch: upgrade to 1.2.5
  cheese: rename eds-dbus to evolution-data-server in DEPENDS
  gnome-terminal: add SRC_URI checksums
  libnotify3: add SRC_URI checksum
  gcalctool: add SRC_URI checksums
  libgtkstylus: add SRC_URI checksums
  qconnman: update git repo URL
  edje-viewer: add LIC_FILES_CHKSUM and drop BSD from LICENSE
  uptime: add LIC_FILES_CHKSUM
  forecast: add LIC_FILES_CHKSUM
  cpu: add LIC_FILES_CHKSUM
  diskio: add LIC_FILES_CHKSUM
  exquisite: add LIC_FILES_CHKSUM
  ephoto: update LICENSE and LIC_FILES_CHKSUM
  exalt: fix LICENSE and add LIC_FILES_CHKSUM
  news: fix LICENSE and add LIC_FILES_CHKSUM
  flame: add LIC_FILES_CHKSUM
  rain: add LIC_FILES_CHKSUM
  libeweather: add LIC_FILES_CHKSUM
  epeg: add LIC_FILES_CHKSUM
  xorg-sgml-doctools: add LIC_FILES_CHKSUM
  engrave: add LIC_FILES_CHKSUM
  edb: add LIC_FILES_CHKSUM
  gnome-terminal: add LICENSE version and LIC_FILES_CHKSUM
  notification: remove recipe, notification module is now part of e-wm
  waker: remove recipe, source was removed in r70549
  elementary-alarm: remove recipe, source was removed in r70549
  epdfview: move from meta-efl to meta-gnome
  gnome-vfs: fix QA warnings in packaging
  fuse: remove /dev/fuse in do_install_append
  libbonobo: fix QA warnings in packaging
  gnome/libgnomecanvas: delete, there is newer version in
    libgnome/libgnomecanvas
  libgnomecanvas: fix QA warnings from packaging
  libgnome: fix QA warnings from packaging
  libbonoboui: fix QA warnings from packaging
  libgnomeui: fix QA warnings from packaging
  pcsc-lite: add bbappend in meta-systemd
  entrance: rename xserver-nodm.service to entrance.service so it does
    not conflict with xserver-nodm-init in sysroot
  systemd: add PACKAGES_DYNAMIC
  exalt-client: add LIC_FILES_CHKSUM
  systemd: reenable python and add python-systemd-journald
  xf86-input-void: fix SRC_URI checksums
  lightmediascaner: move .a files from PN-dev to PN-staticdev
  tangogps: fix doc instalation
  lightmediascaner: move .a files from PN-dev to PN-staticdev
  gvim: fix unpackaged files QA warning
  libcanberra: package also gtk-3.0 if it gets built
  lua5.1: fix packaging QA warnings
  util-linux: add meta-systemd bbappend for new version which installs
    uuidd.service and socket
  eject: drop 2nd LICENSE field
  eject: use new update-alternatives and add u-a for eject
  libcanberra: skip dev-so QA for PN-gtk
  python-twisted: fix packaging QA warnings
  e-base.bbclass: bump EFL_SRCREV for E17 alpha8
  enjoy: depend on edbus2
  python-efl: fix do_configure_prepend to be reentrant
  samba: remove empty /sbin
  gpm: include /usr/share/emacs/site-lisp in PN
  desktop-file-utils: don't build
    /usr/share/emacs/site-lisp/desktop-entry-mode.el
  systemd: add target python to depends
  vim-tiny: package /usr/share/vim in PN-data
  efl.bbclass: fix FILES for PN-staticdev
  exalt-client: fix FILES for PN-staticdev
  gnome-disk-utility: disable failing docs generation
  gnome-disk-utility: fix unpackaged files
  gnome-session: disable failing docs generation
  gdm: disable failing docs generation
  cheese: disable scrollkeeper
  gnome-themes: fix path to icon-name-mapping
  cheese: disable help build
  gnome-mplayer: fix unpackaged files warning
  libwmf: fix QA warnings
  gateone: fix unpackaged files
  lmbench: fix unpackaged files
  xdotool: fix unpackaged files
  libxml++: fix unpackaged files
  qwt: fix unpackaged files
  vlc: disable kde-solid
  vlc: add fluidsynth and alsa-lib to DEPENDS for reproducible builds
  openbox: fix PR format and use new update-alternatives syntax
  fluidsynth: upgrade to 1.1.1
  gcalctool: upgrade to 5.32.0

Samuel Stirtzel (1):
  maliit-plugins: Don't build the documentation as it requires Doxygen

 meta-efl/classes/e-base.bbclass                    |   2 +-
 meta-efl/classes/efl.bbclass                       |   4 +-
 meta-efl/recipes-devtools/python/python-efl.inc    |   4 +-
 meta-efl/recipes-efl/e17/cpu_svn.bb                |   3 +
 meta-efl/recipes-efl/e17/diskio_svn.bb             |   7 +-
 meta-efl/recipes-efl/e17/edje-viewer_svn.bb        |   5 +-
 meta-efl/recipes-efl/e17/elementary-alarm_svn.bb   |  17 -
 meta-efl/recipes-efl/e17/enjoy_svn.bb              |   2 +-
 meta-efl/recipes-efl/e17/ephoto_svn.bb             |   6 +-
 meta-efl/recipes-efl/e17/exalt-client_svn.bb       |   6 +-
 meta-efl/recipes-efl/e17/exalt_svn.bb              |   4 +-
 meta-efl/recipes-efl/e17/exquisite_svn.bb          |   1 +
 meta-efl/recipes-efl/e17/flame_svn.bb              |   3 +
 meta-efl/recipes-efl/e17/forecasts_svn.bb          |   3 +
 meta-efl/recipes-efl/e17/news_svn.bb               |   7 +-
 meta-efl/recipes-efl/e17/notification_svn.bb       |  13 -
 meta-efl/recipes-efl/e17/rain_svn.bb               |   4 +
 meta-efl/recipes-efl/e17/uptime_svn.bb             |   3 +
 meta-efl/recipes-efl/e17/waker_svn.bb              |  17 -
 meta-efl/recipes-efl/efl/edb_svn.bb                |   3 +
 meta-efl/recipes-efl/efl/engrave_svn.bb            |   1 +
 meta-efl/recipes-efl/efl/epeg_svn.bb               |   3 +
 meta-efl/recipes-efl/efl/libeweather_svn.bb        |   5 +-
 .../lightmediascanner/lightmediascanner_0.4.4.bb   |   3 +-
 meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb    |   9 +-
 .../epdfview}/epdfview/browser_command.patch       |   0
 .../epdfview}/epdfview/fix-format.patch            |   0
 .../epdfview}/epdfview/glib-single-include.patch   |   0
 .../epdfview}/epdfview/swap-colors.patch           |   0
 .../recipes-apps/epdfview}/epdfview_0.1.8.bb       |   0
 .../gnome-mplayer/gnome-mplayer_1.0.5.bb           |   7 +
 meta-gnome/recipes-gnome/bonobo/libbonobo.inc      |   4 +-
 .../recipes-gnome/bonobo/libbonobo_2.24.3.bb       |   2 +
 .../recipes-gnome/bonobo/libbonoboui_2.24.3.bb     |   5 +-
 .../desktop-file-utils/desktop-file-utils_0.18.bb  |   4 +
 .../recipes-gnome/gcalctool/gcalctool_5.32.0.bb    |  18 +
 .../recipes-gnome/gcalctool/gcalctool_5.8.17.bb    |  12 -
 meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb         |   8 +-
 .../gnome-disk-utility_2.32.0.bb                   |   9 +-
 .../gnome-session/gnome-session_2.32.1.bb          |   6 +-
 .../recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb    |  11 +-
 .../recipes-gnome/gnome/gnome-terminal_2.26.3.bb   |   5 +-
 .../recipes-gnome/gnome/libgnomecanvas_2.20.0.bb   |  14 -
 .../recipes-gnome/libgnome/libgnome_2.32.1.bb      |   6 +-
 .../libgnome/libgnomecanvas_2.26.0.bb              |   5 +-
 meta-gnome/recipes-gnome/libgnome/libgnomeui.inc   |   3 +-
 .../recipes-gnome/libgnome/libgnomeui_2.24.3.bb    |   2 +
 .../recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb |   8 +-
 .../recipes-gnome/libnotify/libnotify3_0.7.3.bb    |   2 +
 .../recipes-gnome/themes/gnome-themes_2.32.1.bb    |   4 +-
 .../fluidsynth/fluidsynth_1.1.1.bb                 |  13 +
 .../recipes-connectivity/vpnc/vpnc/default.conf    |  19 +
 .../recipes-connectivity/vpnc/vpnc/long-help       | 168 ++++++++
 .../recipes-connectivity/vpnc/vpnc/makeman.patch   |  11 +
 .../vpnc/vpnc/vpnc-install.patch                   |  35 ++
 .../recipes-connectivity/vpnc/vpnc_0.5.3.bb        |  30 ++
 .../recipes-benchmark/lmbench/lmbench_3.0-a9.bb    |   7 +-
 .../recipes-connectivity/gateone/gateone_git.bb    |   6 +-
 meta-oe/recipes-connectivity/samba/samba.inc       |   1 +
 meta-oe/recipes-connectivity/samba/samba_3.6.8.bb  |   2 +-
 meta-oe/recipes-core/libxml/libxml++_2.35.3.bb     |   6 +-
 .../libcanberra/libcanberra_0.26.bb                |   9 +-
 meta-oe/recipes-devtools/lua/lua5.1_5.1.4.bb       |   6 +-
 .../packagekit/packagekit-0.5.6/configurefix.patch |  13 +
 .../packagekit/packagekit-0.5.6/opkgfixes.patch    | 422 +++++++++++++++++++++
 .../packagekit/packagekit_0.5.6.bb                 |  57 +++
 meta-oe/recipes-devtools/python/pyrtm_0.2.bb       |  12 +
 .../python/python-twisted_10.2.0.bb                |   6 +-
 meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb  |   5 +-
 meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb  |   9 +-
 .../xdotool/xdotool_1.20100416.2809.bb             |   4 +-
 .../xorg-doc/xorg-sgml-doctools_1.7.bb             |   2 +
 .../xorg-driver/xf86-input-void_1.4.0.bb           |   4 +-
 meta-oe/recipes-multimedia/vlc/vlc.inc             |   4 +-
 meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb       |   2 +-
 .../recipes-navigation/tangogps/tangogps_0.99.4.bb |   6 +-
 meta-oe/recipes-qt/qconnman/qconnman.inc           |   2 +-
 meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb              |   2 +
 meta-oe/recipes-qt/qwt/qwt.inc                     |   6 +-
 meta-oe/recipes-qt/qwt/qwt_6.0.1.bb                |   2 +
 meta-oe/recipes-support/eject/eject_2.1.5.bb       |  16 +-
 meta-oe/recipes-support/fuse/fuse_2.9.2.bb         |   6 +
 meta-oe/recipes-support/gpm/gpm_1.99.7.bb          |   3 +
 .../recipes-support/maliit/maliit-plugins_git.bb   |   1 +
 ...20120120.bb => usb-modeswitch-data_20121109.bb} |   4 +-
 ...usbmodeswitch-leave-stripping-to-packager.patch |   7 +-
 ...modeswitch-leave-script-munging-to-recipe.patch |  16 +-
 ...modeswitch_1.2.2.bb => usb-modeswitch_1.2.5.bb} |   6 +-
 meta-oe/recipes-support/vim/gvim_7.2.446.bb        |   4 +
 meta-oe/recipes-support/vim/vim-tiny_7.2.446.bb    |   6 +
 .../{xserver-nodm.service => entrance.service}     |   0
 .../meta-efl/recipes-efl/efl/entrance_svn.bbappend |   4 +-
 .../pcsc-lite/pcsc-lite_1.8.6.bbappend             |   6 +
 .../util-linux/util-linux_2.22.1.bbappend          |   8 +
 meta-systemd/recipes-core/systemd/systemd_git.bb   |  25 +-
 95 files changed, 1061 insertions(+), 192 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/e17/elementary-alarm_svn.bb
 delete mode 100644 meta-efl/recipes-efl/e17/notification_svn.bb
 delete mode 100644 meta-efl/recipes-efl/e17/waker_svn.bb
 rename {meta-efl/recipes-efl/efl => meta-gnome/recipes-apps/epdfview}/epdfview/browser_command.patch (100%)
 rename {meta-efl/recipes-efl/efl => meta-gnome/recipes-apps/epdfview}/epdfview/fix-format.patch (100%)
 rename {meta-efl/recipes-efl/efl => meta-gnome/recipes-apps/epdfview}/epdfview/glib-single-include.patch (100%)
 rename {meta-efl/recipes-efl/efl => meta-gnome/recipes-apps/epdfview}/epdfview/swap-colors.patch (100%)
 rename {meta-efl/recipes-efl/efl => meta-gnome/recipes-apps/epdfview}/epdfview_0.1.8.bb (100%)
 create mode 100644 meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb
 delete mode 100644 meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
 delete mode 100644 meta-gnome/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb
 create mode 100644 meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.1.bb
 create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/default.conf
 create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/long-help
 create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch
 create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch
 create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
 create mode 100644 meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch
 create mode 100644 meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch
 create mode 100644 meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb
 create mode 100644 meta-oe/recipes-devtools/python/pyrtm_0.2.bb
 rename meta-oe/recipes-support/usb-modeswitch/{usb-modeswitch-data_20120120.bb => usb-modeswitch-data_20121109.bb} (74%)
 rename meta-oe/recipes-support/usb-modeswitch/{usb-modeswitch_1.2.2.bb => usb-modeswitch_1.2.5.bb} (78%)
 rename meta-systemd/meta-efl/recipes-efl/efl/entrance/{xserver-nodm.service => entrance.service} (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend
 create mode 100644 meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.1.bbappend

-- 
1.8.0

Re: [PATCH 00/90] [meta-oe] Small fixes from bitbake world - updated cover letter

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 11-12-12 02:04, Martin Jansa schreef:
> As builder was finishing more recipes in world build, I've added few
> more commits to this branch and also sent some v2
> 
> Here is updated cover letter.
> 
> I've also forget to set [meta-oe] prefix for individual commits, only 
> cover letter has it, but I guess that nobody will try to apply 90
> commits from patchwork.. and merging this branch should work fine.

Any objections to merging this branch?

regards,

Koen

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQxyfYMkyGM64RGpERAhOLAKCQ2vv9rVzVNoSz50ksLUOAsoCHBACglP9W
mzczz75UjbOeTYyWDEm1IOA=
=Fgp7
-----END PGP SIGNATURE-----

Re: [PATCH 00/90] [meta-oe] Small fixes from bitbake world - updated cover letter

[Paul Eggleton]

On Tuesday 11 December 2012 13:32:24 Koen Kooi wrote:
> Op 11-12-12 02:04, Martin Jansa schreef:
> > As builder was finishing more recipes in world build, I've added few
> > more commits to this branch and also sent some v2
> > 
> > Here is updated cover letter.
> > 
> > I've also forget to set [meta-oe] prefix for individual commits, only
> > cover letter has it, but I guess that nobody will try to apply 90
> > commits from patchwork.. and merging this branch should work fine.
> 
> Any objections to merging this branch?

The vpnc recipe could do with a bit of cleanup but nothing major, so it can 
wait until after this is merged. Other than that it all looks good to me, 
FWIW.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 88/90] openbox: fix PR format and use new update-alternatives syntax

[Otavio Salvador]

On Mon, Dec 10, 2012 at 11:00 PM, Martin Jansa <martin.jansa@gmail.com>wrote:

> * fixes:
>   NOTE: recipe openbox-3.5.0-1: task do_package: Started
>   WARNING: openbox: Use of ALTERNATIVE_NAME is deprecated, see
>   update-alternatives.bbclass for more info.
> * bump PE if you care about upgrade path from wrong PR, introduced in
>   commit 3becce8504033dfac7c497fa12675f873a5df9e0
>   Author: Mario Domenech Goulart <mario@ossystems.com.br>
>   Date:   Mon Dec 3 16:03:23 2012 +0000
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

Eric, please add it to danny as well. This was not catch by me when
reviewing Mario's patch. Sorry.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br