[oe-commits] org.oe.dev merge of '25889b95fd1b6dbf67f1c12c4b431ef3b5f56abd'

rwhitby commit openembedded-commits at lists.openembedded.org
Thu Jun 21 17:34:40 UTC 2007


merge of '25889b95fd1b6dbf67f1c12c4b431ef3b5f56abd'
     and '4758fedca3a1292214bf6a18707cf62a76cf3c6c'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 035b9c0d47e7de1217dae47339a609d9285d14bb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=035b9c0d47e7de1217dae47339a609d9285d14bb
Files:
1
packages/gtk-webcore/files/NRCit_HTTP_auth.diff
packages/gtk-webcore/files/NRCit_unmap.diff
packages/uboot/u-boot-LABEL.2006.06.30.2020
packages/uboot/u-boot-LABEL.2006.06.30.2020/nohelloworld.patch
packages/uboot/u-boot-linkstationppc
packages/uboot/u-boot-linkstationppc/defconfig_lsppchd
packages/uboot/u-boot-linkstationppc/defconfig_lsppchg
packages/uboot/u-boot-linkstationppc/kurobox_powerpc-20061105_target.gitdiff
packages/uboot/u-boot-linkstationppc/u-boot-kurobox-fdt.patch
packages/uboot/u-boot-linkstationppc/u-boot-kurobox.patch
packages/uboot/u-boot-linkstationppc_git.bb
packages/uboot/u-boot_LABEL.2006.06.30.2020.bb
packages/uboot/uboot-utils_1.1.2.bb
packages/uboot-utils
packages/uboot-utils/files
packages/uboot-utils/files/env-Makefile.patch
packages/uboot-utils/files/fic-gta01
packages/uboot-utils/files/fic-gta01/fw_env.config
packages/uboot-utils/files/fw_env.c.patch
packages/uboot-utils/files/fw_env.config
packages/uboot-utils/files/fw_env.h.patch
packages/uboot-utils/files/tools-Makefile.patch
packages/uboot-utils/files/turbostation
packages/uboot-utils/uboot-utils_1.1.2.bb
packages/gpephone/gloox_0.8.1.bb
packages/gloox/gloox_0.8.1.bb
packages/gpephone/iksemel_1.2.bb
packages/iksemel/iksemel_1.2.bb
packages/tasks/task-sdk-sbox.bb
packages/tasks/task-sdk-sbox-gpe.bb
packages/tasks/task-sdk.bb
packages/tasks/task-sdk-base.bb
packages/gloox
packages/iksemel
packages/uboot/u-boot-1.2.0
packages/uboot/u-boot-1.2.0/fic-gta01
packages/uboot/u-boot-1.2.0/turbostation
packages/gpe-ownerinfo/gpe-ownerinfo/svn-build.patch
packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb
packages/gpe-terminal/files/svn-build.patch
packages/gpe-terminal/gpe-terminal_svn.bb
packages/gpe-timesheet/gpe-timesheet_svn.bb
packages/gpe-todo/gpe-todo_svn.bb
packages/meta/meta-sdk-gpe.bb
packages/meta/meta-sdk-sbox-gpe.bb
packages/uboot/u-boot-1.2.0/defconfig_lsppchd
packages/uboot/u-boot-1.2.0/defconfig_lsppchg
packages/uboot/u-boot-1.2.0/env-Makefile.patch
packages/uboot/u-boot-1.2.0/fic-gta01/fw_env.config
packages/uboot/u-boot-1.2.0/fw_env.c.patch
packages/uboot/u-boot-1.2.0/fw_env.config
packages/uboot/u-boot-1.2.0/kurobox_powerpc-20061105_target.gitdiff
packages/uboot/u-boot-1.2.0/qnap.diff
packages/uboot/u-boot-1.2.0/tools-Makefile.patch
packages/uboot/u-boot-1.2.0/turbostation/fw_env.config
packages/uboot/u-boot-1.2.0/u-boot-kurobox-fdt.patch
packages/uboot/u-boot-1.2.0/u-boot-kurobox.patch
packages/uboot/u-boot-1.2.0/uboot-qnap.diff
packages/uboot/uboot-utils_1.2.0.bb
MAINTAINERS
classes/base.bbclass
classes/devshell.bbclass
classes/kernel.bbclass
classes/patch.bbclass
conf/bitbake.conf
packages/aspell/aspell_0.60.5.bb
packages/gcc/gcc-cross_4.1.1.bb
packages/gcc/gcc-cross_4.1.2.bb
packages/gtk-webcore/osb-nrcit_svn.bb
packages/meta/meta-sdk-sbox.bb
packages/meta/meta-sdk.bb
packages/nonworking/exult/exult_1.2.bb
packages/openmoko-apps/openmoko-rssreader_svn.bb
packages/openmoko-base/files/session
packages/openmoko-base/openmoko-session_svn.bb
packages/openmoko-pim/openmoko-dates_svn.bb
packages/puzzles/puzzles_r7436.bb
packages/shasum/shasum-native.bb
packages/tasks/task-openmoko.bb
packages/uboot/u-boot_1.2.0.bb
Diffs:

#
# mt diff -r25889b95fd1b6dbf67f1c12c4b431ef3b5f56abd -r035b9c0d47e7de1217dae47339a609d9285d14bb
#
# 
# no changes
# 


#
# mt diff -r4758fedca3a1292214bf6a18707cf62a76cf3c6c -r035b9c0d47e7de1217dae47339a609d9285d14bb
#
# 
# 
# delete "packages/gtk-webcore/files/NRCit_HTTP_auth.diff"
# 
# delete "packages/gtk-webcore/files/NRCit_unmap.diff"
# 
# delete "packages/uboot/u-boot-LABEL.2006.06.30.2020"
# 
# delete "packages/uboot/u-boot-LABEL.2006.06.30.2020/nohelloworld.patch"
# 
# delete "packages/uboot/u-boot-linkstationppc"
# 
# delete "packages/uboot/u-boot-linkstationppc/defconfig_lsppchd"
# 
# delete "packages/uboot/u-boot-linkstationppc/defconfig_lsppchg"
# 
# delete "packages/uboot/u-boot-linkstationppc/kurobox_powerpc-20061105_target.gitdiff"
# 
# delete "packages/uboot/u-boot-linkstationppc/u-boot-kurobox-fdt.patch"
# 
# delete "packages/uboot/u-boot-linkstationppc/u-boot-kurobox.patch"
# 
# delete "packages/uboot/u-boot-linkstationppc_git.bb"
# 
# delete "packages/uboot/u-boot_LABEL.2006.06.30.2020.bb"
# 
# delete "packages/uboot/uboot-utils_1.1.2.bb"
# 
# delete "packages/uboot-utils"
# 
# delete "packages/uboot-utils/files"
# 
# delete "packages/uboot-utils/files/env-Makefile.patch"
# 
# delete "packages/uboot-utils/files/fic-gta01"
# 
# delete "packages/uboot-utils/files/fic-gta01/fw_env.config"
# 
# delete "packages/uboot-utils/files/fw_env.c.patch"
# 
# delete "packages/uboot-utils/files/fw_env.config"
# 
# delete "packages/uboot-utils/files/fw_env.h.patch"
# 
# delete "packages/uboot-utils/files/tools-Makefile.patch"
# 
# delete "packages/uboot-utils/files/turbostation"
# 
# delete "packages/uboot-utils/uboot-utils_1.1.2.bb"
# 
# rename "packages/gpephone/gloox_0.8.1.bb"
#     to "packages/gloox/gloox_0.8.1.bb"
# 
# rename "packages/gpephone/iksemel_1.2.bb"
#     to "packages/iksemel/iksemel_1.2.bb"
# 
# rename "packages/tasks/task-sdk-sbox.bb"
#     to "packages/tasks/task-sdk-sbox-gpe.bb"
# 
# rename "packages/tasks/task-sdk.bb"
#     to "packages/tasks/task-sdk-base.bb"
# 
# add_dir "packages/gloox"
# 
# add_dir "packages/iksemel"
# 
# add_dir "packages/uboot/u-boot-1.2.0"
# 
# add_dir "packages/uboot/u-boot-1.2.0/fic-gta01"
# 
# add_dir "packages/uboot/u-boot-1.2.0/turbostation"
# 
# add_file "packages/gpe-ownerinfo/gpe-ownerinfo/svn-build.patch"
#  content [10e273507de51aa50b37f801f1fea970e37451a0]
# 
# add_file "packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb"
#  content [846c62fcc8cf0b71b0d0036ad5c3057cd3ec68a1]
# 
# add_file "packages/gpe-terminal/files/svn-build.patch"
#  content [3b9da13f60f80d6d4639a8e2348d2c37403b4b4e]
# 
# add_file "packages/gpe-terminal/gpe-terminal_svn.bb"
#  content [337e81e6a8d87fd4e408c67b3b6ccc0ab42be254]
# 
# add_file "packages/gpe-timesheet/gpe-timesheet_svn.bb"
#  content [ce095accfd4b8989a678ed7dc70c0eb9979a2809]
# 
# add_file "packages/gpe-todo/gpe-todo_svn.bb"
#  content [92bc0dc6225e2c3634b9f1fe648dfcfac23f5344]
# 
# add_file "packages/meta/meta-sdk-gpe.bb"
#  content [47ea869e6d4ac18d47ca62a018ebea80da185c55]
# 
# add_file "packages/meta/meta-sdk-sbox-gpe.bb"
#  content [6218cc413965307bc4cf9a63945a77f67968bb4a]
# 
# add_file "packages/tasks/task-sdk-sbox.bb"
#  content [b25ce42b862249a05109e6d01708d789efe3369e]
# 
# add_file "packages/tasks/task-sdk.bb"
#  content [ff3fb84f2a15294cdcb27213ffce035c818deaf3]
# 
# add_file "packages/uboot/u-boot-1.2.0/defconfig_lsppchd"
#  content [90c68e577fdcefa6490c064995ad6eb36c30e58b]
# 
# add_file "packages/uboot/u-boot-1.2.0/defconfig_lsppchg"
#  content [ad031403e593fe1ce9c527c95192773c319c8042]
# 
# add_file "packages/uboot/u-boot-1.2.0/env-Makefile.patch"
#  content [e3822526b16e32cf8162168cfedf194aad7d1dee]
# 
# add_file "packages/uboot/u-boot-1.2.0/fic-gta01/fw_env.config"
#  content [43d22d3cac7c0fc5e16f0cf64bf5faaf64bb3299]
# 
# add_file "packages/uboot/u-boot-1.2.0/fw_env.c.patch"
#  content [b89726621ad69615e10c7a11fd4529141fe3b5b1]
# 
# add_file "packages/uboot/u-boot-1.2.0/fw_env.config"
#  content [423d0195e848d9e032ae23a3ce14ecf394f6e73a]
# 
# add_file "packages/uboot/u-boot-1.2.0/kurobox_powerpc-20061105_target.gitdiff"
#  content [3a08c8e1a7b4bc0bf289a3b91e0ada60acf355c6]
# 
# add_file "packages/uboot/u-boot-1.2.0/qnap.diff"
#  content [d7e0e5c81e95a5722f8de0c7a9420078fa1026a1]
# 
# add_file "packages/uboot/u-boot-1.2.0/tools-Makefile.patch"
#  content [c3893c38e489bd9d00b9a8c164651e7782a39727]
# 
# add_file "packages/uboot/u-boot-1.2.0/turbostation/fw_env.config"
#  content [423d0195e848d9e032ae23a3ce14ecf394f6e73a]
# 
# add_file "packages/uboot/u-boot-1.2.0/u-boot-kurobox-fdt.patch"
#  content [ba6746f08def96e9969295ddbcb646b2f912b9cc]
# 
# add_file "packages/uboot/u-boot-1.2.0/u-boot-kurobox.patch"
#  content [bf4553d5f9d388018d3e8eac8c937cd6cd58c6f9]
# 
# add_file "packages/uboot/u-boot-1.2.0/uboot-qnap.diff"
#  content [15c83b182c9a1e49239ebfd1458272e4822cb9df]
# 
# add_file "packages/uboot/uboot-utils_1.2.0.bb"
#  content [02c24e2e787364d6abbbb9560250bcd4d9d21e84]
# 
# patch "MAINTAINERS"
#  from [e356e389b747929c130c01f82008075829dc6614]
#    to [4ae9e15f03824a12f9a1835eaae404ae61437779]
# 
# patch "classes/base.bbclass"
#  from [a24e4e673608a40679457153103b591222ae0942]
#    to [0546d90a54ab6f65b8b3d2795ddca861e3c7f0f9]
# 
# patch "classes/devshell.bbclass"
#  from [2c90ac56d14aa5ab4e7c1b2950129d31018f02ca]
#    to [ad428a97132e45ce98ab989da39f89beb8ceb5be]
# 
# patch "classes/kernel.bbclass"
#  from [237ec9e436415eab3772495898c0921de38b3c07]
#    to [b3df4a5e97f27bbbdeedf06373b1f8a115c48333]
# 
# patch "classes/patch.bbclass"
#  from [c003cee48863ad38aa2a48daab2a06cceaaee977]
#    to [27225cf1e714d9fe8497a039e8af77c65472940c]
# 
# patch "conf/bitbake.conf"
#  from [4dbad01557f0aca5fb71dee774989b86858d501c]
#    to [5b2d727f9640faac120f9e47969de2eadd6e2648]
# 
# patch "packages/aspell/aspell_0.60.5.bb"
#  from [1154c241600ac09cb8d9f328d3b08c2265babd5c]
#    to [fb6c580d1f0a1cf4f036860d2915c11469e286af]
# 
# patch "packages/gcc/gcc-cross_4.1.1.bb"
#  from [08ec71fb53f42e993c1150f870b97f8dd17c3128]
#    to [1b087988c3814b688c360b580f5b82e04eba58cf]
# 
# patch "packages/gcc/gcc-cross_4.1.2.bb"
#  from [f1e26091884b572a0d9a042b54ccf5dc52ca1d37]
#    to [78f5b4b004f93529c71f6ccf6d0c605f7d25daac]
# 
# patch "packages/gtk-webcore/osb-nrcit_svn.bb"
#  from [d171732cc0fabeb4f6802c6f3f1419599cf9950d]
#    to [bd9038b33a39347d8b14f9d564f160cd78a3bde7]
# 
# patch "packages/iksemel/iksemel_1.2.bb"
#  from [f2b6f09b1ff1cbb2d3cece9eca506d8378bcc35d]
#    to [1953d92f6e01b7bf93141c5720b0df1ed3ceb168]
# 
# patch "packages/meta/meta-sdk-sbox.bb"
#  from [d0b57e5da143f0c475c773c1be14324cab68678c]
#    to [5c6d37e9c25484ea705abaf57c0939c4a39fb6f5]
# 
# patch "packages/meta/meta-sdk.bb"
#  from [619a355b6df8c86f32b7018b95a6279ae910bc50]
#    to [910b305dc5032b64156b185e8601142b6b4d1ada]
# 
# patch "packages/nonworking/exult/exult_1.2.bb"
#  from [499c6cda2457268afcd7f5a17258541fbf193623]
#    to [afe6cb192fdb93033c0768afe169a4d1c2df9856]
# 
# patch "packages/openmoko-apps/openmoko-rssreader_svn.bb"
#  from [736dfe6d0a5b884fde1f56de6ecd17d4eea793d2]
#    to [413a32e69453ed84ebeba692f3795ebaa83bef8f]
# 
# patch "packages/openmoko-base/files/session"
#  from [33df90f25edd5e09d695cc4eb6f45d3348e2b0ca]
#    to [7576e41d4e28dbf86100d7a2ed8c8cf83a256689]
# 
# patch "packages/openmoko-base/openmoko-session_svn.bb"
#  from [3f17a7823eead3f056bf8d8b366cee21e7563448]
#    to [b5a19fa435cc1a31bf5a1f6c89bc05784f124222]
# 
# patch "packages/openmoko-pim/openmoko-dates_svn.bb"
#  from [094606a56615609dc5f22795b2655b78dc047ae1]
#    to [6d104d0313f76959c66df4b901536055301d1467]
# 
# patch "packages/puzzles/puzzles_r7436.bb"
#  from [517b59e1cdbf15231e80911538589ffbe87f5d8a]
#    to [e23dbcf74114ad6662000e20e32f3d29d6e854ba]
# 
# patch "packages/shasum/shasum-native.bb"
#  from [de9917e801d649c084c228e14590b5459be5d95e]
#    to [b95046276d5dbfc6a4b6ddf7caeb118f40eb4edd]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [27ea1a0439aed9a9cb5234eff635ce29779df8d6]
#    to [7e096f5cf35c429814997fe9cd354a63ae4592a0]
# 
# patch "packages/tasks/task-sdk-base.bb"
#  from [66ede864698a440ee4bea05f0540bf68b702582b]
#    to [a842da46dc07bfbc9b774bfbbbcab592015a2f40]
# 
# patch "packages/tasks/task-sdk-sbox-gpe.bb"
#  from [c59972859e7d181b8def89749a251b263fca1f44]
#    to [5fc565de4cb3982129a331cf302c57fbcabb875b]
# 
# patch "packages/uboot/u-boot_1.2.0.bb"
#  from [38e43aabd5da7ffb4a413b352f18d20a1bd1e6f7]
#    to [e5d9b8862bb6e6f2a9ff91b095ffe49a3153efc0]
# 
============================================================
--- packages/gpe-ownerinfo/gpe-ownerinfo/svn-build.patch	10e273507de51aa50b37f801f1fea970e37451a0
+++ packages/gpe-ownerinfo/gpe-ownerinfo/svn-build.patch	10e273507de51aa50b37f801f1fea970e37451a0
@@ -0,0 +1,238 @@
+--- gpe-ownerinfo.orig/Makefile        2007-04-08 02:00:43.064935587 +0300
++++ gpe-ownerinfo/Makefile     2007-04-08 02:01:24.703308411 +0300
+@@ -2,7 +2,7 @@
+ VERSION = 0.28
+ PREFIX = /usr/local
+ DEBUG = no
+-CVSBUILD = yes
++CVSBUILD = no
+ ENABLE_NLS = yes
+
+ LINGUAS = de hu id pt pt_BR fr zh_TW ro sv nl sk cs ru sr es zh_CN vi fi tr sl ko ja
++++ gpe-ownerinfo/build/Makefile.dpkg_ipkg	2007-02-10 17:21:40.154584782 +0200
+@@ -0,0 +1,114 @@
++## Please read the README in this directory to see how to use this
++## Makefile snippet
++
++# Let's use whatever clean target the specific app provides
++
++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
++
++# URL to source tarball
++SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz
++
++# can change this to e.g. /var/tmp/deb
++DEB_PATH = ../deb
++
++ifeq ($(CVSBUILD),yes)
++LIBGPEWIDGET_PC = libgpewidget-uninstalled
++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget
++else
++LIBGPEWIDGET_PC = libgpewidget
++endif
++
++ifeq ($(IN_LIBGPEWIDGET),)
++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC))
++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC))
++endif
++
++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0)
++GTKLIBS = $(shell pkg-config --libs gtk+-2.0)
++
++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
++STANDARD_CFLAGS = -MD -Wall
++
++ifeq ($(DEBUG),yes)
++CFLAGS += -O2 -g
++LDFLAGS = -g
++else
++CFLAGS += -Os -fomit-frame-pointer
++endif
++
++dist: check-source clean dist-prep
++	rm -rf ../$(PACKAGE)-$(VERSION)
++	mkdir ../$(PACKAGE)-$(VERSION)
++	( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -)
++	( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile )
++	( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz )
++	rm -rf ../$(PACKAGE)-$(VERSION)
++	$(MAKE) printinfo
++
++dist-upload: dist
++	scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/
++
++dist-prep:
++ipkg-prep:
++install-mo:
++# empty, can be filled in Makefile.translation
++
++install: install-program install-mo
++
++clean-dist:
++	rm -rf familiar/dist familiar/dist.list
++
++clean: clean-dist
++
++check-source:
++	@if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file.  Aborting.\n"; exit 1; fi
++
++ipkg: check-source ipkg-prep clean
++	rm -rf familiar/dist
++	mkdir -p familiar/dist/CONTROL
++	sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control
++	if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi
++	if test -e familiar/preinst;   then install familiar/preinst   familiar/dist/CONTROL; fi
++	if test -e familiar/postinst;  then install familiar/postinst  familiar/dist/CONTROL; fi
++	if test -e familiar/prerm;     then install familiar/prerm     familiar/dist/CONTROL; fi
++	if test -e familiar/postrm;    then install familiar/postrm    familiar/dist/CONTROL; fi
++	$(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
++	rm -rf familiar/dist.list
++	ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
++	if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
++	md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
++	rm -rf familiar/dist familiar/dist.list
++	$(MAKE) printinfo
++
++dpkg: dist
++	mkdir -p $(DEB_PATH)
++	( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz )
++	mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian
++	for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done
++
++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_])
++printinfo:
++	@printf '-------------------------------------------------------------------------------\n'
++	@printf "If this becomes a package release, please add a CVS tag.\n"
++	@printf "You can use 'make tag' for that, it will execute\n"
++	@printf "   cvs tag %s\n" $(CVSTAG)
++	@printf "Please upload a tarball (created with 'make dist') to\n"
++	@printf "   ftp://ftp.handhelds.org/pub/projects/gpe/\n"
++	@printf "   (handhelds.org:~ftp/pub/projects/gpe/source)\n"
++	@printf "You can use 'make dist-upload' to do that.\n"
++	@printf "You are currently known as USER %s.\n" $(USER)
++	@printf '-------------------------------------------------------------------------------\n'
++
++tag: check-source
++	cvs tag $(CVSTAG)
++
++retag: check-source
++	cvs tag -F $(CVSTAG)
++
++source: tag dist-upload
++
++%.pc: %.pc.in
++	sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@
++
++.c.o:;
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@
+diff -Naur gpe-ownerinfo.orig/build/Makefile.translation gpe-ownerinfo/build/Makefile.translation
+--- gpe-ownerinfo.orig/build/Makefile.translation	1970-01-01 02:00:00.000000000 +0200
++++ gpe-ownerinfo/build/Makefile.translation	2007-02-10 17:21:46.170927636 +0200
+@@ -0,0 +1,107 @@
++.SUFFIXES: .mo .po .pot .po8
++
++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
++
++# use ipkg-build or ipkg-deb-build
++IPKG_BUILD := ipkg-build
++
++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint
++
++ifeq ($(DIR_PO),)
++DIR_PO := po
++endif
++
++ifeq ($(BINPACKAGE),)
++BINPACKAGE := $(PACKAGE)
++endif
++
++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS))
++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS))
++
++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present)
++desktop-files += $(PACKAGE).desktop
++endif
++
++ifneq ($(EXTRA_DESKTOPS),)
++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS))
++endif
++
++all-mo: $(mo-files)
++
++all-desktop: $(desktop-files)
++
++install-mo: all-mo
++	if [ "$(ENABLE_NLS)" != "no" ]; then \
++		if [ "x$(LINGUAS)" != "x" ]; then \
++			for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \
++		fi; \
++	fi;
++
++.po8.mo:;
++	if [ "$(ENABLE_NLS)" != "no" ]; then \
++		msgfmt -o $@ $<; \
++	fi;
++
++.po.po8:;
++	CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@
++
++update-po: $(po-files) extract-po
++
++dist-prep: update-po freshen-po
++# empty
++
++ifeq ($(CVSBUILD),yes)
++ipkg-prep: freshen-po
++# empty
++endif
++
++extract-po:
++	mkdir -p $(DIR_PO)
++	( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi )
++	if [ -f $(DIR%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list