Update of /cvs/debian-openoffice/oo-deb/debian In directory gluck:/tmp/cvs-serv29144
Modified Files: Tag: OPENOFFICE_ORG680 .cvsignore changelog control control.in rules Added Files: Tag: OPENOFFICE_ORG680 java-gcj-compat_1.0.14.orig.tar.gz.uu Log Message: - minor changelog beautifications - build java-gcj-compat ourselves, necessary because of hardcoded paths - update to m87 - don't install libgcc_s/libstdc++6 in -core - ooo-build currently has evo2 disabled (does not build). Temporarily put evo1 i n, -evolution should be disabled if it doesn't work out until we decide to uploa d - support gcc-snapshot in addition to g{cc,++,cj,ij}-4.0 - add libgcj6-dev (>= 4.0-0pre7) to Build-Depends: --- NEW FILE: java-gcj-compat_1.0.14.orig.tar.gz.uu --- begin 644 java-gcj-compat_1.0.14.orig.tar.gz M'XL(``YF"D("`^P\^U<:[EMAIL PROTECTED]&A(%+R`R>:X'M+, M-#(ZS'#GH7*S_N]?577/,`.H23:;9.^!<Q28Z:ZJKG=7UW#)[EMAIL PROTECTED]&.YH MS(-"62_IY8WBDZ_Y*L%K>WL;W[<KI:WD>_1Z4BY52I6-K?52&:Z7RYL;ZT_8 MYI-_T"M:2/3^#WE=+I8_?"M^)[EMAIL PROTECTED] M`/D'KFO[Q6\N_XW*UE+^/X[\<9!1_$;RQ_B_N;Y96<K_!Y-_S74&UH6.7W3+ M^4S6;&UMW"?_]>V-,LB_O%T&Z9<JZR#_[>V-C2?LR5+^?_NK^)REY<H*!6;0 ME=#C@>4Z[)K;H?#9P/48J0.,]#3&8-YXXED7PX!E:SE6*94V&&L+D[WB@:9U MAQ9,L6S!X'W,O8"Y`S:C;+JFS5S!P0-/".:[EMAIL PROTECTED]"&>V*'3=R0&=QAGC`M/_"L [EMAIL PROTECTED](!QQRP"12/7M`83#2Z$CBF`PJ%@@?!&/N+#+X?-4W8H'.%QFYV$?=LR MV)%E",<7C`-E>,4?`M7]B8;##Q![1V%G!RY`)2[L,&'!?8]="\]'KE3R#-!G [EMAIL PROTECTED]:@T&/N&$?E-.Y,F,V#Z<#%BYRNQ63`<\0\=,=`^A#O!^S&LFW6%RSTQ2"T M\PQ&:N\:W5>MTRZK-M^S=]5VN]KLOM^!D<'0#0,FKH6$8XW&[EMAIL PROTECTED]@80$>=X() M,$([KK=KKV!\=:]QU.B^1\H/&MUFO=-A!ZTVJ[*3:KO;J)T>5=OLY+1]TNK4 M=<8Z0D0LU.YAX8!$`)PR1<`MT`U->P\"\X$DVV1#?BU`<(:[EMAIL PROTECTED] M%XW;KG-!"YO5F!WF*YI(M6JMD_>-YB&[EMAIL PROTECTED],:S0#T"%\=H]\DRSQJ. MH>[EMAIL PROTECTED]<`MP4YL;[EMAIL PROTECTED]>WV]E&[EMAIL PROTECTED]"[EMAIL PROTECTED]/ [EMAIL PROTECTED]'';ZGO<FS`_`-@&M^T)<M><.'RDOM)"7%(>T-;0!ENR?&W$"08R M9=2W'!28ZUVQ/O?AH^ND@,,"N\/0SR>T&]1?`S,[EMAIL PROTECTED];0 [...1194 lines suppressed...] M*<%D9*X<?S#"OH65^%/)@&I-SW^<;R$4^D,W1%X`W<L6P"-JPA\Y_P7^]::_ MD5-][7G?O?:\[_[.>6][<.T9:$I<<SH%*`KFDY$/?J7Y="L[D=H)=.F3?NM" M+A.H*BAE#YNG>3.+RA\</=$FV?EU[6E%Q?,[EMAIL PROTECTED]&O [EMAIL PROTECTED](.>X]2ZW8+XBYA=1;6E@@SMZ6C0#XCR=+ M8VJ"LN3\3)4*H6+A":[EMAIL PROTECTED]:79%-B8*KN>!-WOV-S<2VSDT5+L.:: MC#J#2>[EMAIL PROTECTED],&6,*X<@>PX47]J_137?%#@(T#BH+()V?(I)*W"^L^M;KZL.%#K MSROQYN[FRW+MZO/#ONFF60^#D7<`YBQ\RN5Z-(\YYJJ*PW7.MU]UTAMU^CRP M#--!C.>+`*D032%3?_V7!VDR-A8X=2)MN:57XN%*_"M3.VY'L':R2R0CXY6; MUBB4=AJ[R_$(4V_LW(;RNNBT^/[EMAIL PROTECTED]/Q%O320)SD-J..RPR:'2<B5'^G^I_L MR^C=H-..)Z<T$?E2SUB2P6NM/0P25N<$DB?YS(IIR^'>IOFG;HM]`C)W^GD@ M+P=XTAF)G25$C:8*QJ4A348>H1EU8QW,E\U&IP"L$,)FE([EMAIL PROTECTED]:7 M(].N6SJNLF?.J/GL,VH^^[*:?9.V?#*XJ1J^:2*1>X^AKBXZG9#XZOV!=8\B MEZ;6HCA[BJ;-,TLTL,[EMAIL PROTECTED]'P/[EMAIL PROTECTED]<0?':6/B);%[;46Y-T#V M8N&:YW_`_>\Z_\?QFNDL-4R<V>I6X6T,8U61&+-O%H[L>3RPRL[H!0PA>&,$ MO90*G;Z>3XAYFS34UXP.;Q3#)'G+;FER*'#%F#LY4(P'V<8,R1?K4=4=4IT9 M/6\+THT23]ZPR9V#SM?_P4JV-W\W?S=_-W\W?S=_-W\W?S=_-W\W?S=_-W\W [EMAIL PROTECTED]/%^.A [EMAIL PROTECTED] ` end Index: control.in =================================================================== RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v retrieving revision 1.142.2.6.2.18 retrieving revision 1.142.2.6.2.19 diff -u -d -r1.142.2.6.2.18 -r1.142.2.6.2.19 --- control.in 17 Mar 2005 17:29:16 -0000 1.142.2.6.2.18 +++ control.in 23 Mar 2005 13:49:29 -0000 1.142.2.6.2.19 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org> Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]> -Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), gij-4.0 (>= 4.0-0pre7), autoconf, sharutils, libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.13), imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon24-dev, libcupsys2-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 1.7.5), libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1), lsb-release, rpm %Ubuntu=libxinerama-dev, libarts1-dev, libqt3-mt-dev, xlibs-dev%, libldap2-dev, libexpat1-dev, libgnomevfs2-dev, libant1.6-java, gjdoc, fastja r, libsndfile1-dev +Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), gij-4.0 (>= 4.0-0pre7), libgcj6-dev (>= 4.0-0pre7), autoconf, sharutils, libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.13), imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon24-dev, libcupsys2-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 1.7.5), libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1), lsb-release, rpm %Ubuntu=libxinerama-dev, libarts1-dev, libqt3-mt-dev, xlibs-dev%, libldap2-dev, libexpat1-dev, libgnomevfs2-dev, l ibant1.6-java, gjdoc, fastjar, libsndfile1-dev Standards-Version: 3.6.1 Package: openoffice.orgVER @@ -186,12 +186,12 @@ Architecture: i386 powerpc s390 sparc arm Section: gnome Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> ${base-version}) -Recommends: evolution (>> 2.0) -Description: Evolution 2 Addressbook support for OpenOffice.org +Recommends: evolution +Description: Evolution Addressbook support for OpenOffice.org OpenOffice.org is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. . - This package allows OpenOffice.org to access Evolution 2 address books. + This package allows OpenOffice.org to access Evolution address books. Package: python-uno Section: python Index: rules =================================================================== RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v retrieving revision 1.214.2.14.2.24 retrieving revision 1.214.2.14.2.25 diff -u -d -r1.214.2.14.2.24 -r1.214.2.14.2.25 --- rules 16 Mar 2005 18:13:51 -0000 1.214.2.14.2.24 +++ rules 23 Mar 2005 13:49:30 -0000 1.214.2.14.2.25 @@ -77,11 +77,17 @@ CURDIR ?= $(shell pwd) GCC_VERSION = 4.0 +#GCC_VERSION = snapshot ifeq ($(GCC_VERSION),) BUILD_PATH = $(CURDIR)/debian/usr/lib/jvm/java-1.4.2-gcj-4.0-1.4.2.0/bin:$$PATH else +ifeq ($(GCC_VERSION),snapshot) + BUILD_PATH = $(CURDIR)/debian/usr/lib/jvm/java-1.4.2-gcj-4.0-1.4.2.0/bin:/usr/lib/gcc-snapshot/bin:$$PATH + BUILD_LD_LIBRARY_PATH = /usr/lib/gcc-snapshot/lib:$$LD_LIBRARY_PATH +else BUILD_PATH = $(CURDIR)/debian/usr/lib/jvm/java-1.4.2-gcj-4.0-1.4.2.0/bin:$(CURDIR)/debian/usr/bin:$$PATH endif +endif # Because of the stampdir magic, when you actually want to run a rule # over, you would have to remove the stamp manually. Now, just do @@ -149,10 +155,8 @@ rm -f debian/openintro_debian.xcf debian/openintro_debian.bmp \ offmgr/res/openintro_debian.bmp - # remove generated symlinks - rm -f debian/usr/bin/gcc - rm -f debian/usr/bin/g++ - rm -f debian/usr/lib/java-gcj-compat + # remove generated symlinks / java wrappers + rm -f debian/usr # uuencode binary files # for f in fonts/opens___.ttf src/ooo_custom_images*.bz2 src/images*.zip; do @@ -230,27 +234,47 @@ fi ;\ done - # create links for gcc nd g++, ooo-build does not hoour overriding - # CC and CC and we need to use gcc/g++ 4.0 + # build java-gcj-compat + uudecode -o debian/java-gcj-compat_1.0.14.orig.tar.gz \ + debian/java-gcj-compat_1.0.14.orig.tar.gz.uu + tar xfvz debian/java-gcj-compat_1.0.14.orig.tar.gz -C ooo-build/build + cd ooo-build/build/java-gcj-compat-1.0.14 && \ + JAVAC="gcj-4.0 -C" ./configure --prefix=$(CURDIR)/debian/usr && \ + $(MAKE) && $(MAKE) install + # FIXME: why are these paths so weird? Find that out and remove this + # workaround + cd $(CURDIR)/debian/usr && \ + for i in ./bin/java ./lib/jvm/java-1.4.2-gcj-1.4.2.0/bin/java \ + ./lib/jvm/java-1.4.2-gcj-1.4.2.0/jre/bin/java; do \ + perl -pi -e 's,bin/gij,usr/bin/gij-4.0,' $$i; \ + done && \ + perl -pi -e 's,bin/fastjar,usr/bin/fastjar,' \ + ./lib/jvm/java-1.4.2-gcj-1.4.2.0/bin/jar + + # create links for gcc and g++ (and gij and gcj), ooo-build does not + # honour overriding CC and CC and we need to use gcc/g++ 4.0 / + # ant.mk wants gcj at the moment... ifneq ($(GCC_VERSION),) +ifneq ($(GCC_VERSION),snapshot) mkdir -p $(CURDIR)/debian/usr/bin ln -sf /usr/bin/gcc-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gcc ln -sf /usr/bin/g++-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/g++ + ln -sf /usr/bin/gcj-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gcj + ln -sf /usr/bin/gij-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gij +endif endif - # ... and for java-gcj-compat - cd debian/usr/lib && \ - ln -sf jvm/java-1.4.2-gcj-4.0-1.4.2.0 java-gcj-compat # Make sure we have /proc mounted - otherwise idlc will fail later. test -r /proc/version - cd ooo-build ; PATH=$(BUILD_PATH) ../ooo-build/configure $(CONFIGURE_FLAGS) + cd ooo-build ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ../ooo-build/configure $(CONFIGURE_FLAGS) touch $@ build: $(STAMP_DIR)/build $(STAMP_DIR)/build: ooo-build/config.status dh_testdir - cd ooo-build ; PATH=$(BUILD_PATH) $(MAKE) + cd ooo-build ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) $(MAKE) + cd ooo-build/build/src680-m$(MILESTONE)/sysui; . ../*.sh; RPM=rpmbuild PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ../solenv/bin/build.pl touch $@ @@ -351,7 +375,7 @@ for f in gnome-open-url.bin libfps_gnome.so libvclplug_gtk[0-9]*.so; do \ mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-gnome/$(OODIR)/program || exit 1;\ done - mv $(PKGDIR)-core/$(OODIR)/program/libevoab2.so $(PKGDIR)-evolution/$(OODIR)/program + mv $(PKGDIR)-core/$(OODIR)/program/libevoab1.so $(PKGDIR)-evolution/$(OODIR)/program for f in libnpsoplugin.so nsplugin; do \ mv $(PKGDIR)-core/$(OODIR)/program/$$f debian/mozilla-openoffice.org/$(OODIR)/program; \ done @@ -383,14 +407,7 @@ find $(PKGDIR)-$$i -type f -name "*.1" | xargs gzip -9; \ done - # ooo-build has --with-stdlibs at the end of configure, so - # specifiying --without-stdlibs doesn't help. supply them manually - # here, we want to be installable on unstable - cp /usr/lib/libstdc++.so.6 $(PKGDIR)-core/$(OODIR)/program - cp /lib/libgcc_s.so.1 $(PKGDIR)-core/$(OODIR)/program - touch $@ - # TODO If building with a JDK, install the additional files to be diverted ifeq "$(USE_JAVA)" "y" Index: changelog =================================================================== RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v retrieving revision 1.338.2.25.2.27 retrieving revision 1.338.2.25.2.28 diff -u -d -r1.338.2.25.2.27 -r1.338.2.25.2.28 --- changelog 17 Mar 2005 17:29:16 -0000 1.338.2.25.2.27 +++ changelog 23 Mar 2005 13:49:27 -0000 1.338.2.25.2.28 @@ -1,6 +1,6 @@ -openoffice.org2 (1.9.82-0pre) experimental; urgency=low +openoffice.org2 (1.9.87-0pre) experimental; urgency=low - * upstream milestone 82: + * upstream milestone 87: - now uses libneon24 (closes: #251738) * ooo-build/bin/package-ooo: - install ucpgvfs1.so, gconfbe1.so and gnome-set-default-application @@ -20,11 +20,10 @@ - add Build-Depends: gij-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), g++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), libldap2-dev, libexpat1-dev, libbgnomevfs2-dev, libsndfile1-dev, libant1.6-java, - fastjar, gjdoc [RE] + fastjar, gjdoc, libgcj6-dev (>= 4.0-0pre7) [RE] - (temporarily) remove unneeded/-used (libstlport4.6, libdb4.2++-dev, libmyspell-dev, libaltlinuxhyph-dev, ..) or obsolete - (xsltproc, evolution-data-server-dev, ...) - build-depends [RE] + (xsltproc, evolution-data-server-dev, ...) build-depends [RE] - build-depend on libneon24-dev instead of libneon23-dev [RE] - version libnss-dev builddep (>= 1.7.5-1) [RE] - fix -cores description, it's arch-dependant and update @@ -37,27 +36,25 @@ - remove CONFIGURE_OPTIONS, now done by ooo-build and distro-configs/Debian.conf[.in] [RE] - compress manpages... [RE] - - install libstdc++.so.6 and libgcc_s.so.1 into $OODIR/program - in a try to be installable in unstable [RE] - move gnome-open-url.bin into -gnome [RE] - - create links to /usr/bin/g{cc,++}-4.0 in debian/usr/bin and + - create links to /usr/bin/g{cc,++,cj,ij}-4.0 in debian/usr/bin and change path to use them, ooo-build doesn't honor CC and CXX [RE] - fix installation of Gnome stuff to get ucpgvfs1.so, gconfbe1.so and gnome-set-default-application packaged [RE] - - move libnpsoplugin.so and nsplugin into own package [RE] + - move libnpsoplugin.so and nsplugin (Mozilla plugin) into own package [RE] - work around the fact that dh_shlibdeps doesn't report anything on TLS/NPTL-enabled systems by setting LD_ASSUME_KERNEL="2.4.27" before executing it... [RE] - use dh_python instead of setting the dependencies manually. And we miss the postinst snippets without it anyway... [RE] - * debian/usr/lib/*: add content (wrapper scripts) of java-gcj-compat - 1.0.14-0.0ubuntu4 except ../lib/tools.jar until we can build-depend on it - in Debian (in NEW...). - Needed to overcome shortcomings in OOo's build which sometimes uses javac - and fails if the javac alternative is set to gcj-wrapper-4.0, thanks again - Matthias Klose [RE] + - build java-gcj-compat (orig.tar.gz from Ubuntu) until it is in Debian + and install it into debian/usr. Thanks Matthias Klose for the + java-gcj-compat pointer. [RE] + - work around changed upstream behaviour in sysui and build sysui with + RPM=rpmbuild set ourselves to get the icons we want [RE] + * debian/java-gcj-compat_1.0.14.orig.tar.gz.uu: add [RE] - -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 17 Mar 2005 18:27:48 +0100 + -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 23 Mar 2005 14:44:28 +0100 openoffice.org2 (1.9.76-0pre) experimental; urgency=low Index: control =================================================================== RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v retrieving revision 1.175.2.8.2.17 retrieving revision 1.175.2.8.2.18 diff -u -d -r1.175.2.8.2.17 -r1.175.2.8.2.18 --- control 17 Mar 2005 17:29:16 -0000 1.175.2.8.2.17 +++ control 23 Mar 2005 13:49:28 -0000 1.175.2.8.2.18 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org> Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]> -Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), gij-4.0 (>= 4.0-0pre7), autoconf, sharutils, libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.13), imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon24-dev, libcupsys2-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 1.7.5), libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1), lsb-release, rpm , libldap2-dev, libexpat1-dev, libgnomevfs2-dev, libant1.6-java, gjdoc, fastjar, libsndfile1-dev +Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), gij-4.0 (>= 4.0-0pre7), libgcj6-dev (>= 4.0-0pre7), autoconf, sharutils, libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.13), imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon24-dev, libcupsys2-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 1.7.5), libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1), lsb-release, rpm , libldap2-dev, libexpat1-dev, libgnomevfs2-dev, libant1.6-java, gjdoc, fastjar, libsndfile1-dev Standards-Version: 3.6.1 Package: openoffice.org2 @@ -186,12 +186,12 @@ Architecture: i386 powerpc s390 sparc arm Section: gnome Depends: ${shlibs:Depends}, openoffice.org2-core (>> ${base-version}) -Recommends: evolution (>> 2.0) -Description: Evolution 2 Addressbook support for OpenOffice.org +Recommends: evolution +Description: Evolution Addressbook support for OpenOffice.org OpenOffice.org is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. . - This package allows OpenOffice.org to access Evolution 2 address books. + This package allows OpenOffice.org to access Evolution address books. Package: python-uno Section: python Index: .cvsignore =================================================================== RCS file: /cvs/debian-openoffice/oo-deb/debian/.cvsignore,v retrieving revision 1.10.2.2.2.2 retrieving revision 1.10.2.2.2.3 diff -u -d -r1.10.2.2.2.2 -r1.10.2.2.2.3 --- .cvsignore 15 Mar 2005 23:57:49 -0000 1.10.2.2.2.2 +++ .cvsignore 23 Mar 2005 13:49:27 -0000 1.10.2.2.2.3 @@ -2,6 +2,7 @@ MANIFEST.*.new stampdir tmp +usr openoffice.org2 openoffice.org2-core openoffice.org2-common -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]