[oe-commits] org.oe.dev xserver-common: unify, clean up

[Laibsch commit]

xserver-common: unify, clean up

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: bdcb3d240662ee2deb3443ec573736ad9e723764
ViewMTN: http://monotone.openembedded.org/revision.psp?id=bdcb3d240662ee2deb3443ec573736ad9e723764
Files:
1
packages/xserver-common/xserver-common.inc
packages/xserver-common/xserver-common_1.10.bb
packages/xserver-common/xserver-common_1.11.bb
packages/xserver-common/xserver-common_1.12.bb
packages/xserver-common/xserver-common_1.13.bb
packages/xserver-common/xserver-common_1.3.bb
packages/xserver-common/xserver-common_1.8.bb
packages/xserver-common/xserver-common_1.9.bb
packages/xserver-common/xserver-common_svn.bb
Diffs:

#
# mt diff -r64b15a9853810301cc70c00822bc44ae18c56993 -rbdcb3d240662ee2deb3443ec573736ad9e723764
#
# 
# 
# add_file "packages/xserver-common/xserver-common.inc"
#  content [e64ebe6f8460b558e9fc67ba412c3fca1dec993a]
# 
# patch "packages/xserver-common/xserver-common_1.10.bb"
#  from [a1c8ba3861a9c2f635cc3bbe4ccca1e4d2061073]
#    to [fa3544548afd635817c9733608002684addfb57b]
# 
# patch "packages/xserver-common/xserver-common_1.11.bb"
#  from [cb043d76b8ecc045050658972fc7670fdb61ba24]
#    to [e6dcd2103e45d383e7414d341cf0a7c0a5be9cf2]
# 
# patch "packages/xserver-common/xserver-common_1.12.bb"
#  from [b44fb51faacdfbda8b24f6e0c8dc8aad1963057f]
#    to [cdeed82257e8f647bcb632d6d50add515c3f5fbf]
# 
# patch "packages/xserver-common/xserver-common_1.13.bb"
#  from [331531b70a1ed1a5919d376b1f30f9ba94a5927a]
#    to [22eed89043872aaa84cac299db81988143020e6c]
# 
# patch "packages/xserver-common/xserver-common_1.3.bb"
#  from [8aded830c9a1400107f4aeac0d28465c0e2b8f98]
#    to [9b25a56f332486e61d69c66c9d2f1ef5f4584631]
# 
# patch "packages/xserver-common/xserver-common_1.8.bb"
#  from [5b5d0df5bfc6ba968483a7ad3679672b1fe466f5]
#    to [68b405727d19c0a57078a1ecff0ee1fd20e387f5]
# 
# patch "packages/xserver-common/xserver-common_1.9.bb"
#  from [2eaee21f53f2466af7005a868e61bdc566e5f785]
#    to [302eb7c3a91b096cdac6a9472053fc79b0e0607d]
# 
# patch "packages/xserver-common/xserver-common_svn.bb"
#  from [32613571aefec5f05c61c0dbe5f238828f687ca6]
#    to [668c421c2657d8f316d97687a7f411645aaef79a]
# 
============================================================
--- packages/xserver-common/xserver-common.inc	e64ebe6f8460b558e9fc67ba412c3fca1dec993a
+++ packages/xserver-common/xserver-common.inc	e64ebe6f8460b558e9fc67ba412c3fca1dec993a
@@ -0,0 +1,9 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
============================================================
--- packages/xserver-common/xserver-common_1.10.bb	a1c8ba3861a9c2f635cc3bbe4ccca1e4d2061073
+++ packages/xserver-common/xserver-common_1.10.bb	fa3544548afd635817c9733608002684addfb57b
@@ -1,14 +1,7 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r2"
+require xserver-common.inc
 
-PACKAGE_ARCH = "all"
+PR = "r2"
 
-# we are using a gpe-style Makefile
-inherit gpe
-
 SRC_URI_append = " file://setDPI.sh \
 		   file://calibrate_zaurusd.patch;patch=1 \
 		   file://w100.patch;patch=1 \
============================================================
--- packages/xserver-common/xserver-common_1.11.bb	cb043d76b8ecc045050658972fc7670fdb61ba24
+++ packages/xserver-common/xserver-common_1.11.bb	e6dcd2103e45d383e7414d341cf0a7c0a5be9cf2
@@ -1,14 +1,5 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r0"
+require xserver-common.inc
 
-PACKAGE_ARCH = "all"
-
-# we are using a gpe-style Makefile
-inherit gpe
-
 SRC_URI_append = " file://setDPI.sh \
 		   file://calibrate_zaurusd.patch;patch=1 \
 		   file://w100.patch;patch=1 \
============================================================
--- packages/xserver-common/xserver-common_1.12.bb	b44fb51faacdfbda8b24f6e0c8dc8aad1963057f
+++ packages/xserver-common/xserver-common_1.12.bb	cdeed82257e8f647bcb632d6d50add515c3f5fbf
@@ -1,14 +1,7 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
+require xserver-common.inc
 
-PACKAGE_ARCH = "all"
+PR = "r1"
 
-# we are using a gpe-style Makefile
-inherit gpe
-
 SRC_URI_append = " file://setDPI.sh \
 	           file://rxvt-less-pink.diff;patch=1"
 
============================================================
--- packages/xserver-common/xserver-common_1.13.bb	331531b70a1ed1a5919d376b1f30f9ba94a5927a
+++ packages/xserver-common/xserver-common_1.13.bb	22eed89043872aaa84cac299db81988143020e6c
@@ -1,14 +1,7 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
+require xserver-common.inc
 
-PACKAGE_ARCH = "all"
+PR = "r1"
 
-# we are using a gpe-style Makefile
-inherit gpe
-
 SRC_URI_append = " file://setDPI.sh \
                    file://xserver-imageon.patch;patch=1"
 
============================================================
--- packages/xserver-common/xserver-common_1.3.bb	8aded830c9a1400107f4aeac0d28465c0e2b8f98
+++ packages/xserver-common/xserver-common_1.3.bb	9b25a56f332486e61d69c66c9d2f1ef5f4584631
@@ -1,11 +1,3 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
+require xserver-common.inc
 
+PR = "r1"
-PACKAGE_ARCH = "all"
-
-# we are using a gpe-style Makefile
-inherit gpe
-
============================================================
--- packages/xserver-common/xserver-common_1.8.bb	5b5d0df5bfc6ba968483a7ad3679672b1fe466f5
+++ packages/xserver-common/xserver-common_1.8.bb	68b405727d19c0a57078a1ecff0ee1fd20e387f5
@@ -1,14 +1,7 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r2"
+require xserver-common.inc
 
-PACKAGE_ARCH = "all"
+PR = "r2"
 
-# we are using a gpe-style Makefile
-inherit gpe
-
 SRC_URI_append = " file://setDPI.sh \
 		   file://calibrate_zaurusd.patch;patch=1"
 
============================================================
--- packages/xserver-common/xserver-common_1.9.bb	2eaee21f53f2466af7005a868e61bdc566e5f785
+++ packages/xserver-common/xserver-common_1.9.bb	302eb7c3a91b096cdac6a9472053fc79b0e0607d
@@ -1,14 +1,7 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r2"
+require xserver-common.inc
 
-PACKAGE_ARCH = "all"
+PR = "r2"
 
-# we are using a gpe-style Makefile
-inherit gpe
-
 SRC_URI_append = " file://setDPI.sh \
 		   file://calibrate_zaurusd.patch;patch=1 \
 		   file://poodle-xmodmap-2.6.patch;patch=1 \
============================================================
--- packages/xserver-common/xserver-common_svn.bb	32613571aefec5f05c61c0dbe5f238828f687ca6
+++ packages/xserver-common/xserver-common_svn.bb	668c421c2657d8f316d97687a7f411645aaef79a
@@ -1,20 +1,9 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-PV = "1.12+svn${SRCDATE}"
-PR = "r0"
+require xserver-common.inc
 
-PACKAGE_ARCH = "all"
-
 DEFAULT_PREFERENCE = "-1"
 
 DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-
-
-# we are using a gpe-style Makefile
-inherit gpe
-
+PV = "1.12+svn${SRCDATE}"
 S = "${WORKDIR}/xserver-common"
 
 SRC_URI = "${GPE_SVN} \