CVS:oo-debian-files/debian changelog,1.87,1.88 control,1.24,1.25 openoffice.org-debian-files.menu,1.7,1.8
Update of /home/halls/cvs/debian-openoffice/oo-debian-files/debian
In directory gluck:/tmp/cvs-serv12763/debian
Modified Files:
changelog control openoffice.org-debian-files.menu
Log Message:
- bin/oooprelink: point to library info in openoffice.org-bin
- Depends: openoffice.org-bin (>= 1.1.0-4)
- merge 1.1.0-3 branch changes and fix changelog
Index: openoffice.org-debian-files.menu
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-debian-files/debian/openoffice.org-debian-files.menu,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- openoffice.org-debian-files.menu 12 Nov 2003 18:58:47 -0000 1.7
+++ openoffice.org-debian-files.menu 5 Jan 2004 03:04:10 -0000 1.8
@@ -44,11 +44,11 @@
title="Openoffice.org Setup" command="/usr/lib/openoffice/program/setup"\
hints="Setup,Install,Config"\
kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/500_setup.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/ooo_setup.xpm"
?package(openoffice.org-debian-files):needs=X11 section=Apps/System\
title="Openoffice.org Printer Administration"\
command="/usr/bin/oopadmin"\
hints="Setup,Printer,Config"\
kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/500_setup.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/ooo_setup.xpm"
Index: changelog
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-debian-files/debian/changelog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- changelog 22 Dec 2003 21:26:49 -0000 1.87
+++ changelog 5 Jan 2004 03:04:10 -0000 1.88
@@ -1,5 +1,12 @@
openoffice.org-debian-files (1.1.0-4+0.1pre) unstable; urgency=low
+ * bin/oooprelink: point to library info in openoffice.org-bin
+ * Depends: openoffice.org-bin (>> 1.1.0-4)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 5 Jan 2004 04:01:10 +0100
+
+openoffice.org-debian-files (1.1.0-3+1.2pre) unstable; urgency=low
+
* bin/openoffice:
- send error messages to stderr [CH]
- adjust links immediately after upgrade
@@ -9,9 +16,11 @@
- Mention Sparc issues that need looking at [CH]
- update "libraries-to-remove" list [RE]
* share/dictionaries: set PATH [CH]
- * bin/oooprelink: mention libdb3++c102, libcurl2 and libaudio2 [RE]
+ * debian/openoffice.org-debian-files.menu: s/500/ooo/g -
+ thanks Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
+ (closes: #223574)
- -- Rene Engelhard <rene@debian.org> Mon, 22 Dec 2003 21:49:45 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 5 Jan 2004 03:17:15 +0100
openoffice.org-debian-files (1.1.0-3+1) unstable; urgency=low
Index: control
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-debian-files/debian/control,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- control 14 Nov 2003 16:03:30 -0000 1.24
+++ control 5 Jan 2004 03:04:10 -0000 1.25
@@ -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)
+Depends: openoffice.org (>> 1.1.0-2), 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.
.
Reply to: