[oe-commits] org.oe.dev gnome-desktop: unify

[Laibsch commit]

gnome-desktop: unify

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: fe513c8d9f2286316d7941c072c015b9fb3b9f88
ViewMTN: http://monotone.openembedded.org/revision/info/fe513c8d9f2286316d7941c072c015b9fb3b9f88
Files:
1
packages/gnome/gnome-desktop_2.18.3.bb
packages/gnome/gnome-desktop.inc
packages/gnome/gnome-desktop_2.10.2.bb
packages/gnome/gnome-desktop_2.16.1.bb
packages/gnome/gnome-desktop_2.7.90.bb
Diffs:

#
# mt diff -r962630b301994997d7dca0a59b6bcb7ce61df4d3 -rfe513c8d9f2286316d7941c072c015b9fb3b9f88
#
# 
# 
# rename "packages/gnome/gnome-desktop_2.18.3.bb"
#     to "packages/gnome/gnome-desktop.inc"
# 
# add_file "packages/gnome/gnome-desktop_2.18.3.bb"
#  content [6079856c781ba60fdff12f64b4d1588ca08852a5]
# 
# patch "packages/gnome/gnome-desktop.inc"
#  from [ef92f7acaa754891bf23e36646e9c3faa46a8a6c]
#    to [ae7d1f621863cadbef05eb1f7f7f0ff5238b949f]
# 
# patch "packages/gnome/gnome-desktop_2.10.2.bb"
#  from [9d8ed2560882aa4b8ce7f82115ed70e10d71a9b8]
#    to [2b20274d9d555579cc1aaecf3ab56ea30fb774d0]
# 
# patch "packages/gnome/gnome-desktop_2.16.1.bb"
#  from [565cba914027dd074428c1510c94057850e452ca]
#    to [fc823971f8fe85496ba395eb5ad6871d6d4434e6]
# 
# patch "packages/gnome/gnome-desktop_2.7.90.bb"
#  from [672cf3775b27ea7c0ca4479a528992bf28309f93]
#    to [306e90595f3048833eace7255a0575e0ff9bd465]
# 
============================================================
--- packages/gnome/gnome-desktop_2.18.3.bb	6079856c781ba60fdff12f64b4d1588ca08852a5
+++ packages/gnome/gnome-desktop_2.18.3.bb	6079856c781ba60fdff12f64b4d1588ca08852a5
@@ -0,0 +1,10 @@
+require gnome-desktop.inc
+
+PR = "r2"
+
+inherit gnome pkgconfig
+
+DEPENDS += "gnome-doc-utils gnome-vfs"
+
+SRC_URI += "file://scrollkeeper.patch;patch=1 \
+            file://no-desktop-docs.patch;patch=1;pnum=0"
============================================================
--- packages/gnome/gnome-desktop_2.18.3.bb	ef92f7acaa754891bf23e36646e9c3faa46a8a6c
+++ packages/gnome/gnome-desktop.inc	ae7d1f621863cadbef05eb1f7f7f0ff5238b949f
@@ -1,23 +1,16 @@
-LICENSE = "GPL"
+DESCRIPTION = "GNOME library for reading .desktop files"
 SECTION = "x11/gnome"
-PR = "r2"
-DESCRIPTION = "GNOME library for reading .desktop files"
-inherit gnome pkgconfig
+LICENSE = "GPL"
+DEPENDS = "gnome-common libgnomeui"
 
-DEPENDS = "gnome-common gnome-doc-utils gnome-vfs libgnomeui"
-
-SRC_URI += "file://scrollkeeper.patch;patch=1 \
-            file://no-desktop-docs.patch;patch=1;pnum=0"
-
 EXTRA_OECONF = "--disable-scrollkeeper"
 
 do_configure_prepend () {
 	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
 }
 
-FILES_${PN} += "${datadir}/gnome-about"
-
-
 do_stage () {
 	autotools_stage_all
 }
+
+FILES_${PN} += "${datadir}/gnome-about"
============================================================
--- packages/gnome/gnome-desktop_2.10.2.bb	9d8ed2560882aa4b8ce7f82115ed70e10d71a9b8
+++ packages/gnome/gnome-desktop_2.10.2.bb	2b20274d9d555579cc1aaecf3ab56ea30fb774d0
@@ -1,17 +1,7 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
+require gnome-desktop.inc
+
 PR = "r1"
-DESCRIPTION = "GNOME library for reading .desktop files"
-inherit gnome pkgconfig
 
-DEPENDS = "gnome-common libgnomeui"
+inherit gnome pkgconfig
 
 EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
-
-do_configure_prepend () {
-	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
-}
-
-do_stage () {
-autotools_stage_all
-}
============================================================
--- packages/gnome/gnome-desktop_2.16.1.bb	565cba914027dd074428c1510c94057850e452ca
+++ packages/gnome/gnome-desktop_2.16.1.bb	fc823971f8fe85496ba395eb5ad6871d6d4434e6
@@ -1,25 +1,11 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
+require gnome-desktop.inc
+
 PR = "r2"
-DESCRIPTION = "GNOME library for reading .desktop files"
 inherit gnome pkgconfig
 
-DEPENDS = "gnome-common gnome-doc-utils libgnomeui"
+DEPENDS += "gnome-doc-utils"
 
 SRC_URI += "file://scrollkeeper.patch;patch=1 \
             file://no-desktop-docs.patch;patch=1;pnum=0"
 
-EXTRA_OECONF = "--disable-scrollkeeper"
-
 EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
-
-do_configure_prepend () {
-	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
-}
-
-FILES_${PN} += "${datadir}/gnome-about"
-
-
-do_stage () {
-	autotools_stage_all
-}
============================================================
--- packages/gnome/gnome-desktop_2.7.90.bb	672cf3775b27ea7c0ca4479a528992bf28309f93
+++ packages/gnome/gnome-desktop_2.7.90.bb	306e90595f3048833eace7255a0575e0ff9bd465
@@ -1,17 +1,12 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
+require gnome-desktop.inc
+
 PR = "r0"
-DESCRIPTION = "GNOME library for reading .desktop files"
-inherit gnome
 
-DEPENDS = "gnome-common libgnomeui"
+inherit gnome
 
+EXTRA_OECONF = ""
 EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
 
-do_configure_prepend () {
-	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
-}
-
 do_stage () {
 	install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnome/
 #	install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/