CVS:oo-deb/debian changelog,1.362.2.36,1.362.2.37 rules,1.231.2.23,1.231.2.24
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv6026
Modified Files:
Tag: OPENOFFICE_ORG_1_1_3
changelog rules
Log Message:
- mention lithuanian fix
- merge 1.1.2dfsg1-2
- merge cups fixes into 1.1.3-1 chaneglog to close them on upload to sid
if they are still open then...
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.362.2.36
retrieving revision 1.362.2.37
diff -u -d -r1.362.2.36 -r1.362.2.37
--- changelog 8 Nov 2004 10:40:44 -0000 1.362.2.36
+++ changelog 11 Nov 2004 22:11:46 -0000 1.362.2.37
@@ -1,5 +1,8 @@
openoffice.org (1.1.3-1.2pre) experimental; urgency=low
+ * New patches:
+ - lt-fixes.diff: fixes for -lt langpack, thanks
+ Mantas Kriauèiûna <mantas@akl.lt> (closes: #280757)
* debian/control.in:
- evoluton is in Section: gnome so put openoffice.org-evolution there, too
instead of editors [RE]
@@ -8,8 +11,9 @@
* debian/rules:
- remove patch apply conditionals on arm, now in ooo-build proper [RE]
* debian/patches/linux-arm-support.diff: remove, now in ooo-build proper [RE]
+ * merge 1.1.2dfsg1-2 [RE]
- -- Rene Engelhard <rene@debian.org> Sun, 7 Nov 2004 18:23:23 +0100
+ -- Rene Engelhard <rene@debian.org> Thu, 11 Nov 2004 16:44:11 +0100
openoffice.org (1.1.3-1) experimental; urgency=low
@@ -22,7 +26,9 @@
patches and thefore this closes: #201494 ]
- vclplug/*: VCLPlug Backport from 2.0 tree [MM]
[ getstyle-gnome / msgbox-gnome are not built and needed anymore, so
- this closes: #268176, #268179 ]
+ this closes: #268176, #268179.
+ This also contains a psprint backport containing the vcl24 cws, so
+ this also closes: #265148, #254239, #260007)
- wpd/*: WordPerfect filter support [MM et al.], linking to a
libwpd snapshot statically for now...
- evo2/*: Evolution2 Addressbook supoort; needed since Evo2 is now in sid;
@@ -30,6 +36,8 @@
* New minor patches:
- print-do-not-change-document.diff: do not mark document modified
when printing per default [PM] (closes: #271883)
+ - crash-ppd-parse.diff: Fix crash if OOo can't parse the CUPS ppd for a
+ printer (closes: #269773) [MM]
* Removed patches:
- disable-odk-build: We now build the odk but with a patch to skip
the removed non-free documentation... [RE]
@@ -109,6 +117,26 @@
* debian/po/*: update for plain po-debconf usage [RE]
-- Rene Engelhard <rene@debian.org> Sun, 31 Oct 2004 16:41:36 +0100
+
+openoffice.org (1.1.2dfsg1-2) unstable; urgency=medium
+
+ * New patches:
+ - now actually apply sysui-mimetypes.diff... (closes: #272638)
+ - hebrew-culmus.diff: prioritize the culmus fonts (Ellinia CLM)
+ for hebew UI fonts (closes: #280084)
+ - sysui-impress-comment.diff: fix field, s/Commment/Comment/ [RE]
+ * debian/rules:
+ - link to the english wizard/bitmap directory in the various langpacks
+ to be able to access the localized-not-not-localized bitmaps. Fixes
+ several Autopilots... (closes: #216647)
+ * debian/patches/linux-arm-support.diff:
+ - use $(CC) instead of hardcoding cc
+ - fix makefile.mk targets
+ - fix boost patch to not include atomic_count_linux.hpp to make
+ sc build
+ - define PYTHONLIB=-lpython in pyuno to make it build
+
+ -- Rene Engelhard <rene@debian.org> Thu, 11 Nov 2004 09:31:44 +0100
openoffice.org (1.1.2dfsg1-1) unstable; urgency=medium
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.231.2.23
retrieving revision 1.231.2.24
diff -u -d -r1.231.2.23 -r1.231.2.24
--- rules 8 Nov 2004 10:40:44 -0000 1.231.2.23
+++ rules 11 Nov 2004 22:11:47 -0000 1.231.2.24
@@ -1208,6 +1208,12 @@
done
endif
+ # create symlinks to the english wizard/bitmap directory for the
+ # other language packs
+ for i in `find . -type d -name "wizard" | grep l10n`; do \
+ ln -s ../../english/wizard/bitmap $$i/bitmap; \
+ done
+
touch $@
Reply to: