xfce: remove pkgconfig hacks and switch to autotools.bbclass, tweak packaging

diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass
index ecc00825bc418986c16bede52222ab3f61173ff6..c6ccc5fd2c41d7a3d99b59735a2fae72f67b7180 100644 (file)
--- a/classes/xfce.bbclass
+++ b/classes/xfce.bbclass
@@ -12,9 +12,15 @@ SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.bz2"
 
 inherit autotools
 
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
 EXTRA_OECONF += "--with-pluginsdir=${libdir}/xfce4/panel-plugins/"
 
 # FIXME:  Put icons in their own package too?
 
 FILES_${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*"
 FILES_${PN}-doc += "${datadir}/xfce4/doc"
+
+FILES_${PN}-dev += "${libdir}/xfce4/*/*.la"
+FILES_${PN}-dbg += "${libdir}/xfce4/*/.debug"
+

diff --git a/packages/xfce/exo_0.3.2.bb b/packages/xfce/exo_0.3.2.bb
index 6bf0e1292fa82d58025e9192514a731181735780..b48eeba645fad9d7a5907916c3df87db21ab7a97 100644 (file)
--- a/packages/xfce/exo_0.3.2.bb
+++ b/packages/xfce/exo_0.3.2.bb
@@ -1,7 +1,7 @@
 
 DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
 
-inherit pkgconfig xfce
+inherit  xfce
 
 SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/exo-0.3.2.tar.bz2"
 

diff --git a/packages/xfce/libxfce4mcs.inc b/packages/xfce/libxfce4mcs.inc
index 19268fc9b3b27701c056d920e73a6decbb2c26f8..6ecbc8db584b1635c7a7b5dd83fd6db29536b39b 100644 (file)
--- a/packages/xfce/libxfce4mcs.inc
+++ b/packages/xfce/libxfce4mcs.inc
@@ -1,12 +1,12 @@
 # libxfce4mcs OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 DESCRIPTION="Settings management library used by most XFce 4 modules"
 DEPENDS="libxfce4util"
 SECTION = "x11/libs"
 
-inherit xfce pkgconfig
+inherit xfce 
 
 do_stage() {
        install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs

diff --git a/packages/xfce/libxfce4mcs_4.4.1.bb b/packages/xfce/libxfce4mcs_4.4.1.bb
index 07d7a95ae17eb877d055700885c78202912ab71d..8e2d522962b9b1f303efe6af817ebe158e68b907 100644 (file)
--- a/packages/xfce/libxfce4mcs_4.4.1.bb
+++ b/packages/xfce/libxfce4mcs_4.4.1.bb
@@ -1,5 +1,5 @@
 # libxfce4mcs OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 require ${PN}.inc

diff --git a/packages/xfce/libxfce4util.inc b/packages/xfce/libxfce4util.inc
index d5dd6d65651dd812aef32792724c30bee1509b86..ee7b886f206621410f62732db3c9adcf9eb9c676 100644 (file)
--- a/packages/xfce/libxfce4util.inc
+++ b/packages/xfce/libxfce4util.inc
@@ -1,13 +1,13 @@
 # libxfce4util OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 DESCRIPTION = "Basic utility library for Xfce4"
 SECTION = "x11/libs"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 xfce4-dev-tools"
 
-inherit xfce pkgconfig
+inherit xfce 
 
 MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
 

diff --git a/packages/xfce/libxfce4util_4.4.1.bb b/packages/xfce/libxfce4util_4.4.1.bb
index 70f5ddac933e25a3e5102d97e15682bd2fd33e16..a53a83e86146fc25be5df7f1175d815fd3cc52d4 100644 (file)
--- a/packages/xfce/libxfce4util_4.4.1.bb
+++ b/packages/xfce/libxfce4util_4.4.1.bb
@@ -1,5 +1,5 @@
 # libxfce4util OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 require ${PN}.inc

diff --git a/packages/xfce/libxfcegui4.inc b/packages/xfce/libxfcegui4.inc
index 714e365af4aab73291dd7f1468e107b55e525a4f..1b7703abf90c5844fbe92920e38c6a1dee12ac7b 100644 (file)
--- a/packages/xfce/libxfcegui4.inc
+++ b/packages/xfce/libxfcegui4.inc
@@ -1,12 +1,12 @@
 # libxfcegui4 OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 DESCRIPTION = "XFCE Widget library and X Window System interaction"
 DEPENDS = "libxfce4util dbh libxml2 gtk+"
 SECTION = "x11/libs"
 
-inherit xfce pkgconfig
+inherit xfce 
 
 
 do_stage() {

diff --git a/packages/xfce/libxfcegui4_4.4.1.bb b/packages/xfce/libxfcegui4_4.4.1.bb
index 2def53685a8f95c5d82a52177075fb4ff850b85e..a36897f8220aa7864e915f44676e9afea9189cfa 100644 (file)
--- a/packages/xfce/libxfcegui4_4.4.1.bb
+++ b/packages/xfce/libxfcegui4_4.4.1.bb
@@ -1,5 +1,5 @@
 # libxfcegui4 OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 require ${PN}.inc

diff --git a/packages/xfce/xfce-mcs-manager.inc b/packages/xfce/xfce-mcs-manager.inc
index d90e82081e6af342913e7818d040ea1d715766e8..7a421a4086fbb7453612418a3e8ae24a4fac2b3f 100644 (file)
--- a/packages/xfce/xfce-mcs-manager.inc
+++ b/packages/xfce/xfce-mcs-manager.inc
@@ -1,25 +1,16 @@
 # xfce-mcs-manager OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 DESCRIPTION="XFCE4 Settings manager."
 DEPENDS="libxfcegui4 libxfce4mcs intltool-native"
 SECTION = "x11"
-PR = "r1"
+PR = "r2"
 
 inherit xfce 
 
 do_stage() {
-       install -d ${STAGING_INCDIR}/xfce4
-       install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager
-       install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager
+       autotools_stage_all
 }
 
-# xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live
-# the standard pkgconfig mangling was confusing us.  Mangling is not required
-# for this particular .pc, so the following will suffice:
 
-do_stage_append () {
-       install -d ${PKG_CONFIG_DIR}
-       sed -e 's:${includedir}:${STAGING_INCDIR}:;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_DIR}/xfce-mcs-manager.pc
-}

diff --git a/packages/xfce/xfce-mcs-manager_4.4.1.bb b/packages/xfce/xfce-mcs-manager_4.4.1.bb
index de5cf2b01280d943b62fdefe303bea9c554484bc..76e0452ad8236efe82ae7ab28223b52eb9fb8e43 100644 (file)
--- a/packages/xfce/xfce-mcs-manager_4.4.1.bb
+++ b/packages/xfce/xfce-mcs-manager_4.4.1.bb
@@ -1,5 +1,5 @@
 # xfce-mcs-manager OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 require ${PN}.inc

diff --git a/packages/xfce/xfce-mcs-plugins.inc b/packages/xfce/xfce-mcs-plugins.inc
index b5b4505e987052c5fc6fedbf7e62e459718e327a..80037841fa23f04854ce62db9ace2b193d47f4fc 100644 (file)
--- a/packages/xfce/xfce-mcs-plugins.inc
+++ b/packages/xfce/xfce-mcs-plugins.inc
@@ -1,6 +1,6 @@
 # xfce-mcs-plugins OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 DESCRIPTION = "Common XFCE4 configuration plugins."
 DEPENDS = "libxfcegui4 xfce-mcs-manager gtk+"

diff --git a/packages/xfce/xfce-mcs-plugins_4.4.1.bb b/packages/xfce/xfce-mcs-plugins_4.4.1.bb
index 02ad97e860b73f31b6fb45d609b4d56daa345b59..bd414587579cb070c568693666af600fc4a859aa 100644 (file)
--- a/packages/xfce/xfce-mcs-plugins_4.4.1.bb
+++ b/packages/xfce/xfce-mcs-plugins_4.4.1.bb
@@ -1,5 +1,5 @@
 # xfce-mcs-plugins OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 require ${PN}.inc

diff --git a/packages/xfce/xfce-utils.inc b/packages/xfce/xfce-utils.inc
index 0b191194d7d278402700e1a2152c1c5f62260bfe..d681fd7adbabdfa43a7c83de5960da9cc7335ca6 100644 (file)
--- a/packages/xfce/xfce-utils.inc
+++ b/packages/xfce/xfce-utils.inc
@@ -1,6 +1,6 @@
 # xfce-utils OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 DESCRIPTION="XFCE4 Utilities"
 DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager"

diff --git a/packages/xfce/xfce-utils_4.4.1.bb b/packages/xfce/xfce-utils_4.4.1.bb
index 57909f2c2d3d2159ae432a128922ffdb9adadbfc..fd41a609c2e75e3445095f188c9327ec5cca4fb4 100644 (file)
--- a/packages/xfce/xfce-utils_4.4.1.bb
+++ b/packages/xfce/xfce-utils_4.4.1.bb
@@ -1,6 +1,6 @@
 # xfce-utils OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 PR = "r1"
 require ${PN}.inc

diff --git a/packages/xfce/xfce4-appfinder.inc b/packages/xfce/xfce4-appfinder.inc
index 0d102f3bd0b0428d7426fd9999517abdfd9b4866..ddfa3e1e4e471d9410585c98287ed79c873bd778 100644 (file)
--- a/packages/xfce/xfce4-appfinder.inc
+++ b/packages/xfce/xfce4-appfinder.inc
@@ -1,6 +1,6 @@
 # xfce4-appfinder build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 DESCRIPTION="XFCE Application Finder"
 SECTION = "x11"

diff --git a/packages/xfce/xfce4-appfinder_4.4.1.bb b/packages/xfce/xfce4-appfinder_4.4.1.bb
index f7c97970d561d54148a252d3225c30b6b5839673..471122ea02f79865572d968dd904b48ba71e54dc 100644 (file)
--- a/packages/xfce/xfce4-appfinder_4.4.1.bb
+++ b/packages/xfce/xfce4-appfinder_4.4.1.bb
@@ -1,5 +1,5 @@
 # xfce4-appfinder build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 require ${PN}.inc

diff --git a/packages/xfce/xfce4-dev-tools.inc b/packages/xfce/xfce4-dev-tools.inc
index 03f64e39e58e2f766904c89ea54d4e5640fc8399..2116b1d4142b2b44adfc056d66561a4c0797a986 100644 (file)
--- a/packages/xfce/xfce4-dev-tools.inc
+++ b/packages/xfce/xfce4-dev-tools.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Xfce4 development tools"
 SECTION = "x11/libs"
 LICENSE = "GPL"
 
-inherit xfce pkgconfig
+inherit xfce 
 
 do_stage() {
        install -d ${STAGING_DATADIR}/aclocal

diff --git a/packages/xfce/xfce4-mixer.inc b/packages/xfce/xfce4-mixer.inc
index a923489f323216db5a8e0d191c37686ad81245b7..4d3faed14cf8a6547f4de025ee66f011bfe3cd97 100644 (file)
--- a/packages/xfce/xfce4-mixer.inc
+++ b/packages/xfce/xfce4-mixer.inc
@@ -1,6 +1,6 @@
 # xfce-mixer-plugin OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 DESCRIPTION="XFCE panel mixer plugin"
 SECTION = "x11"

diff --git a/packages/xfce/xfce4-mixer_4.4.1.bb b/packages/xfce/xfce4-mixer_4.4.1.bb
index 6dd3c0565b00394e943b5c856065bf19dae33a4d..13ba0f32e3e8744f97179088f09d47822f63d7c0 100644 (file)
--- a/packages/xfce/xfce4-mixer_4.4.1.bb
+++ b/packages/xfce/xfce4-mixer_4.4.1.bb
@@ -1,5 +1,5 @@
 # xfce-mixer-plugin OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 require ${PN}.inc

diff --git a/packages/xfce/xfce4-panel.inc b/packages/xfce/xfce4-panel.inc
index 6ad71fcf82647d45e8d5e339279a901b54f2e9ad..be7092ab9edab00447ae0fbd5ebd6668da48db02 100644 (file)
--- a/packages/xfce/xfce4-panel.inc
+++ b/packages/xfce/xfce4-panel.inc
@@ -1,12 +1,12 @@
 # xfce4-panel OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 DESCRIPTION = "XFCE4 Panel"
 SECTION = "x11"
 DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2"
 
-inherit pkgconfig xfce
+inherit  xfce
 
 EXTRA_OECONF += " --enable-startup-notification"
 

diff --git a/packages/xfce/xfce4-panel_4.4.1.bb b/packages/xfce/xfce4-panel_4.4.1.bb
index ae2abba28db46ce891a0656a2cc64a56a08b2aad..99194027c82830d1ae2f9865bc69fc28dfee387d 100644 (file)
--- a/packages/xfce/xfce4-panel_4.4.1.bb
+++ b/packages/xfce/xfce4-panel_4.4.1.bb
@@ -1,6 +1,6 @@
 # xfce4-panel OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 PR="r2"
 require ${PN}.inc

diff --git a/packages/xfce/xfdesktop.inc b/packages/xfce/xfdesktop.inc
index bd5bb7223caf420a571c5587770e391552718498..35c5ff5954ec78f032f65c0b86b91e8d0a682496 100644 (file)
--- a/packages/xfce/xfdesktop.inc
+++ b/packages/xfce/xfdesktop.inc
@@ -1,6 +1,6 @@
 # xfdesktop OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 DESCRIPTION="xfce4 Desktop Background Manager"
 SECTION = "x11/base"

diff --git a/packages/xfce/xfdesktop_4.4.1.bb b/packages/xfce/xfdesktop_4.4.1.bb
index 9c841501802746b5e72f6cd521cdd3e9bc0d17f3..fcc2f899914295d253fb1f4b31c5d775636656a4 100644 (file)
--- a/packages/xfce/xfdesktop_4.4.1.bb
+++ b/packages/xfce/xfdesktop_4.4.1.bb
@@ -1,6 +1,6 @@
 # xfdesktop OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 PR = "r2"
 require ${PN}.inc

diff --git a/packages/xfce/xfprint_4.4.1.bb b/packages/xfce/xfprint_4.4.1.bb
index 7e349ce881e029c118ecbeae38a126f165601a5b..19bfa0dde314e89a707f7503ff174827ef5afa79 100644 (file)
--- a/packages/xfce/xfprint_4.4.1.bb
+++ b/packages/xfce/xfprint_4.4.1.bb
@@ -1,6 +1,6 @@
 # xfprint OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 DESCRIPTION="XFCE4 Print Manager"
 SECTION = "x11/base"

diff --git a/packages/xfce/xfwm4-themes.inc b/packages/xfce/xfwm4-themes.inc
index c60edc5b83156549082e1fd0894dbb970e5977e2..63c5ab029680790027aeab77daf31f2a73d07824 100644 (file)
--- a/packages/xfce/xfwm4-themes.inc
+++ b/packages/xfce/xfwm4-themes.inc
@@ -1,6 +1,6 @@
 # xfwm4-themes OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 DESCRIPTION="XFCE4 Window Manager Themes"
 SECTION = "x11/wm"

diff --git a/packages/xfce/xfwm4-themes_4.4.1.bb b/packages/xfce/xfwm4-themes_4.4.1.bb
index 9f67ad2ed9532d41936f4bcc583e5e165edad291..c7f45d2b09259c61c660988dfd8716e8e351cdf8 100644 (file)
--- a/packages/xfce/xfwm4-themes_4.4.1.bb
+++ b/packages/xfce/xfwm4-themes_4.4.1.bb
@@ -1,5 +1,5 @@
 # xfwm4-themes OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 require ${PN}.inc

diff --git a/packages/xfce/xfwm4.inc b/packages/xfce/xfwm4.inc
index e443a841ae64da7edbf6689496823dde5a69e89b..211853aa18249a620879d990b8c3007be923b4a6 100644 (file)
--- a/packages/xfce/xfwm4.inc
+++ b/packages/xfce/xfwm4.inc
@@ -1,6 +1,6 @@
 # xfwm4 OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 DESCRIPTION="XFCE4 Window Manager"
 SECTION = "x11/wm"

diff --git a/packages/xfce/xfwm4_4.4.1.bb b/packages/xfce/xfwm4_4.4.1.bb
index 2fc47e641e70fcc302743e317133abcc7bde5bcf..a2bdf3557ec2e3d5b9e4fc110e555e5a7acf8156 100644 (file)
--- a/packages/xfce/xfwm4_4.4.1.bb
+++ b/packages/xfce/xfwm4_4.4.1.bb
@@ -1,6 +1,6 @@
 # xfwm4 OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+# Released under the MIT license (see COPYING.MIT)
 
 PR="r1"
 require ${PN}.inc