Update of /home/halls/cvs/debian-openoffice/oo-debian-files/debian In directory gluck:/tmp/cvs-serv30590/debian
Modified Files: changelog control Log Message: Merge changes from 1_1_1 branch to HEAD Index: changelog =================================================================== RCS file: /home/halls/cvs/debian-openoffice/oo-debian-files/debian/changelog,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- changelog 22 Feb 2004 14:15:55 -0000 1.93 +++ changelog 16 Apr 2004 21:50:12 -0000 1.94 @@ -1,3 +1,35 @@ +openoffice.org-debian-files (1.1.0+1.1.1rc3-1+1) unstable; urgency=low + + * update neon bits in doc/TODO + + -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 20 Mar 2004 00:04:59 +0100 + +openoffice.org-debian-files (1.1.0+1.1.1rc2-1+1) experimental; urgency=low + + * Depend on openoffice.org (>= 1.1.0+1.1.1rc-1) + * let oooprelink prelink with --libs-only so that programs + like msgbox-gnome are skipped, then prelink "the other" binaries + manually. Do not try to prelink msgbox-gnome since we cannot + be sure it's dependencies are met (closes: #238056) + + -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 15 Mar 2004 05:30:27 +0100 + +openoffice.org-debian-files (1.1.0+1.1.1rc-1+1) experimental; urgency=low + + * OOOVERSION=1.1.1 in wrapper and 1.1.1 in autoresponse.conf + (closes: #231689) [RE] + * merge 1.1.0-6* [RE] + + -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 3 Mar 2004 17:51:12 +0100 + +openoffice.org-debian-files (1.1.0+1.1.1a-1+1) experimental; urgency=low + + * bin/openoffice: OOVERSION="OpenOffice.org 1.1.1a" [RE] + * depend on openoffice.org (>= 1.1.0+1.1.1a-1) [RE] + * add openoffice.org-thesaurus-en-us to dictionaries hook [RE] + + -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 19 Jan 2004 01:10:32 +0100 + openoffice.org-debian-files (1.1.0-6+2) unstable; urgency=low * doc/README.Debian: Suggest adding fonts in /usr/local/share/fonts Index: control =================================================================== RCS file: /home/halls/cvs/debian-openoffice/oo-debian-files/debian/control,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- control 5 Jan 2004 03:04:10 -0000 1.25 +++ control 16 Apr 2004 21:50:12 -0000 1.26 @@ -11,7 +11,7 @@ Conflicts: openoffice.org1.1-debian-files, openoffice.org (<= 1.0.1-5) Replaces: openoffice.org1.1-debian-files Provides: openoffice.org1.1-debian-files -Depends: openoffice.org (>> 1.1.0-2), debianutils (>= 1.16), openoffice.org-bin (>= 1.1.0-4) +Depends: openoffice.org (>= 1.1.0+1.1.1rc-1), debianutils (>= 1.16), openoffice.org-bin (>= 1.1.0-4) Description: Debian specific parts of OpenOffice.org This is part of the packaging of OpenOffice.org for Debian. .