[oe-commits] org.oe.dev merge of '62059cae4cb0ae75e3be74df3c9f3a84152b2c00'

[koen commit]

merge of '62059cae4cb0ae75e3be74df3c9f3a84152b2c00'
     and 'd6a10d625959447cfd5ddb1d23ccd908be4f2ca7'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: dc3f7d89e69a7e398ead1be2943f1d42d2e50b05
ViewMTN: http://monotone.openembedded.org/revision.psp?id=dc3f7d89e69a7e398ead1be2943f1d42d2e50b05
Files:
1
packages/djvulibre
packages/djvulibre/djvulibre_3.5.19.bb
packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch
packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb
packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
Diffs:

#
# mt diff -r62059cae4cb0ae75e3be74df3c9f3a84152b2c00 -rdc3f7d89e69a7e398ead1be2943f1d42d2e50b05
#
# 
# 
# add_dir "packages/djvulibre"
# 
# add_file "packages/djvulibre/djvulibre_3.5.19.bb"
#  content [c3c9caa3bf4ee3e46c6090f5d1317c4835a93ca7]
# 
============================================================
--- packages/djvulibre/djvulibre_3.5.19.bb	c3c9caa3bf4ee3e46c6090f5d1317c4835a93ca7
+++ packages/djvulibre/djvulibre_3.5.19.bb	c3c9caa3bf4ee3e46c6090f5d1317c4835a93ca7
@@ -0,0 +1,15 @@
+DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities."
+LICENSE = "GPL"
+SRC_URI = "http://downloads.sourceforge.net/djvu/djvulibre-${PV}.tar.gz"
+
+DEPENDS = "jpeg libpng tiff"
+
+inherit autotools pkgconfig
+
+PACKAGES =+ "libdjvulibre"
+
+FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*"
+FILES_${PN} += "${datadir}/djvu"
+
+
+


#
# mt diff -rd6a10d625959447cfd5ddb1d23ccd908be4f2ca7 -rdc3f7d89e69a7e398ead1be2943f1d42d2e50b05
#
# 
# 
# delete "packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch"
# 
# patch "packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb"
#  from [66be2f89db871d9f47bb60ef860291f8a044a83a]
#    to [f797773ba0845c30eddffcfbb49a48cfe714c5f8]
# 
# patch "packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb"
#  from [9e69c08c4d3dafe0040fce4094a659f68c3c46ce]
#    to [46fb3e7b690e3d2f04c2000b9fee01b49940a3f7]
# 
============================================================
--- packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb	66be2f89db871d9f47bb60ef860291f8a044a83a
+++ packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb	f797773ba0845c30eddffcfbb49a48cfe714c5f8
@@ -1,8 +1,6 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};m
 require ${PN}.inc
 
 PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/applet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics/bluetoothapplet"
-
-#           file://sysconfig-bluetooth.patch;patch=1"
============================================================
--- packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb	9e69c08c4d3dafe0040fce4094a659f68c3c46ce
+++ packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb	46fb3e7b690e3d2f04c2000b9fee01b49940a3f7
@@ -1,8 +1,7 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
 PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \
+           ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet"
-           ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet \
-           file://sysconfig-bluetooth.patch;patch=1"