From 5785f62e6cf5deae40c132a3929bf413dd9cab53 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 8 Feb 2007 15:15:51 +0000 Subject: xtscal: unify --- packages/xtscal/xtscal.inc | 8 ++++++++ packages/xtscal/xtscal_0.4.bb | 9 +-------- packages/xtscal/xtscal_0.5.1.bb | 10 ++-------- packages/xtscal/xtscal_0.5.bb | 9 +-------- packages/xtscal/xtscal_0.6.3.bb | 11 ++--------- 5 files changed, 14 insertions(+), 33 deletions(-) create mode 100644 packages/xtscal/xtscal.inc diff --git a/packages/xtscal/xtscal.inc b/packages/xtscal/xtscal.inc new file mode 100644 index 0000000000..220c262a9f --- /dev/null +++ b/packages/xtscal/xtscal.inc @@ -0,0 +1,8 @@ +DESCRIPTION = "Touchscreen calibration utility" +SECTION = "x11/base" +LICENSE = "GPL" +DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate" + +SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2" + +inherit autotools diff --git a/packages/xtscal/xtscal_0.4.bb b/packages/xtscal/xtscal_0.4.bb index 60ad48eaa3..20e11bd54e 100644 --- a/packages/xtscal/xtscal_0.4.bb +++ b/packages/xtscal/xtscal_0.4.bb @@ -1,8 +1 @@ -DESCRIPTION = "Touchscreen calibration utility" -SECTION = "x11/base" -LICENSE = "GPL" -DEPENDS = "virtual/libx11 libxft libxrandr" - -SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2" - -inherit autotools +require xtscal.inc diff --git a/packages/xtscal/xtscal_0.5.1.bb b/packages/xtscal/xtscal_0.5.1.bb index 33dcfe1d80..ac9fcffab7 100644 --- a/packages/xtscal/xtscal_0.5.1.bb +++ b/packages/xtscal/xtscal_0.5.1.bb @@ -1,11 +1,5 @@ -DESCRIPTION = "Touchscreen calibration utility" -SECTION = "x11/base" -LICENSE = "GPL" -DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate" +require xtscal.inc PR = "r1" -SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \ - file://xtscal-poodle.patch;patch=1" - -inherit autotools +SRC_URI += "file://xtscal-poodle.patch;patch=1" diff --git a/packages/xtscal/xtscal_0.5.bb b/packages/xtscal/xtscal_0.5.bb index 220c262a9f..20e11bd54e 100644 --- a/packages/xtscal/xtscal_0.5.bb +++ b/packages/xtscal/xtscal_0.5.bb @@ -1,8 +1 @@ -DESCRIPTION = "Touchscreen calibration utility" -SECTION = "x11/base" -LICENSE = "GPL" -DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate" - -SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2" - -inherit autotools +require xtscal.inc diff --git a/packages/xtscal/xtscal_0.6.3.bb b/packages/xtscal/xtscal_0.6.3.bb index 443b487065..7a75cd0fd8 100644 --- a/packages/xtscal/xtscal_0.6.3.bb +++ b/packages/xtscal/xtscal_0.6.3.bb @@ -1,12 +1,5 @@ -LICENSE = "GPL" -DESCRIPTION = "Touchscreen calibration utility" -SECTION = "x11/base" - -DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate" +require xtscal.inc PR = "r1" -SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \ - file://xtscal-cxk.patch;patch=1" - -inherit autotools +SRC_URI += "file://xtscal-cxk.patch;patch=1" -- cgit v1.2.3 From ee509e58b15e1d33c12b426d079288ba8d339394 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 8 Feb 2007 15:52:28 +0000 Subject: xserver-common: unify, clean up --- packages/xserver-common/xserver-common.inc | 9 +++++++++ packages/xserver-common/xserver-common_1.10.bb | 11 ++--------- packages/xserver-common/xserver-common_1.11.bb | 11 +---------- packages/xserver-common/xserver-common_1.12.bb | 11 ++--------- packages/xserver-common/xserver-common_1.13.bb | 11 ++--------- packages/xserver-common/xserver-common_1.3.bb | 12 ++---------- packages/xserver-common/xserver-common_1.8.bb | 11 ++--------- packages/xserver-common/xserver-common_1.9.bb | 11 ++--------- packages/xserver-common/xserver-common_svn.bb | 15 ++------------- 9 files changed, 24 insertions(+), 78 deletions(-) create mode 100644 packages/xserver-common/xserver-common.inc diff --git a/packages/xserver-common/xserver-common.inc b/packages/xserver-common/xserver-common.inc new file mode 100644 index 0000000000..229fb4d374 --- /dev/null +++ b/packages/xserver-common/xserver-common.inc @@ -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 diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb index fecdfbc8a3..69e92ecdf3 100644 --- a/packages/xserver-common/xserver-common_1.10.bb +++ b/packages/xserver-common/xserver-common_1.10.bb @@ -1,13 +1,6 @@ -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r2" - -PACKAGE_ARCH = "all" +require xserver-common.inc -# we are using a gpe-style Makefile -inherit gpe +PR = "r2" SRC_URI_append = " file://setDPI.sh \ file://calibrate_zaurusd.patch;patch=1 \ diff --git a/packages/xserver-common/xserver-common_1.11.bb b/packages/xserver-common/xserver-common_1.11.bb index 47f9f2b184..6b384699fc 100644 --- a/packages/xserver-common/xserver-common_1.11.bb +++ b/packages/xserver-common/xserver-common_1.11.bb @@ -1,13 +1,4 @@ -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r0" - -PACKAGE_ARCH = "all" - -# we are using a gpe-style Makefile -inherit gpe +require xserver-common.inc SRC_URI_append = " file://setDPI.sh \ file://calibrate_zaurusd.patch;patch=1 \ diff --git a/packages/xserver-common/xserver-common_1.12.bb b/packages/xserver-common/xserver-common_1.12.bb index b02ad3f317..dc91d7da68 100644 --- a/packages/xserver-common/xserver-common_1.12.bb +++ b/packages/xserver-common/xserver-common_1.12.bb @@ -1,13 +1,6 @@ -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r1" - -PACKAGE_ARCH = "all" +require xserver-common.inc -# we are using a gpe-style Makefile -inherit gpe +PR = "r1" SRC_URI_append = " file://setDPI.sh \ file://rxvt-less-pink.diff;patch=1" diff --git a/packages/xserver-common/xserver-common_1.13.bb b/packages/xserver-common/xserver-common_1.13.bb index b051b5aea2..6278adf84c 100644 --- a/packages/xserver-common/xserver-common_1.13.bb +++ b/packages/xserver-common/xserver-common_1.13.bb @@ -1,13 +1,6 @@ -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r1" - -PACKAGE_ARCH = "all" +require xserver-common.inc -# we are using a gpe-style Makefile -inherit gpe +PR = "r1" SRC_URI_append = " file://setDPI.sh \ file://xserver-imageon.patch;patch=1" diff --git a/packages/xserver-common/xserver-common_1.3.bb b/packages/xserver-common/xserver-common_1.3.bb index 8980ae2f9f..af2fb894b5 100644 --- a/packages/xserver-common/xserver-common_1.3.bb +++ b/packages/xserver-common/xserver-common_1.3.bb @@ -1,11 +1,3 @@ -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r1" - -PACKAGE_ARCH = "all" - -# we are using a gpe-style Makefile -inherit gpe +require xserver-common.inc +PR = "r1" diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb index 9e9c9d2e5e..249576f6da 100644 --- a/packages/xserver-common/xserver-common_1.8.bb +++ b/packages/xserver-common/xserver-common_1.8.bb @@ -1,13 +1,6 @@ -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r2" - -PACKAGE_ARCH = "all" +require xserver-common.inc -# we are using a gpe-style Makefile -inherit gpe +PR = "r2" SRC_URI_append = " file://setDPI.sh \ file://calibrate_zaurusd.patch;patch=1" diff --git a/packages/xserver-common/xserver-common_1.9.bb b/packages/xserver-common/xserver-common_1.9.bb index 78fe512ff7..a8343a8548 100644 --- a/packages/xserver-common/xserver-common_1.9.bb +++ b/packages/xserver-common/xserver-common_1.9.bb @@ -1,13 +1,6 @@ -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r2" - -PACKAGE_ARCH = "all" +require xserver-common.inc -# we are using a gpe-style Makefile -inherit gpe +PR = "r2" SRC_URI_append = " file://setDPI.sh \ file://calibrate_zaurusd.patch;patch=1 \ diff --git a/packages/xserver-common/xserver-common_svn.bb b/packages/xserver-common/xserver-common_svn.bb index ca9f3a7be6..e272ac1a87 100644 --- a/packages/xserver-common/xserver-common_svn.bb +++ b/packages/xserver-common/xserver-common_svn.bb @@ -1,20 +1,9 @@ -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -PV = "1.12+svn${SRCDATE}" -PR = "r0" - -PACKAGE_ARCH = "all" +require xserver-common.inc 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} \ -- cgit v1.2.3