summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-07-09 22:27:38 +0000
committerRichard Purdie <richard@openedhand.com>2007-07-09 22:27:38 +0000
commit2cbf32b5086adf2b9c1fc86c3dfd59ef7a69746a (patch)
treebf51568b7522a464fb377bd1cfa7cff26148bb9d
parent886a6ba2a35f5a278fda91b3f0d23c920b31fe29 (diff)
downloadpoky-2cbf32b5086adf2b9c1fc86c3dfd59ef7a69746a.tar.gz
tslib: Fix library version (and bump xserver PR to unbreak people's builds)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2137 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/tslib/tslib/fix_version.patch32
-rw-r--r--meta/packages/tslib/tslib_1.0.bb3
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb2
3 files changed, 35 insertions, 2 deletions
diff --git a/meta/packages/tslib/tslib/fix_version.patch b/meta/packages/tslib/tslib/fix_version.patch
new file mode 100644
index 0000000000..d6a0ebd0f3
--- /dev/null
+++ b/meta/packages/tslib/tslib/fix_version.patch
@@ -0,0 +1,32 @@
1---
2 configure.ac | 10 +++++-----
3 1 file changed, 5 insertions(+), 5 deletions(-)
4
5Index: tslib-1.0/configure.ac
6===================================================================
7--- tslib-1.0.orig/configure.ac 2006-08-24 22:02:55.000000000 +0100
8+++ tslib-1.0/configure.ac 2007-07-09 21:04:38.000000000 +0100
9@@ -2,7 +2,7 @@
10 # Process this file with autoconf to produce a configure script.
11
12 AC_PREREQ(2.57)
13-AC_INIT(tslib, 0.0.2, kergoth@handhelds.org)
14+AC_INIT(tslib, 1.0.0, kergoth@handhelds.org)
15 # AC_CONFIG_AUX_DIR(config)
16 AM_INIT_AUTOMAKE(dist-bzip2)
17 AC_CONFIG_SRCDIR([src/ts_close.c])
18@@ -193,10 +193,10 @@ TS_CONF='${sysconfdir}/ts.conf'
19 AC_SUBST(TS_CONF)
20
21 # Library versioning
22-LT_RELEASE=0.0
23-LT_CURRENT=1
24-LT_REVISION=1
25-LT_AGE=1
26+LT_RELEASE=1.0
27+LT_CURRENT=0
28+LT_REVISION=0
29+LT_AGE=0
30 AC_SUBST(LT_RELEASE)
31 AC_SUBST(LT_CURRENT)
32 AC_SUBST(LT_REVISION)
diff --git a/meta/packages/tslib/tslib_1.0.bb b/meta/packages/tslib/tslib_1.0.bb
index 6180b6e17d..6d219a1a85 100644
--- a/meta/packages/tslib/tslib_1.0.bb
+++ b/meta/packages/tslib/tslib_1.0.bb
@@ -4,9 +4,10 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
4SECTION = "base" 4SECTION = "base"
5LICENSE = "LGPL" 5LICENSE = "LGPL"
6 6
7PR = "r8" 7PR = "r10"
8 8
9SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \ 9SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
10 file://fix_version.patch;patch=1 \
10 file://ts.conf \ 11 file://ts.conf \
11 file://ts.conf-simpad-2.4 \ 12 file://ts.conf-simpad-2.4 \
12 file://ts.conf-collie-2.4 \ 13 file://ts.conf-collie-2.4 \
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 6982bccb81..d3765aa542 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
3DEPENDS += "libxkbfile libxcalibrate" 3DEPENDS += "libxkbfile libxcalibrate"
4 4
5PE = "1" 5PE = "1"
6PR = "r12" 6PR = "r14"
7 7
8SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ 8SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
9 ${KDRIVE_COMMON_PATCHES} \ 9 ${KDRIVE_COMMON_PATCHES} \