[oe-commits] org.oe.dev merge of '2be5e752a15904554697d31fe1505320d26fd263'

oe commit openembedded-commits at lists.openembedded.org
Wed Feb 20 05:58:59 UTC 2008


merge of '2be5e752a15904554697d31fe1505320d26fd263'
     and '7fb87889a6d8866e49a6b9607971f63a17c58c80'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 96853f8828d3f70854cfe9cd4fbf096e5a258e97
ViewMTN: http://monotone.openembedded.org/revision/info/96853f8828d3f70854cfe9cd4fbf096e5a258e97
Files:
1
conf/distro/include/angstrom-2008-preferred-versions.inc
packages/zaurusd/files/zaurusd-mixer-callback.patch
packages/gaim
packages/obsolete/gaim
packages/gaim/files/purple-OE-branding.patch
packages/pidgin/pidgin/purple-OE-branding.patch
packages/gaim/pidgin
packages/pidgin/pidgin
packages/gaim/pidgin.inc
packages/pidgin/pidgin.inc
packages/gaim/pidgin_2.0.2.bb
packages/pidgin/pidgin_2.0.2.bb
packages/gaim/pidgin_2.1.1.bb
packages/pidgin/pidgin_2.1.1.bb
packages/gaim/pidgin_2.2.1.bb
packages/pidgin/pidgin_2.2.1.bb
packages/blackbox
packages/blackbox/files
packages/pidgin
packages/zziplib/files
packages/blackbox/blackbox_0.70.1.bb
packages/blackbox/files/remove-host-includes.patch
packages/busybox/busybox-1.9.1/sort-z-nul.patch
packages/zaurusd/files/01-check-toggle-landscape
packages/zaurusd/files/01-check-toggle-portait
packages/zziplib/files/zip_c.patch
packages/zziplib/files/zziplib-autoconf.patch
packages/zziplib/zziplib-native_0.12.83.bb
packages/zziplib/zziplib-native_0.13.49.bb
packages/zziplib/zziplib.inc
packages/zziplib/zziplib_0.12.83.bb
packages/zziplib/zziplib_0.13.49.bb
packages/alsa/alsa-state/akita/asound.state
packages/alsa/alsa-state/spitz/asound.state
packages/busybox/busybox_1.9.1.bb
packages/dbus/dbus.inc
packages/dbus/dbus_1.1.4.bb
packages/freesmartphone/gsm0710muxd_svn.bb
packages/zaurusd/files/alsa-cxx00-default.state.patch
packages/zaurusd/files/zaurus-hinge.in
packages/zaurusd/zaurusd_svn.bb
packages/zziplib/zziplib_0.10.82.bb
Diffs:

#
# mt diff -r2be5e752a15904554697d31fe1505320d26fd263 -r96853f8828d3f70854cfe9cd4fbf096e5a258e97
#
# 
# 
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
#  from [ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d]
#    to [66432a75530815dc67cbefefa5709c66ca453cf9]
# 
============================================================
--- conf/distro/include/angstrom-2008-preferred-versions.inc	ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d
+++ conf/distro/include/angstrom-2008-preferred-versions.inc	66432a75530815dc67cbefefa5709c66ca453cf9
@@ -1,7 +1,7 @@ PREFERRED_VERSION_gst-pulse = "0.9.7"
 PREFERRED_VERSION_dbus = "1.1.4"
 PREFERRED_VERSION_busybox = "1.9.1"
 PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_libtool = "1.2.14"
+PREFERRED_VERSION_libtool = "1.5.10"
 PREFERRED_VERSION_pulseaudio = "0.9.9"
 PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_vte = "0.16.10"


#
# mt diff -r7fb87889a6d8866e49a6b9607971f63a17c58c80 -r96853f8828d3f70854cfe9cd4fbf096e5a258e97
#
# 
# 
# delete "packages/zaurusd/files/zaurusd-mixer-callback.patch"
# 
# rename "packages/gaim"
#     to "packages/obsolete/gaim"
# 
# rename "packages/gaim/files/purple-OE-branding.patch"
#     to "packages/pidgin/pidgin/purple-OE-branding.patch"
# 
# rename "packages/gaim/pidgin"
#     to "packages/pidgin/pidgin"
# 
# rename "packages/gaim/pidgin.inc"
#     to "packages/pidgin/pidgin.inc"
# 
# rename "packages/gaim/pidgin_2.0.2.bb"
#     to "packages/pidgin/pidgin_2.0.2.bb"
# 
# rename "packages/gaim/pidgin_2.1.1.bb"
#     to "packages/pidgin/pidgin_2.1.1.bb"
# 
# rename "packages/gaim/pidgin_2.2.1.bb"
#     to "packages/pidgin/pidgin_2.2.1.bb"
# 
# add_dir "packages/blackbox"
# 
# add_dir "packages/blackbox/files"
# 
# add_dir "packages/pidgin"
# 
# add_dir "packages/zziplib/files"
# 
# add_file "packages/blackbox/blackbox_0.70.1.bb"
#  content [c55a60fa665f71aec0f5d1cf15a02e2041beb430]
# 
# add_file "packages/blackbox/files/remove-host-includes.patch"
#  content [135a714bb06f37322d098287a3f9cfd80fbf3dc1]
# 
# add_file "packages/busybox/busybox-1.9.1/sort-z-nul.patch"
#  content [b88c15e782daa61e071866a288ff781d61417aea]
# 
# add_file "packages/zaurusd/files/01-check-toggle-landscape"
#  content [3d6f3e9114b1f3875520057e769b204608e3625b]
# 
# add_file "packages/zaurusd/files/01-check-toggle-portait"
#  content [4a37c39669043da2c5f372437f47d8cb8554b9bf]
# 
# add_file "packages/zziplib/files/zip_c.patch"
#  content [5a1b10b7bdfcd3ede45622e769e74a85c073322a]
# 
# add_file "packages/zziplib/files/zziplib-autoconf.patch"
#  content [dd5d6aa6448b09b67b5d5406bd1472a22dcaa8b5]
# 
# add_file "packages/zziplib/zziplib-native_0.12.83.bb"
#  content [ede5c99b34a71e21c2dc525151e4887d1deeedaf]
# 
# add_file "packages/zziplib/zziplib-native_0.13.49.bb"
#  content [ede5c99b34a71e21c2dc525151e4887d1deeedaf]
# 
# add_file "packages/zziplib/zziplib.inc"
#  content [9a67bcd8922c5b4d0c3f5af31e526679eec903fe]
# 
# add_file "packages/zziplib/zziplib_0.12.83.bb"
#  content [9cd2de2ced26f127393f3867ae22cc0735af0f98]
# 
# add_file "packages/zziplib/zziplib_0.13.49.bb"
#  content [7d6440e10cbf756b2998f5b398f3a20a81455672]
# 
# patch "packages/alsa/alsa-state/akita/asound.state"
#  from [799c8bd0c2ed692f4558b6e6803920404254941a]
#    to [823acf9c49bf716030e7a5700a73704a897ebb5a]
# 
# patch "packages/alsa/alsa-state/spitz/asound.state"
#  from [cfae718855d1e5dfb6361f15edcb3f9b9a8356d0]
#    to [823acf9c49bf716030e7a5700a73704a897ebb5a]
# 
# patch "packages/busybox/busybox_1.9.1.bb"
#  from [bc182dde57834bba53bbe9431d9fd0bba7e17521]
#    to [49749d22f545c3b4e7a19e560079375738c0afdb]
# 
# patch "packages/dbus/dbus.inc"
#  from [afa9d185f101fddb15e7fc80aa75db16945c0520]
#    to [841819e6fcb66b9b194b83aa29fec8029bca31db]
# 
# patch "packages/dbus/dbus_1.1.4.bb"
#  from [13d62bf774c4fbb379fe51e709aa9044ae5084e9]
#    to [4586c438a647255b3ee0c4705493aa5f104d5d63]
# 
# patch "packages/freesmartphone/gsm0710muxd_svn.bb"
#  from [167721af066a09e26ab279f696bf462251ed0cc9]
#    to [ac7f8d6c162628225adcbcb477947c7dbf843fbe]
# 
# patch "packages/zaurusd/files/alsa-cxx00-default.state.patch"
#  from [8639ceffa75b367727f4636524e4a663237a1b54]
#    to [5134186c26707a1d7ee7b2e4904d429218a8a96a]
# 
# patch "packages/zaurusd/files/zaurus-hinge.in"
#  from [1bb4698a91427818aa3e890cfdcd325cc6bad931]
#    to [f6b4edce33db19ac034adfd809c9caafb0ba5b15]
# 
# patch "packages/zaurusd/zaurusd_svn.bb"
#  from [251ee639b9428fa73f9f1acc8c9a5945caeb9204]
#    to [40577598b1358856779c378866aef53c7d0af048]
# 
# patch "packages/zziplib/zziplib_0.10.82.bb"
#  from [b7909e20eb3efb7b8edd5047c6ea4d0caba567d1]
#    to [3ef3b282e067cb7810bfe03a6d1e3bc6adc556e1]
# 
============================================================
--- packages/blackbox/blackbox_0.70.1.bb	c55a60fa665f71aec0f5d1cf15a02e2041beb430
+++ packages/blackbox/blackbox_0.70.1.bb	c55a60fa665f71aec0f5d1cf15a02e2041beb430
@@ -0,0 +1,14 @@
+DESCRIPTION = "Blackbox Window Manager"
+SECTION = "x11/wm"
+LICENSE = "GPL"
+DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/blackboxwm/blackbox-0.70.1.tar.gz \
+  file://remove-host-includes.patch;patch=1"
+S = "${WORKDIR}/blackbox-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus"
+
============================================================
--- packages/blackbox/files/remove-host-includes.patch	135a714bb06f37322d098287a3f9cfd80fbf3dc1
+++ packages/blackbox/files/remove-host-includes.patch	135a714bb06f37322d098287a3f9cfd80fbf3dc1
@@ -0,0 +1,19 @@
+Index: blackbox-0.70.1/configure.ac
+===================================================================
+--- blackbox-0.70.1.orig/configure.ac
++++ blackbox-0.70.1/configure.ac
+@@ -8,14 +8,6 @@ AC_CONFIG_SRCDIR([src/blackbox.cc])
+ dnl Determine default prefix
+ test "x$prefix" = "xNONE" && prefix="$ac_default_prefix"
+ 
+-dnl Look in the most logical places for external libraries
+-CPPFLAGS="$CPPFLAGS -I$prefix/include"
+-LDFLAGS="$LDFLAGS -L$prefix/lib"
+-if test "x$prefix" != "x/usr/local"; then
+-  CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-  LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-fi
+-
+ dnl Locate required external software
+ AC_PROG_CC
+ 
============================================================
--- packages/busybox/busybox-1.9.1/sort-z-nul.patch	b88c15e782daa61e071866a288ff781d61417aea
+++ packages/busybox/busybox-1.9.1/sort-z-nul.patch	b88c15e782daa61e071866a288ff781d61417aea
@@ -0,0 +1,50 @@
+Summary: 0001591: inconsistent behavior of sort -z
+
+URL: http://busybox.net/bugs/view.php?id=1591
+http://www.busybox.net/cgi-bin/viewcvs.cgi/trunk/busybox/coreutils/sort.c?rev=21004&r1=20435&r2=21004&makepatch=1&diff_format=u
+
+Description:
+
+busybox sort -z does:
+use NUL instead of EOL on input
+
+GNU sort -z does:
+use NUL instead of EOL on input and output
+
+GNU sort -z documents:
+use NUL instead of EOL on input
+
+Additional Information:
+
+Note that sort -z is not part of any standard. But several applications
+(e. g. GNU findutils updatedb) depends on the NUL-on-output behavior.
+
+GNU sort documentation bug was reported to coreutils maintainers.
+
+Notes: 
+
+vda 02-13-08 06:30 (0004364)
+Fixed in revision 21004. Thanks!
+
+--- busybox/coreutils/sort.c	2007/11/16 12:39:16	20435
++++ busybox/coreutils/sort.c	2008/02/13 14:30:33	21004
+@@ -32,7 +32,7 @@
+ 	FLAG_u  = 8,            /* Unique */
+ 	FLAG_c  = 0x10,         /* Check: no output, exit(!ordered) */
+ 	FLAG_s  = 0x20,         /* Stable sort, no ascii fallback at end */
+-	FLAG_z  = 0x40,         /* Input is null terminated, not \n */
++	FLAG_z  = 0x40,         /* Input and output is NUL terminated, not \n */
+ /* These can be applied to search keys, the previous four can't */
+ 	FLAG_b  = 0x80,         /* Ignore leading blanks */
+ 	FLAG_r  = 0x100,        /* Reverse */
+@@ -396,8 +396,9 @@
+ 		if (linecount) linecount = flag+1;
+ 	}
+ 	/* Print it */
++	flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
+ 	for (i = 0; i < linecount; i++)
+-		fprintf(outfile, "%s\n", lines[i]);
++		fprintf(outfile, "%s%c", lines[i], flag);
+ 
+ 	fflush_stdout_and_exit(EXIT_SUCCESS);
+ }
============================================================
--- packages/zaurusd/files/01-check-toggle-landscape	3d6f3e9114b1f3875520057e769b204608e3625b
+++ packages/zaurusd/files/01-check-toggle-landscape	3d6f3e9114b1f3875520057e769b204608e3625b
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Try to determine and ignore false rotation signals caused by
+# headphones removal or remote removal remembering the old state.
+# OE#3390
+if test "`cat /var/run/last-screen-rotation`" = landscape ; then
+    exit
+fi
+echo landscape > /var/run/last-screen-rotation
============================================================
--- packages/zaurusd/files/01-check-toggle-portait	4a37c39669043da2c5f372437f47d8cb8554b9bf
+++ packages/zaurusd/files/01-check-toggle-portait	4a37c39669043da2c5f372437f47d8cb8554b9bf
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Try to determine and ignore false rotation signals caused by                                                              
+# headphones removal or remote removal remembering the old state.
+# OE#3390
+if test "`cat /var/run/last-screen-rotation`" = portait ; then
+    exit
+fi
+echo portait > /var/run/last-screen-rotation
============================================================
--- packages/zziplib/files/zip_c.patch	5a1b10b7bdfcd3ede45622e769e74a85c073322a
+++ packages/zziplib/files/zip_c.patch	5a1b10b7bdfcd3ede45622e769e74a85c073322a
@@ -0,0 +1,15 @@
+From zziplib Debian source package
+--- a/zzip/zip.c	2007-03-19 02:27:49.000000000 +1100
++++ b/zzip/zip.c	2007-11-07 17:40:52.985849197 +1100
+@@ -402,7 +402,10 @@
+         uint16_t u_extras, u_comment, u_namlen;
+ 
+         if (fd_map) 
+-	{ d = (void*)(fd_map+zz_fd_gap+zz_offset); } /* fd_map+fd_gap==u_rootseek */
++        {
++             d = &dirent;
++             memcpy(d, fd_map+zz_fd_gap+zz_offset, sizeof(*d)); /* fd_map+fd_gap==u_rootseek */
++        }
+         else
+         {
+             if (io->fd.seeks(fd, zz_rootseek+zz_offset, SEEK_SET) < 0)
============================================================
--- packages/zziplib/files/zziplib-autoconf.patch	dd5d6aa6448b09b67b5d5406bd1472a22dcaa8b5
+++ packages/zziplib/files/zziplib-autoconf.patch	dd5d6aa6448b09b67b5d5406bd1472a22dcaa8b5
@@ -0,0 +1,509 @@
+Reworks zziplib's configure and top-level makefile considerably to make
+this package compile in a cross-compilation environment. This has not
+and will not be sent upstream because the author most likely wants it that
+way (lots of MSVC crap).
+
+Index: zziplib-0.13.49/Makefile.am
+===================================================================
+--- zziplib-0.13.49.orig/Makefile.am	2008-02-19 22:54:19.000000000 +0100
++++ zziplib-0.13.49/Makefile.am	2008-02-19 23:37:40.000000000 +0100
+@@ -1,126 +1,10 @@
+-AUTOMAKE_OPTIONS = 1.4 foreign dist-bzip2
+ ACLOCAL_AMFLAGS = -I m4
+-WANT_AUTOMAKE = 1.7
+-WANT_AUTOCONF = 2.57
++WANT_AUTOMAKE = 1.96
++WANT_AUTOCONF = 2.61
+ 
+ DIST_SUBDIRS = zzip zzipwrap bins test docs  SDL
+ SUBDIRS =      zzip zzipwrap bins test docs @SDL@
+ 
+-# see Makefile.mk for the "make rpm" target
+-rpm2: dist-bzip2 $(PACKAGE).spec
+-	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.bz2
+-
+-indent-check:
+-	(cd zzip && $(MAKE) `basename $@`)
+-
+-doc docs docu clean-doc clean-docs clean-docu   zzip.html zzip.xml zzip.pdf \
+-man mans manpages htmpages unpack clean-unpack  changes.htm pdfs \
+-omf install-omf install-doc install-docs install-sf install-man3 install-mans :
+-	(cd docs && $(MAKE) `basename $@`)
+-
+-sdl testsdl test-sdl install-sdl :
+-	(cd SDL && $(MAKE) `basename $@`)
+-
+-check-test0 check-test1 check-zzdir check-zzcat \
+-check-zzxor check-zzxordir check-zzxorcat \
+-check-sfx     check-readme : \
+-	(cd test && $(MAKE) `basename $@`)
+-
+-MSVC8 =   msvc8/README.TXT msvc8/zip.exe msvc8/test1.zip msvc8/test.zip \
+-msvc8/zzdir.vcproj    msvc8/zzipself.vcproj     msvc8/zzip.vcproj \
+-msvc8/zziplib.sln     msvc8/zzipsetstub.sln     msvc8/zzobfuscated.sln \
+-msvc8/zziplib.vcproj  msvc8/zzipsetstub.vcproj  msvc8/zzobfuscated.vcproj \
+-msvc8/zzcat.sln       msvc8/zzipself.bat        msvc8/zzip.sln \
+-msvc8/zzcat.vcproj    msvc8/zzipself.sln        msvc8/zziptest.sln \
+-msvc8/zzdir.sln       msvc8/zzipself.txt        msvc8/zziptest.vcproj \
+-                      msvc8/zzipfseeko.vcproj   msvc8/zzipmmapped.vcproj 
+-
+-MSVC7 =   msvc7/pkzip.exe msvc7/test1.zip msvc7/test.zip \
+-msvc7/zzdir.vcproj    msvc7/zzipself.vcproj     msvc7/zzip.vcproj \
+-msvc7/zziplib.sln     msvc7/zzipsetstub.sln     msvc7/zzobfuscated.sln \
+-msvc7/zziplib.vcproj  msvc7/zzipsetstub.vcproj  msvc7/zzobfuscated.vcproj \
+-msvc7/zzcat.sln       msvc7/zzipself.bat        msvc7/zzip.sln \
+-msvc7/zzcat.vcproj    msvc7/zzipself.sln        msvc7/zziptest.sln \
+-msvc7/zzdir.sln       msvc7/zzipself.txt        msvc7/zziptest.vcproj
+-
+-MSVC6 = \
+-msvc6/zzcat.dsp        msvc6/zziplib.dsp      msvc6/zzipwrap.dsp \
+-msvc6/zzdir.dsp        msvc6/zziplib.dsw      msvc6/zzobfuscated.dsp \
+-msvc6/zziptest.dsp     msvc6/zzip.dsp  
+-
+ EXTRA_DIST =   zziplib.spec zzipback.sed Makefile.mk \
+-               $(MSVC8) $(MSVC7) $(MSVC6) $(am__aclocal_m4_deps)
+-
+-PHONY = auto boottrap rpm doc docs man manpages htmpages sdl testsdl \
+-	comp compats msvc6 msvc7
+-# ------------------------------------------------------------------------
+-
+-test-comp:
+-	test ! -d testing || rm -r testing
+-	mkdir testing
+-	(cd testing && tar xzvf ../$(PACKAGE)-$(VERSION).tar.gz)
+-	(cd "testing/$(PACKAGE)-$(VERSION)/zziplib" && sh configure)
+-	$(MAKE) -C  "testing/$(PACKAGE)-$(VERSION)/zziplib"
+-	$(MAKE) -C  "testing/$(PACKAGE)-$(VERSION)/zziplib"  check
+-
+-clean-comp:
+-	test ! -d testing || rm -r testing
+-
+-msvc :
+-	mkdir bin
+-	mkdir lib
+-	mkdir include
+-	mkdir include/zzip
+-	cp $(srcdir)/msvc6/Release/*.exe bin/
+-	cp $(srcdir)/msvc6/Release/*.dll bin/
+-	cp $(srcdir)/msvc6/Release/*.lib lib/
+-	cp $(srcdir)/zzip/*.h include/zzip/
+-	zip -9r $(srcdir)/$(PACKAGE)-$(VERSION)-msvc6-bin.zip bin/
+-	zip -9r $(srcdir)/$(PACKAGE)-$(VERSION)-msvc6-lib.zip lib/ include/
+-	rm -r bin lib include
+-
+-# ------------------------------------------------------------------ zzip64
+-_FILE_OFFSET64 = -D_ZZIP_LARGEFILE -D_FILE_OFFSET_BITS=64
+-_RELEASEINFO64 = "RELEASE_INFO=-release 0-64"
++               $(am__aclocal_m4_deps)
+ 
+-zzip64-setup: zzip64-setup.tmp
+-zzip64-setup.tmp : zzip/Makefile zzip/_config.h zzip/.deps/* zzip/zziplib.pc
+-	- mkdir zzip64
+-	cp -a zzip/Makefile zzip/_config.h zzip/.deps/ zzip/zziplib.pc zzip64/
+-	date > zzip64.dir
+-zzip64-build: zzip64-build.tmp
+-zzip64-build.tmp : zzip64-setup.tmp $(top_srcdir)/zzip/*
+-	cd zzip64 && $(MAKE) "AM_CFLAGS=$(_FILE_OFFSET64)" $(_RELEASEINFO64)
+-zzip64-install: zzip64-install.tmp
+-zzip64-install.tmp : zzip64-build.tmp
+-	cd zzip64 && $(MAKE) install $(_RELEASEINFO64)
+-	cd $(DESTDIR)$(libdir) && mv    libzzip.so   libzzip64.so
+-	cd $(DESTDIR)$(libdir) && mv    libzzip.a    libzzip64.a
+-	cd $(DESTDIR)$(libdir) && \
+-        sed -e 's/zzip.so/zzip64.so/' \
+-            -e 's/zzip.a/zzip64.a/'     libzzip.la > libzzip64.la
+-	cd $(DESTDIR)$(libdir)/pkgconfig && \
+-	sed -e 's/largefile=/largefile= %_FILE_OFFSET64/' \
+-	    -e 's/-lzzip/-lzzip64/' \
+-	    -e 's/zziplib/zziplib64/'   zziplib.pc > zziplib64.pc
+-zzip32-postinstall:
+-	cd $(DESTDIR)$(libdir) && mv    libzzip.so   libzzip32.so
+-	cd $(DESTDIR)$(libdir) && mv    libzzip.a    libzzip32.a
+-	cd $(DESTDIR)$(libdir) && ln -s libzzip32.so libzzip.so
+-	cd $(DESTDIR)$(libdir) && ln -s libzzip32.a  libzzip.a
+-	cd $(DESTDIR)$(libdir) && \
+-	sed -e 's/zzip.so/zzip32.so/' \
+-	    -e 's/zzip.a/zzip32.a/'     libzzip.la > libzzip32.la
+-	cd $(DESTDIR)$(libdir)/pkgconfig && \
+-	sed -e 's/-lzzip/-lzzip32/' \
+-	     -e 's/zziplib/zziplib32/'  zziplib.pc > zziplib32.pc
+-zzip-postinstall:
+-	: "the 12.8x and 11.8x and 10.8x packages are all the same actually"
+-	cd $(DESTDIR)$(libdir) || exit 1 \
+-	; for i in libzzip*.so.1? ; do : \
+-	; v10=`echo $i | sed -e "s/.so.../.so.10/"` \
+-	; v11=`echo $i | sed -e "s/.so.../.so.11/"` \
+-	; v12=`echo $i | sed -e "s/.so.../.so.12/"` \
+-	; test ! -e $v10 && test -e $v12 && ln -s $v12 $v10 \
+-	; test ! -e $v12 && test -e $v10 && ln -s $v10 $v12 \
+-	; ln -s $v10 $v11 || true; done
+Index: zziplib-0.13.49/configure.ac
+===================================================================
+--- zziplib-0.13.49.orig/configure.ac	2008-02-15 21:56:37.000000000 +0100
++++ zziplib-0.13.49/configure.ac	2008-02-19 23:43:05.000000000 +0100
+@@ -1,12 +1,12 @@
+-AC_INIT(zziplib.spec)
+-AC_PREREQ(2.49)
+-AC_COPYRIGHT([Guido Draheim <guido at gmx.de> for ZZipLib.SF.net])
++AC_PREREQ(2.61)
++AC_INIT([zziplib], [0.13.49], [Guido Draheim <guido at gmx.de>])
++AC_CANONICAL_TARGET
++AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
++
++AC_CONFIG_SRCDIR([zzip/zip.c])
+ AC_REVISION($Revision: 1.9 $)
+-AC_CONFIG_AUX_DIR(uses)
++
+ # =======================================================================
+-AC_CANONICAL_SYSTEM
+-dnl AM_ENABLE_MULTILIB([Makefile],[$host])
+-AX_ENABLE_BUILDDIR_UNAME
+ AC_SET_DEFAULT_PATHS_SYSTEM
+ # -----------------------------------------------------------------------
+ AC%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list