Patchwork [meta-oe/meta-gnome,14/15] gnome-panel: let gconf.bblass take care for postinst

login
register
mail settings
Submitter Andreas Müller
Date May 7, 2013, 10:41 p.m.
Message ID <1367966513-12566-15-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/49515/
State Accepted, archived
Commit 96d7340da6a0eba20cd2e62175daa244c63bcd12
Headers show

Comments

Andreas Müller - May 7, 2013, 10:41 p.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../gnome-panel/gnome-panel_2.32.1.bb              |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

Patch

diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb
index c4465a5..6abf73e 100644
--- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb
@@ -7,11 +7,11 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 
 SECTION = "x11/gnome"
 
-PR = "r6"
+PR = "r7"
 
 DEPENDS = "gnome-doc-utils-native gconf glib-2.0 gnome-desktop gtk+ pango libwnck gnome-menus cairo libgweather dbus-glib librsvg libcanberra" 
 
-inherit gtk-doc gnome gettext pkgconfig
+inherit gtk-doc gnome gettext pkgconfig gconf
 
 SRCREV = "6a364b6a4a9beed3da9ca6f5b0dac81eb99dea2a"
 SRC_URI = "git://git.gnome.org/gnome-panel;branch=gnome-2-32"
@@ -26,14 +26,6 @@  do_configure_prepend() {
     sed -i -e s:^#!@PYTHON@:#!/usr/bin/python: ${S}/gnome-panel/gnome-panel-add.in
 }
 
-pkg_postinst_${PN}_append () {
-if [ -n "$D" ]; then
-    exit 1
-fi
-    gconftool-2 --config-source=xml:readwrite:${sysconfdir}/gconf/gconf.xml.defaults \
-        --direct --load ${sysconfdir}/gconf/schemas/panel-default-setup.entries
-}
-
 PACKAGES =+ "libpanel-applet"
 FILES_libpanel-applet = "${libdir}/libpanel-applet-*.so.*"
 
@@ -43,5 +35,3 @@  FILES_${PN} =+ "${datadir}/gnome* \
                 ${datadir}/PolicyKit \
                 ${libdir}/bonobo \
 "
-
-