summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJunqian Gordon Xu <xjqian@gmail.com>2008-09-19 19:00:16 +0000
committerJunqian Gordon Xu <xjqian@gmail.com>2008-09-19 19:00:16 +0000
commit129f207d0812ece095640412cc92e97fc839aff5 (patch)
tree627504306ad616c0cb14fcebe97b3d6e5888a34d /packages
parent44b0c9246b32210c71504415dcbb2548009bea8a (diff)
pidgin2.5.0: improve packaging
* no need to package libjabber liboscar out of libpurple * sepearate pidgin-data * add libgnt
Diffstat (limited to 'packages')
-rw-r--r--packages/pidgin/pidgin.inc32
-rw-r--r--packages/pidgin/pidgin_2.5.0.bb4
2 files changed, 18 insertions, 18 deletions
diff --git a/packages/pidgin/pidgin.inc b/packages/pidgin/pidgin.inc
index 4799dcbfa3..d608d8adea 100644
--- a/packages/pidgin/pidgin.inc
+++ b/packages/pidgin/pidgin.inc
@@ -22,30 +22,30 @@ EXTRA_OECONF = " \
OE_LT_RPATH_ALLOW=":${libdir}/purple-2:"
OE_LT_RPATH_ALLOW[export]="1"
-PACKAGES =+ "libpurple libpurple-dev libpurple-dbg libpurple-liboscar libpurple-libjabber libpurple-logreader finch finch-dev finch-dbg"
-
+PACKAGES =+ "libpurple-dbg libpurple-dev libpurple libgnt-dbg libgnt libgnt-dev finch-dbg finch finch-dev ${PN}-data"
LEAD_SONAME = "libpurple.so.0"
-FILES_libpurple = "${libdir}/libpurple*.so.* /usr/bin/purple-* /etc/gconf/schemas/purple*"
-FILES_libpurple-dev = "${libdir}/libpurple* \
- ${libdir}/purple-2/*.la "
+FILES_libpurple = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple*"
+FILES_libpurple-dev = "${libdir}/libpurple*.la \
+ ${libdir}/libpurple*.so \
+ ${libdir}/purple-2/*.la \
+ ${libdir}/purple-2/libjabber.so \
+ ${libdir}/purple-2/liboscar.so \
+ ${datadir}/aclocal"
FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \
${libdir}/purple-2/.debug"
-FILES_libpurple-liboscar = "${libdir}/purple-2/liboscar.so.*"
-FILES_libpurple-libjabber = "${libdir}/purple-2/libjabber.so.*"
-FILES_libpurple-logreader = "${libdir}/purple-2/log_reader.so"
-FILES_finch = "${bindir}/finch /usr/lib/libgnt.so.*"
+FILES_libgnt = "${libdir}/libgnt.so.* ${libdir}/gnt/*.so"
+FILES_libgnt-dev = "${libdir}/gnt/*.la"
+FILES_libgnt-dbg = "${libdir}/gnt/.debug \
+FILES_finch = "${bindir}/finch"
FILES_finch-dev = "${libdir}/finch/*.la"
FILES_finch-dbg = "${bindir}/.debug/finch \
${libdir}/finch/.debug"
-FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
- ${sysconfdir} ${sharedstatedir} ${localstatedir} \
- /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/*.so \
- ${datadir}/pixmaps ${datadir}/applications \
- ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
- ${libdir}/bonobo/servers ${datadir}/icons"
-FILES_${PN}-dev += "${libdir}/pidgin/*.la"
+FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \
+ ${datadir}/applications"
+FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons"
+FILES_${PN}-dev += "${libdir}/${PN}/*.la"
inherit autotools gettext pkgconfig gconf
diff --git a/packages/pidgin/pidgin_2.5.0.bb b/packages/pidgin/pidgin_2.5.0.bb
index 35f6f10308..65fbc53ffa 100644
--- a/packages/pidgin/pidgin_2.5.0.bb
+++ b/packages/pidgin/pidgin_2.5.0.bb
@@ -1,5 +1,7 @@
require pidgin.inc
+PR = "r2"
+
SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
file://sanitize-configure.ac.patch;patch=1 \
file://gconf-no-errors.patch;patch=1 \
@@ -13,5 +15,3 @@ EXTRA_OECONF += " --disable-gtkspell \
--disable-nm \
--disable-screensaver \
"
-
-PR = "r1"