Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. org.openembedded.dev:
ebd727bf8ca3469350ae2b7ab8bca02b33cff34a ([EMAIL PROTECTED])
2. org.openembedded.dev:
ee49070c92921a0f13742db5cc53d4c6d9053626 ([EMAIL PROTECTED])
--- Begin Message ---
revision: ebd727bf8ca3469350ae2b7ab8bca02b33cff34a
date: 2008-05-01T19:14:57
author: [EMAIL PROTECTED]
branch: org.openembedded.dev
changelog:
boost-1.33.1: bits/atomicity.h is now ext/atomicity.h. Closes #4204.
manifest:
format_version "1"
new_manifest [66b456314f23af0b278a3538403dcac62b670e20]
old_revision [cf8858ef556a06c278298cd26c40a55f05456ebe]
add_file "packages/boost/files/atomic_count_gcc_atomicity.patch"
content [b9084da134967c9093506c230f9af87b2bf74373]
patch "packages/boost/boost_1.33.1.bb"
from [5df1de6d2b9b99edea55c0d4eeab7c0785cb0847]
to [f88f30ce00fdd7e116d616bca37b226e0075d922]
#
#
# add_file "packages/boost/files/atomic_count_gcc_atomicity.patch"
# content [b9084da134967c9093506c230f9af87b2bf74373]
#
# patch "packages/boost/boost_1.33.1.bb"
# from [5df1de6d2b9b99edea55c0d4eeab7c0785cb0847]
# to [f88f30ce00fdd7e116d616bca37b226e0075d922]
#
============================================================
--- packages/boost/files/atomic_count_gcc_atomicity.patch
b9084da134967c9093506c230f9af87b2bf74373
+++ packages/boost/files/atomic_count_gcc_atomicity.patch
b9084da134967c9093506c230f9af87b2bf74373
@@ -0,0 +1,13 @@
+Index: boost_1_33_1/boost/detail/atomic_count_gcc.hpp
+===================================================================
+--- boost_1_33_1.orig/boost/detail/atomic_count_gcc.hpp 2008-05-01
20:43:45.000000000 +0200
++++ boost_1_33_1/boost/detail/atomic_count_gcc.hpp 2008-05-01
20:43:55.000000000 +0200
+@@ -17,7 +17,7 @@
+ // http://www.boost.org/LICENSE_1_0.txt)
+ //
+
+-#include <bits/atomicity.h>
++#include <ext/atomicity.h>
+
+ namespace boost
+ {
============================================================
--- packages/boost/boost_1.33.1.bb 5df1de6d2b9b99edea55c0d4eeab7c0785cb0847
+++ packages/boost/boost_1.33.1.bb f88f30ce00fdd7e116d616bca37b226e0075d922
@@ -9,7 +9,7 @@ LICENSE = "Boost Software License"
DEPENDS = "boost-jam-native zlib"
PRIORITY = "optional"
LICENSE = "Boost Software License"
-PR = "r0"
+PR = "r1"
BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
--- End Message ---
--- Begin Message ---
revision: ee49070c92921a0f13742db5cc53d4c6d9053626
date: 2008-04-23T12:14:03
author: [EMAIL PROTECTED]
branch: org.openembedded.dev
changelog:
wordlist: add scowl to provide dictionary files
* wamerican, wbritish and wcanadian
applied changes from b69062b1d6a44bc7084d99ef690a20480564c655
through 7e439df67b72596575fffd79863b04a6d9dff0b7
manifest:
format_version "1"
new_manifest [1e439a996988e6bb49f50e5df60a958308637009]
old_revision [5844dc1da5abf6ab548aee8ae13908008c0e31ad]
add_dir "packages/wordlist"
add_dir "packages/wordlist/files"
add_file "packages/wordlist/files/rules"
content [c05179a08d78dc9c946b1b4e3eaab857aae70513]
add_file "packages/wordlist/scowl_6.bb"
content [3c879b1a8c2e4cb21bb186cd29601c95da176d93]
#
#
# add_dir "packages/wordlist"
#
# add_dir "packages/wordlist/files"
#
# add_file "packages/wordlist/files/rules"
# content [c05179a08d78dc9c946b1b4e3eaab857aae70513]
#
# add_file "packages/wordlist/scowl_6.bb"
# content [3c879b1a8c2e4cb21bb186cd29601c95da176d93]
#
============================================================
--- packages/wordlist/files/rules c05179a08d78dc9c946b1b4e3eaab857aae70513
+++ packages/wordlist/files/rules c05179a08d78dc9c946b1b4e3eaab857aae70513
@@ -0,0 +1,218 @@
+#!/usr/bin/make -f
+# -*- Makefile -*- $Id: rules,v 1.18 2005/10/15 03:03:48 david Exp $
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+# Customized 27 Oct 1999 by David Coe for wenglish, later moved to scowl
+# This version is for packages that are architecture independent.
+
+# Copied & modified 20080409 from debian source package by John Lee
+# into OpenEmbedded.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# In addition to the scowl binary package, we create wamerican-small,
wamerican, wamerican-large, wamerican-huge, and the
+# corresponding packages for wbritish and wcanadian.
+# The medium size packages have no -size part in their names
+# These are the scowl extensions (complexity numbers?) that contribute to each
word list (i.e. each size);
+# the -size parts "-small", "", "-large", and "-huge" correspond to the end of
the binary package name:
+export SIZE_EXTENSIONS-small:=10 20 35
+export SIZE_EXTENSIONS:=$(SIZE_EXTENSIONS-small) 40 50
+export SIZE_EXTENSIONS-large:=$(SIZE_EXTENSIONS) 55 60 70
+export SIZE_EXTENSIONS-huge:=$(SIZE_EXTENSIONS-large) 80
+
+# These are the scowl word list classes we use:
+CLASSES:=words proper-names upper contractions
+VARIANTS:=0 1
+
+build: build-stamp
+build-stamp:
+# dh_testdir
+
+ set -e;\
+ for SPELLING in american british canadian; do\
+ for SIZE in -small "" -large -huge; do\
+ echo "The following SCOWL word lists were concatenated and sorted
(with duplicates" > w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ echo "removed) to create this word list (see README.Debian for more
details):" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ for CLASS in $(CLASSES); do\
+ for EXT in $$(eval echo \\$$SIZE_EXTENSIONS$$SIZE); do\
+ if [ -f final/english-$$CLASS.$$EXT ]; then\
+ echo "cat final/english-$$CLASS.$$EXT >>
$$SPELLING-english$$SIZE.unsorted";\
+ cat final/english-$$CLASS.$$EXT >>
$$SPELLING-english$$SIZE.unsorted;\
+ echo " english-$$CLASS.$$EXT" >>
w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ fi;\
+ for VARIANT in $(VARIANTS); do\
+ if [ -f final/variant_$$VARIANT-$$CLASS.$$EXT ]; then\
+ echo "cat final/variant_$$VARIANT-$$CLASS.$$EXT >>
$$SPELLING-english$$SIZE.unsorted";\
+ cat final/variant_$$VARIANT-$$CLASS.$$EXT >>
$$SPELLING-english$$SIZE.unsorted;\
+ echo " variant_$$VARIANT-$$CLASS.$$EXT" >>
w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ fi;\
+ done;\
+ if [ -f final/$$SPELLING-$$CLASS.$$EXT ]; then\
+ echo "cat final/$$SPELLING-$$CLASS.$$EXT >>
$$SPELLING-english$$SIZE.unsorted";\
+ cat final/$$SPELLING-$$CLASS.$$EXT >>
$$SPELLING-english$$SIZE.unsorted;\
+ echo " $$SPELLING-$$CLASS.$$EXT" >>
w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ fi;\
+ done;\
+ done;\
+ echo "sort -u < $$SPELLING-english$$SIZE.unsorted >
$$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted";\
+ sort -u < $$SPELLING-english$$SIZE.unsorted >
$$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted;\
+ done;\
+ done
+
+ touch build-stamp
+
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ set -e;\
+ for SIZE in -small "" -large -huge; do\
+ for SPELLING in american british canadian; do\
+ rm -f $$SPELLING-english$$SIZE.unsorted $$SPELLING-english$$SIZE
$$SPELLING-english$$SIZE.5 w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ done;\
+ done
+
+ dh_clean
+
+
+install: DH_OPTIONS=
+install: install-scowl install-wamerican install-wamerican-small
install-wamerican-large install-wamerican-huge install-wbritish
install-wbritish-small install-wbritish-large install-wbritish-huge
install-wcanadian install-wcanadian-small install-wcanadian-large
install-wcanadian-huge
+
+
+
+.PHONY: install-scowl
+install-scowl: PKG=scowl
+install-scowl:
+ dh_testdir
+ dh_testroot
+ dh_installdirs --package=$(PKG)
+
+ dh_install --package=$(PKG) final/*.[0-9][0-9] usr/share/dict/scowl
+ dh_installdocs --package=$(PKG) README debian/README.Debian
+
+
+.PHONY: install-wordlist
+install-wordlist:
+# PKG and WORDLIST must have been set to the binary package name and word
list file name, respectively.
+ dh_testdir
+ dh_testroot
+ dh_installdirs --package=$(PKG)
+
+ dh_install --package=$(PKG) $(WORDLIST) usr/share/dict
+
+ dh_installdocs --package=$(PKG) $(PKG).scowl-word-lists-used
debian/README.Debian
+
+ installdeb-wordlist --package=$(PKG) # This internally uses
dh_installdebcon
+
+ sed "s/WORDLIST/$(WORDLIST)/g" < debian/wordlist_manpage_template >
$(WORDLIST).5
+ dh_installman --package=$(PKG) $(WORDLIST).5
+
+
+.PHONY: install-wamerican
+install-wamerican: build-stamp
+ $(MAKE) -f debian/rules PKG=wamerican WORDLIST=american-english
install-wordlist
+
+.PHONY: install-wamerican-small
+install-wamerican-small: build-stamp
+ $(MAKE) -f debian/rules PKG=wamerican-small
WORDLIST=american-english-small install-wordlist
+
+.PHONY: install-wamerican-large
+install-wamerican-large: build-stamp
+ $(MAKE) -f debian/rules PKG=wamerican-large
WORDLIST=american-english-large install-wordlist
+
+.PHONY: install-wamerican-huge
+install-wamerican-huge: build-stamp
+ $(MAKE) -f debian/rules PKG=wamerican-huge
WORDLIST=american-english-huge install-wordlist
+
+
+.PHONY: install-wbritish
+install-wbritish: build-stamp
+ $(MAKE) -f debian/rules PKG=wbritish WORDLIST=british-english
install-wordlist
+
+.PHONY: install-wbritish-small
+install-wbritish-small: build-stamp
+ $(MAKE) -f debian/rules PKG=wbritish-small
WORDLIST=british-english-small install-wordlist
+
+.PHONY: install-wbritish-large
+install-wbritish-large: build-stamp
+ $(MAKE) -f debian/rules PKG=wbritish-large
WORDLIST=british-english-large install-wordlist
+
+.PHONY: install-wbritish-huge
+install-wbritish-huge: build-stamp
+ $(MAKE) -f debian/rules PKG=wbritish-huge
WORDLIST=british-english-huge install-wordlist
+
+
+.PHONY: install-wcanadian
+install-wcanadian: build-stamp
+ $(MAKE) -f debian/rules PKG=wcanadian WORDLIST=canadian-english
install-wordlist
+
+.PHONY: install-wcanadian-small
+install-wcanadian-small: build-stamp
+ $(MAKE) -f debian/rules PKG=wcanadian-small
WORDLIST=canadian-english-small install-wordlist
+
+.PHONY: install-wcanadian-large
+install-wcanadian-large: build-stamp
+ $(MAKE) -f debian/rules PKG=wcanadian-large
WORDLIST=canadian-english-large install-wordlist
+
+.PHONY: install-wcanadian-huge
+install-wcanadian-huge: build-stamp
+ $(MAKE) -f debian/rules PKG=wcanadian-huge
WORDLIST=canadian-english-huge install-wordlist
+
+
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+# dh_installdocs # moved to the install targets, because it doesn't
DWIM with "-A -p scowl README"
+# dh_installexamples
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installcatalogs
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installman
+# dh_installcron
+# dh_installinfo
+# dh_undocumented
+# dh_strip
+ dh_link
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_python
+# dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build install
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build install
+# (Uncomment this next line if you have such packages.)
+# $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+ make -f debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary-common binary install
============================================================
--- packages/wordlist/scowl_6.bb 3c879b1a8c2e4cb21bb186cd29601c95da176d93
+++ packages/wordlist/scowl_6.bb 3c879b1a8c2e4cb21bb186cd29601c95da176d93
@@ -0,0 +1,37 @@
+DESCRIPTION = "SCOWL (Spell Checker Oriented Word Lists) is a collection of
word lists split up in various sizes, and other categories, intended to be
suitable for use in spell checkers. However, I am sure it will have numerous
other uses as well."
+HOMEPAGE = "http://wordlist.sourceforge.net/";
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wordlist/scowl-6.tar.gz \
+ file://rules"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+do_compile() {
+ cp -f ${WORKDIR}/rules ${S}
+ oe_runmake -f rules build
+}
+do_install() {
+ install -d ${D}/${datadir}/dict
+ install ${S}/american-english ${D}/${datadir}/dict
+ install ${S}/british-english ${D}/${datadir}/dict
+ install ${S}/canadian-english ${D}/${datadir}/dict
+}
+
+PACKAGE_ARCH = "all"
+PACKAGES = "wamerican wbritish wcanadian"
+
+FILES = "${datadir}/dict/${DICTNAME}"
+
+pkg_postinst() {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+cd ${datadir}/dict
+ln -sf ${DICTNAME} words
+}
+
+DICTNAME_wamerican = "american-english"
+DICTNAME_wbritish = "british-english"
+DICTNAME_wcanadian = "canadian-english"
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
