Bug#385798: openoffice.org: font hinting still does not work with the current version ob libfreetype

2006-09-25 Thread Martin Kretzschmar

On 9/25/06, Rene Engelhard [EMAIL PROTECTED] wrote:

Am Sonntag, 24. September 2006 23:05 schrieb Bernd Schubert:
 1.) Quick'n dirty. Simply replace FT_LOAD_TARGET_LIGHT in
 vcl/source/glyphs/gcach_ftyp.cxx by FT_LOAD_TARGET_NORMAL or
 FT_LOAD_TARGET_LCD or FT_LOAD_TARGET_LCD_V (if recompiling wouldn't take 8h
 on Opteron 242, it would be easy to test which gives best results).


Well, I prefer no hinting with subpixel AA (i.e. _LCD) on my 120dpi
laptop but light hinting with subpixel AA (_LCD) on my 100dpi
desktop. Surely there are people who have even different preferences
and there is no single best choice.


 2.) Take the latest patch from
 http://qa.openoffice.org/issues/show_bug.cgi?id=64508 and adjust it, so that
 it applies to openoffice-2.0.4.
 From the point of the user wishes and user config probably the best, but its
 clearly not a simple replace patch and might be buggy.

 Which one do you prefer?

Given the timeframe and the maybe-riskyness of i64508 I'd prefer 1.)


But all that 1) does is change one hard coded default to another one,
or do I misunderstand it?

Martin


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#388397: openoffice.org-impress: No text displayed in the Help dialog when OO.o-writer not installed

2006-09-20 Thread Martin Kretzschmar

Makes sense, various sources say that the help uses writer/web for its
html display.


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#377531: openoffice.org-dev: unowinreg.dll should be included

2006-07-12 Thread Martin Kretzschmar

Just trying to get around having to write the makefile patch ;-)


 However, I am very grateful that you have tried this. Could you please
 provide a little more details about how did you compile your dll? I'd
 like to repeat your method and see if I can somehow get it working...
 Maybe not, I'm just interested.

apt-get install mingw32
cd OOo source/odk/source/unowinreg/win
i586-mingw32msvc-gcc -shared -I/usr/lib/jvm/java-gcj/include -o unowinreg.dll 
unowinreg.c -lkernel32 -ladvapi32
i586-mingw32msvc-strip unowinreg.dll


There's a (non-cross-compiling) FAQ for mingw/JNI here:
http://www.mingw.org/mingwfaq.shtml#faq-jni-dll

You could try with the extra -D_JNI_IMPLEMENTATION_ -Wl,--kill-at
arguments. The kill-at might be interesting because without it,
strings unowinreg.dll | grep RegOpenCurrentUser shows

[EMAIL PROTECTED]

and with --kill-at, the @12 was killed

Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenCurrentUser

(See also man ld)

HTH,
Martin


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#377531: openoffice.org-dev: unowinreg.dll should be included

2006-07-11 Thread Martin Kretzschmar

Kovacs Baldvin wrote:
 I seriously consider instead to drop the whole openoffice.org-dev from
 debian. Not openoffice, just the -dev. Really. If you choose instead
 dropping that line, then people won't know why on earth does it work
 differently


Then how about not dropping the line, but instead, if the file is
missing, print a big fat warning, something like you can't deploy
your stuff on Windows as is, unowinreg.dll is missing, see link to
docs, get it from
http://api.openoffice.org/source/browse/api/odk/source/unowinreg/win/
(Windows C++ source) or
http://api.openoffice.org/source/browse/api/odk/bin/win/ (precompiled
dll)


 (meaning: why their programs don't run on windows???) as
 they learn in the docs, in the forums, etc. They get confused, and move
 away from openoffice.


On 7/11/06, Rene Engelhard [EMAIL PROTECTED] wrote:

And note that there are extensions which are perfectly able to use
openoffice.org-dev without unowinreg.dll (on Linux, though, no idea
about Windows and whether C++ stuff also needs it, I don't think so, so
use C++ or get unowinreg.dll)


The file is there to provide Java access to the Windows registry, so
that your code can find the place where OOo was installed (the last
time). No registry on Unix - file not needed. And for a Windows C++
extension, you'll need a Windows OOo SDK anyway.

Regards,

Martin


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#363138: openoffice.org: useless message while starting

2006-04-17 Thread Martin Kretzschmar
On 4/17/06, Joerg Jaspert [EMAIL PROTECTED] wrote:
 If you start OOo in a chroot without /proc mounted you get a
 --- Warning - OO.o will not work without a mounted /proc filesystem ---

 Why? That doesnt make sense as OOo works fine without it.

IIRC OOo uses (at least 1.1 did) /proc to get its command line arguments
(how stupid is that!). Not sure if there's anything else that needs /proc.


Re: Unidentified subject!

2006-04-13 Thread Martin Kretzschmar
Hi,

is this sc-filter-hide-filteredrows.diff,
http://qa.openoffice.org/issues/show_bug.cgi?id=35581 ? Someone at
[EMAIL PROTECTED] probably knows the answer.

On 4/11/06, Luis Fernando Llana Díaz [EMAIL PROTECTED] wrote:
   this is my fisrt message to the list. In fact my problem is with the Windows
 version of OpenOffice, but I write to this list because the Debian version
 works properly and I would like the reason.
   It has to do with the autofilters; in the Debian version when you have a
 table and filter the rows with respect the vaule of one column, the values
 appearing in the combos of the other columns are updated with respecto the
 selected value. In the Windows version are not updated.

 is that a Debian improvement in the sources or it is a issue of configuration?

 Luis.


Re: OpenOffice.org 2.0.1 (Experimantal) issue with -fvisibility=hidden

2006-01-16 Thread Martin Kretzschmar
On 1/16/06, YABUKI Yukiharu [EMAIL PROTECTED] wrote:
 I try to rebuild,

Thanks

 but ... It is seems to have patch dependency : cws-i18nshrink.diff

 cws-i18nshrink.diff and buildfix-gcc41-friend-decl-i18npool.diff manipulate
 i18npool/inc/localedata.hxx

 Hummm  Do I need to make patch for 
 buildfix-gcc41-friend-decl-i18npool.diff ?
 Do someone have smart idea?

Just disable the gcc41 patches. Shouldn't be a problem because you're
using gcc 4.0

HTH,

Martin


Re: OOo_2.0.0rc3_src compilation Error

2006-01-16 Thread Martin Kretzschmar
Hi Dilip,

On 1/13/06, Dilip Gautam [EMAIL PROTECTED] wrote:
  Thank you very much for the important suggestions that you provided. In
 fact after setting PKG_CONFIG_PATH environment variable to
 /usr/lib/pkgconfig where libxml-2.0.pc was located the compilation started.
 I even removed the earlier --disable-gtk option in the configure.

Okay.

  After the 5 or more hours of compilation today, it has produced yet one
 more error concerning xml.

  Do I need to patch the libxml2.diff patch? I haven't done it yet.

No, not necessary.

 /home/oobuild/OOo_2.0.0rc3_src/solver/680/unxlngi6.pro/inc/com/sun/star/util/XMergeable.hdl:
 24: error: expected '=' before ';' token

 /home/oobuild/OOo_2.0.0rc3_src/solver/680/unxlngi6.pro/inc/com/sun/star/util/XMergeable.hdl:
 24: error: expected identifier before ';' token

 /home/oobuild/OOo_2.0.0rc3_src/solver/680/unxlngi6.pro/inc/com/sun/star/util/XMergeable.hdl:
 26: error: expected declaration before '}' token

  dmake: Error code 1, while making
 '../../../../unxlngi6.pro/slo/sc_xmlcelli.obj'
  '* tg-merge.mk *---'

  ERROR: Error 65280 occurred while making
 /home/oobuild/OOo_2.0.0rc3_src/binfilter/bf_sc/source/filter/xml

  dmake: Error code 1, while making 'build_instsetoo_native'
  '* tg-merge.mk *---'

I guess this part of OOo 2.0 was not buildable with gcc 4.0.
But I don't really know. Please try OOo 2.0.1.

Regards,

Martin


Re: OpenOffice.org 2.0.1 (Experimantal) issue with -fvisibility=hidden

2006-01-15 Thread Martin Kretzschmar
Hi,

On 1/10/06, YABUKI Yukiharu [EMAIL PROTECTED] wrote:
 I found a crash issue OpenOffice.org 2.0.1 in experimental.

 Please do not use g++(4.0) option which is -fvisibility=hidden.

This will of cause lead to performance regressions...

 See also:
 http://bugs.debian.org/307207
 [PR 22587] shared libraries built with -fvisibility=hidden segfaults

...so it would be interesting to know if it's really this bug that you see.

 When Japanse envirionment, Sometime Openoffice.org 2.0.1 crash in
 libdict_ja.so. But, I compile openoffice.org except -fvisibility=hidden
 option. libdict_ja.so is fine.

Can you try to disable the patch cws-i18nshrink.diff and see if the
resulting binaries cause the same crash? Without it, libdict_ja.so and
related libraries will be compiled without -fvisibility=hidden, but
the rest of OO.o won't be affected. I've got an idea how to fix the
patch but I'd like to know if the crash disappears without it.

Thanks,

Martin


Re: OOo_2.0.0rc3_src compilation Error

2006-01-12 Thread Martin Kretzschmar
Hi Dilip,

the libxml in OpenOffice.org cannot be compiled with gcc 4. Install
libxml2-dev and run configure again, but add the --with-system-libxml
option.

(this is the bug report http://qa.openoffice.org/issues/show_bug.cgi?id=50821 )

HTH,

Martin


On 1/12/06, Dilip Gautam [EMAIL PROTECTED] wrote:
 Namaste and Greetings from Nepal !!

 I was trying to compile OOo_2.0.0rc3_src with Nepali language support
 (ne_NP) and English UK (en_GB).

 I got an error saying

 elfgcchack.h: 7688: error: 'xmlXPtrWrapLocationSet' aliased to undefined
 symbol 'xmlXPtrWrapLocationSet__interlan__alias'

 make[2]: *** [SAX.o] Error 1
 make[2]: Leading directory
 '/home/oobuild/OOo_2.0.0rc3_src/libxml2/unxlngi6.pro/misc/build/libxml2-
 2.6.17'

 ERROR: Error 65280 occurred while making
 /home/oobuild/OOo_2.0.0rc3_src/libxml2

 Please suggest if there are any suggestions.

 Regards,
 Dilip Gautam
 Kathmandu, Nepal




Re: OOo_2.0.0rc3_src compilation Error

2006-01-12 Thread Martin Kretzschmar
On 1/12/06, Dilip Gautam [EMAIL PROTECTED] wrote:
  Although I have libxml2-dev_2.6.22-2_i386.deb installed in the system, the
 --with-system-libxml option gives me the following warning

libxml2-dev_2.6.22-2 should be fine. I just checked with pkg-config on a
system with that version.

$ dpkg -l libxml2-dev|grep libxml2-dev
ii  libxml2-dev2.6.22-2   Development files for the GNOME XML library

  checking for libxml-2.0=2.0 ... Package libxml-2.0 was not found int the
 pkg-config search path. Perhaps you should add the directory containing
 libxml-2.0.pc to the PKG_CONFIG_PATH environment variable.

  But dpkg-query -L |grep libxml didn't indicated an libxml-2.0.pc file
 although libxml-2.0.so was present in /usr/lib

I have no libxml-2.0.so, but /usr/lib/libxml2.so, /usr/lib/libxml2.so.2.6.22,
/usr/lib/libxml2.so.2. The first is (as usual) from libxml2-dev, the other two
from the libxml2 package.

This is the important file (for pkg-config):

$ dpkg -L libxml2-dev|grep pc
/usr/lib/pkgconfig/libxml-2.0.pc

  I set the environment variable PKG_CONFIG_PATH to /usr/lib

  But still the same error persists.

It should work with and without PKG_CONFIG_PATH=/usr/lib

  Should I reinstall libxml2-dev, if yes please send me a link to the debian
 package (since debian package says packages.debian.org is down at the
 moment due to performance issues)

I don't know what the problem is, sorry. Can't tell if a reinstall would help.

  Here is the configuration that I used to compile OOo_2.0.0rc3_src

  ./configure --with-lang=en-GB ne --with-dict=ENGB,NENP
 --with-jdk-home=/usr/local/src/j2sdk1.4.2_02
 --disable-gnome-vfs --disable-gtk --disable-mozilla --with-system-libxml

  Is there any harm in diabling gnome-vfs, gtk and mozilla?

There should be no problem with these options.

If you can't get --with-system-libxml to work, you can try the patch
from the bug
report that I mailed earlier.

HTH,

Martin


Bug#345611: openoffice.org: [64bit] Making OpenOffice src compile

2006-01-11 Thread Martin Kretzschmar
On 1/11/06, Emmanuel Fleury [EMAIL PROTECTED] wrote:
 Sincerely, it's not as bad as you said. I did a tour of it yesterday and
 my desktop didn't burst into fire. :) I found few problems but nothing
 really lethal until now (I admit I didn't try very deep but I was
 expecting much worst).

Did you try e.g. load/save?

And I can say, that it brought my X server to its knees at least once by
allocating several gigabytes of pixmaps.

 I am starting to think that the badness of OpenOffice in 64bits was just
 a rumor (as nobody really tried out).

Umm, don't you think the people who wrote the patches that you use would
make it widely known when they had a working 64bit port?

Regards,

Martin


Bug#345611: openoffice.org: [64bit] Making OpenOffice src compile

2006-01-03 Thread Martin Kretzschmar

Rene Engelhard wrote:


openoffice.org-2.0.1/ooo-build/build/ooa680-m1/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
   



Ah. That again. See the makefile.mk. There are already workarounds there
for various other archs/platforms...
 


I've updated the patch that disables optimization of that file:

http://cvs.gnome.org/viewcvs/ooo-build/patches/src680/svx-customshapes-NOOPTFILES.diff?view=markup

Emmanuel, change your *svx/source/customshapes/makefile.mk in the same 
way, and it should work.


HTH,

Martin
*


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Re: Source to backports.org changed

2005-12-18 Thread Martin Kretzschmar
Jérôme Warnier [EMAIL PROTECTED]:
 
 It seems that the server for backports.org has changed in the meanwhile
 (I've heard that from someone), and the source should have changed to
 something like this, but it doesn't work:
 deb http://www.backports.org/debian sarge openoffice.org

Untested, but how about sarge-backports instead of sarge?

(Or read
http://lists.backports.org/pipermail/backports/2005-December/001673.html)

HTH,

Martin


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Re: OOo 2.0 version not on website

2005-11-01 Thread Martin Kretzschmar
Hi Paul.

On Di, 2005-11-01 at 16:45 +0100, Paul van der Vlis wrote:
 On http://packages.qa.debian.org/o/openoffice.org.html the site says 
 it's Package: openoffice.org (1.1.4-7).

Looks up-to-date here. Last Version: 2.0.0-1

 
 Information about the new openoffice.org 2.0 for i386 is missing there.

Regards,

Martin


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#319369: unmunch not always can extract all words

2005-07-21 Thread Martin Kretzschmar
Hi Davide,

Davide Prina schrieb:
 Package: libmyspell-dev
 Version: 1:3.1-11
 
 If you are using a MySpell dictionary (.dic) with a word/affix that
 generate more than 5.000 words than the unmunch utility can generate
 only the first 5.000 of that.

I don't know anything about myspell internals, but...

 
 In the next Italian dictionary there will be a word/affix that generate
 more than 16.500 words.
 
 This bug affect only unmunch utility and not MySpell library.
 
 I have also write to the MySpell author.
 
 I attach a patch ... I have exaggerated on it :-)
 I have also add two missing cast and used the mychop() of MySpell library.

...in C (as opposed to C++), casts from void* to somethingelse* need not
be explicit. And as you are on i386, int and long int have the same size.

Regards,

Martin




-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Re: [Fwd: Fedora Core 2 Update: openoffice.org-1.1.2-10.fc2]

2004-11-14 Thread Martin Kretzschmar
Am Donnerstag, den 11.11.2004, 22:06 + schrieb Chris Halls:
 On Fri, 2004-11-12 at 08:54 +1100, Jeff Waugh wrote:
  On Thu, 2004-11-11 at 21:49 +, Chris Halls wrote:
   Yes, the packages are in experimental now.  We're a bit wary of
   targeting Sarge in case the changes turn out to take a while to
   stabilise, and who knows Sarge might actually be ready sooner :)
  
  Would you recommend that we sync these into Ubuntu for testing?
 
 Yes, that would be very helpful - we aren't getting much feedback from
 experimental :)   We would have already uploaded to unstable had the
 Sarge release not been immanent.

I just want to add that the native widgets backports will be, umm,
interesting to port to/wrap for amd64. I just installed hoary on my
first amd64 box (yay!) and I see that not even the simple
(out-of-process) gtk+ color-syncing code in 1.1.2 works. The native
widget backports stuff works only if you can link to gtk+, otherwise it
falls back to the cross platform vcl widgets.

Regards,
Martin



Re: how to create openoffice.org-java

2004-09-14 Thread Martin Kretzschmar
Am Dienstag, den 14.09.2004, 11:50 -0700 schrieb Emily Dai:
 I got source from sid. By default, openoffice.org-java is disabled 
 during compilation. How can I enable it when I build openoffice. I tried 
 to install j2sdk1.4 and configure --with-jdk-home=/usr/lib/j2sdk1.4.2 in 
 rules file.

Now undo your change in rules ;)

But read Bug 268173. You might need to apply that change.

  But it still didn't create openoffice.org-java package. Can 
 anybody tell me how to generate openoffice.org-java?

From the rules file:

# If DEB_BUILD_OPTIONS contains jdkhome=/absolute/path/to/jdk, build with the
# JDK at /absolute/path/to/jdk.

So please do

DEB_BUILD_OPTIONS='jdkhome=/usr/lib/j2sdk1.4.2'
export DEB_BUILD_OPTIONS
now build.

HTH,

Martin



Two patches for OPENOFFICE_ORG_1_1_3

2004-08-27 Thread Martin Kretzschmar
Hi,

I've got these patches for the OOo Debian dir, OPENOFFICE_ORG_1_1_3
branch:

http://www.gnome.org/~martink/2004/patches/debian-openoffice.org-ooo-icons-1-1-10.diff

(update to ooo-icons 1_1-10)

http://www.gnome.org/~martink/2004/patches/debian-openoffice.org-writerperfect.diff

(make the writerperfect integration work for debian)

Regards,
Martin



Bug#266890: No Python / PyUNO in OOo?

2004-08-25 Thread Martin Kretzschmar
Am Mittwoch, den 25.08.2004, 10:44 +0200 schrieb Ralf Schlatterbeck:
 On Mon, Aug 23, 2004 at 11:51:04PM +0200, Martin Kretzschmar wrote:
  Our current system-python patch does everything mentioned in the
  #replacing part except
  
* the pythonloader.unorc changes,
* using the system's PYTHONPATH setting.
  
  Those need changes in config_office/{configure.in,set_soenv.in} and
  scp/source/python/python.scp.
  
  (And then packaging the py* files in a deb.)
 Can you send me (or point me to) this patch, so I can serve as an
 alpha-tester?

Rene wrote:
 It is built but not packaged yet, yes - that is because there
 were/are(?) problems with using the system python 2.3 (which builds) and
 using a internal python 2.2.2 copy (as original OOo does) is bad(tm).

i.e. Our current system-python patch  is included in the source
package. Get the debian source package for openoffice.org. Then
(optionally but recommended; you can try with the default python) make
this change in rules:

-  PYTHON=/usr/bin/python
+  PYTHON=/usr/bin/python2.2

Then build it. From debian/tmp copy these files to / (or make a
package):

usr/lib/openoffice/program/libpyuno.so
usr/lib/openoffice/program/python
usr/lib/openoffice/program/python.sh
usr/lib/openoffice/program/pythonloader.py
usr/lib/openoffice/program/pythonloader.uno.so
usr/lib/openoffice/program/pythonloader.unorc
usr/lib/openoffice/program/pyuno.so
usr/lib/openoffice/program/pyunorc
usr/lib/openoffice/program/uno.py
usr/lib/openoffice/program/unohelper.py

To try e.g. pyuno/demo/swriter.py, do
export LD_LIBRARY_PATH=/usr/lib/openoffice/program
export PYTHONPATH=/usr/lib/openoffice/program

then python2.2 path/to/swriter.py

HTH and hope I didn't forget a detail,
Martin




Bug#266890: No Python / PyUNO in OOo?

2004-08-23 Thread Martin Kretzschmar
Am Montag, den 23.08.2004, 18:22 +0200 schrieb Chris Halls:
 On Fri, 2004-08-20 at 16:09, Ralf Schlatterbeck wrote:
  Maybe I can help out, what is the current problem? Last messages I see
  about the bug is that it compiles with the system python?
 
 Martin has done some work on this and I am waiting for him to post a
 patch of the work he has done so far.

No patch yet...

 By the way, there is extra information about using PyUno with the system
 Python here:
 
 http://udk.openoffice.org/python/python-bridge.html#faq question 7
 
 I've only just noticed this;

That section is new (for a definition of new that includes 2 months
old) and I haven't seen this before.

  I haven't tried it out.

Our current system-python patch does everything mentioned in the
#replacing part except

  * the pythonloader.unorc changes,
  * using the system's PYTHONPATH setting.

Those need changes in config_office/{configure.in,set_soenv.in} and
scp/source/python/python.scp.

(And then packaging the py* files in a deb.)

Regards,

Martin




Bug#235610: openoffice.org: Texts in menus and dialogs are broken in ko_KR.eucKR

2004-05-20 Thread Martin Kretzschmar
 *NOTE* that the replacement from Andale Sans UI to Korean font,
 which is mentions in README.Debian.gz, DOES NOT WORK. I guess there are
 something strange in building openoffice.

I was just testing a patch in multiple languages. Korean was the only
language in which this replacement didn't help.

However, I do get real glyphs (after installing ttf-baekmuk), not boxes
in my menus.

Can you play with the Use system fonts switch? Press Alt-T O to go to
the Options dialog. There's a tree widget on the left. Select the last
entry in the OpenOffice.org sub tree. Remove the tick from the
checkbox that has the F accelerator, press OK.

HTH

Martin




Re: Splash screen nit-picking

2004-05-16 Thread Martin Kretzschmar
Hi Rene,

Am Sa, den 15.05.2004 um 18:59 Uhr +0200 schrieb Rene Engelhard:
 Martin Kretzschmar wrote:
  WIBNI the progress bar and the Debian logo in the splash screen were
   ^ ?? :)

Wouldn't it be nice if...

  right-aligned? And the text on the left left-aligned?
  
  http://aximilation.org/temp/openoffice.org/ooosplash.html
 
 Hmm. Yeah, I like the second one better, too :-)
 
 Exchanged in CVS.

Thanks. /me goes delete the build tree where this was the only remaining
difference to CVS.

Martin



Splash screen nit-picking

2004-05-15 Thread Martin Kretzschmar
Hi,

WIBNI the progress bar and the Debian logo in the splash screen were
right-aligned? And the text on the left left-aligned?

http://aximilation.org/temp/openoffice.org/ooosplash.html

Regards,

Martin



Bug#245561: This bug was already known to Red Hat

2004-04-28 Thread Martin Kretzschmar
Michael Meeks has added this code (workaround?)

  http://cvs.gnome.org/viewcvs/openoffice/bin/ooo-wrapper.in?r1=1.23r2=1.24

to the wrapper script in ooo-build. It removes the symlinks before setup
is called.



Bug#233938: openoffice.org: Changing KDE fonts helps -- but they were not Albany

2004-04-07 Thread Martin Kretzschmar
Am Mi, den 07.04.2004 schrieb Chris Halls um 12:26:
 On Tue, 2004-04-06 at 21:48, Bogdan Oporowski wrote:
  The choice OpenOffice makes when selecting a replacement font for a
  font that it cannot find is suboptimal,
 
 Yes, I'm just begining to work out what's going on here, but it is
 extreemly difficult to get a solution that works everywhere.

This case, Albany vs. Helvetica is, well, pathologic. Albany is the name
of StarOffice's metrically compatible replacement font for Arial (and
Helvetica). Thus it's first in lots of replacement lists (VCL.xcu).
Maybe we can patch these lists to put Albany at the end (as its
non-free/not the Albany that debian users have installed etc.)

However, I don't even know if VCL.xcu is relevant in this case.

Martin




Re: no gimp-perl anymore? :(

2004-04-03 Thread Martin Kretzschmar
Am Do, den 01.04.2004 schrieb Chris Halls um 17:16:
 On Thu, 2004-04-01 at 04:55, Rene Engelhard wrote:
  well, we could come out without gimp-perl. We could fix that bug we
  now have. But I wouldn't 100% like this and I moreover I would not like
  removing gimp-perl although I never used it except for this conversions
  we do in the OOo package now.
 
 I think we should use script-fu directly.  The script is not complicated
 and then we only need the gimp itself.

lalala...

Not a drop-in replacement for xcftobmp, but very close.

--88-
#!/bin/bash

GIMP=gimp-2.0

script_fu=
(let* ((in-name \$1\)
   (out-name \$2\)
   (img (car (gimp-xcf-load 0 in-name in-name)))
   (layer (car (gimp-image-flatten img
  (file-bmp-save 0 img layer out-name out-name)
  (gimp-image-delete img)
  (gimp-quit 0))


$GIMP -i -d -c -b $script_fu
--88-

Regards,

Martin



Bug#241448: openoffice.org: language setting with no effect

2004-04-01 Thread Martin Kretzschmar
Hi,

Am Do, den 01.04.2004 schrieb Andreas Rittershofer um 12:13:
 The language setting is without any effect. I set it to german, but OO
 remains english.

 -- System Information:
 Debian Release: testing/unstable
   APT prefers unstable
   APT policy: (500, 'unstable')
 Architecture: i386 (i686)
 Kernel: Linux 2.4.25
 Locale: LANG=de_DE, LC_CTYPE=de_DE
 
 Versions of packages openoffice.org depends on:
 ii  debianutils   2.8.1  Miscellaneous utilities specific 
 t
 ii  dictionaries-common   0.22.5 Common utilities for spelling 
 dict
 ii  openoffice.org-bin1.1.1-1OpenOffice.org office suite 
 binary
 ii  openoffice.org-debian 1.1.0+1.1.1rc3-1+1 Debian specific parts of 
 OpenOffic
 ii  openoffice.org-l10n-e 1.1.1-1English (US) language package 
 for 

$ apt-get install openoffice.org-l10n-de

HTH,
Martin




Bug#241442: openoffice.org: PDF export has problems with tables

2004-04-01 Thread Martin Kretzschmar
Hi Andreas,

Am Do, den 01.04.2004 schrieb Andreas Rittershofer um 12:12:
 The PDF export of a writer document with a table is not complete; some
 tools of Debian only show the title of the document and no table at all,
 others show the table but with no lines of the rows and columns.

Are only the cell-borders missing or is actual content missing?
If you use gv: are the lines ok if you disable anti-aliasing?

Regards,
Martin




Bug#237313: openoffice.org: icons for paragraph styles and character styles swapped in OOo Writer

2004-03-11 Thread Martin Kretzschmar
tag 237313 + pending
thanks

Hi Gunther,

Am Do, den 11.03.2004 schrieb Gunter Ohrner um 00:17:
 My OOo Writer's Stylist shows the wrong icons for paraprah and character
 styles. It shows an icon display the character a for paragraph styles
 and an icon displaying a paragraph break control character for character
 styles.

I can confirm this.

  I don't know if this bug is Debian specific or also present in
 the upstream version.

It's a bug in the Ximian icon set. It seems to be fixed in the current
version (ooo-icons 1.1.0-8 vs 1.1.0-6). So the next debian package will
have the correct icon order.

Thanks,

Martin




Bug#230912: openoffice.org: No more recently opened files list

2004-02-03 Thread Martin Kretzschmar
Am Di, den 03.02.2004 schrieb Jan De Luyck um 12:24:
 Since upgrading to OOo 1.1 I no longer have a recently opened files list 
 (at the bottom of the file menu). I didn't find anything specific in the 
 config files, nor in the configuration menu's. 

Do you have a ~/.recently-used file? If not, run touch ~/.recently-used
and check if the list is populated again.

If that workaround helps, the bug has probably been fixed together with
bug #228324.

Martin




Bug#230926: openoffice.org: Crash

2004-02-03 Thread Martin Kretzschmar
merge 230926 228324
thanks

Am Di, den 03.02.2004 schrieb Chris Higgins um 13:32:
 Package: openoffice.org
 Version: 1.1.0-5
 Severity: important
 
 I18N: Operating system doesn't support locale 
 sh: line 1: crash_report: command not found
 
 
[snip recent-files crash stacktrace]

This will be fixed in the next upload

Martin




Re: Bug#229012: openoffice.org: oocalc (spreadsheed): changing a cell makes it a selection, enter can't move, cursor makes selection

2004-01-31 Thread Martin Kretzschmar
Hi Eike,

Am Sa, den 31.01.2004 schrieb Eike Rathke um 22:29:
 On Wed, Jan 28, 2004 at 15:37:41 +0100, Chris Halls wrote:
 
  Thanks for your detailed explanation.  I was able to reproduce the bug,
  and found that I could restore the origianal behaviour by reverting the
  Ximian patch sc-show-sensitize.
 
 What kind of patch is that? Which revisions exactly to retrieve where?

The patch is here:

http://cvs.gnome.org/bonsai/cvsblame.cgi?file=openoffice/patches/OOO_1_1/sc-show-sensitize.diff

And the fix for the patch is in that mail, I attach a copy of its
attachment:

http://lists.ximian.com/archives/public/openoffice/2004-January/000276.html

Regards,
Martin
Index: sc/source/ui/view/viewfunc.cxx
===
RCS file: /cvs/sc/sc/source/ui/view/viewfunc.cxx,v
retrieving revision 1.19
diff -u -p -u -r1.19 viewfunc.cxx
--- sc/source/ui/view/viewfunc.cxx	8 Apr 2003 16:34:56 -	1.19
+++ sc/source/ui/view/viewfunc.cxx	30 Jan 2004 15:23:19 -
@@ -2114,6 +2114,38 @@ void ScViewFunc::SetMarkedWidthOrHeight(
 	rMark.MarkToSimple();
 }
 
+BOOL ScViewFunc::GetRowColHidden(BOOL col)
+{
+	ScDocument* pDoc = GetViewData()-GetDocument();
+	ScMarkData rMark = GetViewData()-GetMarkData();
+	USHORT nCol = 0,nRow = 0,nTab = 0, nRangeCnt = 0;
+	USHORT* pRanges = new USHORT[MAXROW+1];
+	BOOL hidden = FALSE;
+
+	if ( col )
+		nRangeCnt = rMark.GetMarkColumnRanges( pRanges ); 
+	else
+		nRangeCnt = rMark.GetMarkRowRanges( pRanges );		
+
+	const USHORT* pTabRanges = pRanges;
+
+	for ( USHORT nRangeNo=0; nRangeNonRangeCnt; nRangeNo++ )
+	{
+		USHORT nStartNo = *(pTabRanges++);
+		USHORT nEndNo = *(pTabRanges++);
+		if ( col )
+			hidden = pDoc-IsColHidden(nStartNo,nEndNo,nTab);
+		else
+			hidden = pDoc-IsRowHidden(nStartNo,nEndNo,nTab);
+		/* Even if a single col/row is hidden set the var and break */
+		if ( hidden == TRUE ) 
+			break;
+	}
+
+	delete[] pRanges;
+	return hidden;
+}
+
 void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal )
 {
 	//!	Schrittweiten einstellbar


Re: CVS:oo-deb/debian control,1.147.4.2,1.147.4.3

2004-01-27 Thread Martin Kretzschmar
Am Di, den 27.01.2004 schrieb Chris Halls um 13:05:
 I'm looking at #228324 currently, but I can't reproduce it :(  

1.1.0-5 packages or ooo-build HEAD? I think Anil fixed it. (I haven't
verified).

2004-01-24  Anil Bhatia [EMAIL PROTECTED]

* patches/OOO_1_1/recent-files.diff: removed
usage of rtl_ in the interface exposed by recent-files.hxx





Re: some things ...

2004-01-08 Thread Martin Kretzschmar
Hi Rene,

Am Do, den 08.01.2004 schrieb Rene Engelhard um 01:20:
 Rene Engelhard wrote:
  They are in ooo-build CVS:
  
  http://cvs.gnome.org/bonsai/cvsblame.cgi?file=openoffice%2Fpatches%2FOOO_1_1/system-altlinuxhyph.diffrev=root=/cvs/gnome
  
  http://cvs.gnome.org/bonsai/cvsblame.cgi?file=openoffice%2Fpatches%2FOOO_1_1/system-myspell.diffrev=root=/cvs/gnome
  
  http://cvs.gnome.org/bonsai/cvsview2.cgi?diff_mode=contextwhitespace_mode=showroot=/cvs/gnomesubdir=openoffice%2Fpatches%2FOOO_1_1command=DIFF_FRAMESETroot=/cvs/gnomefile=config-switches.diffrev1=1.19rev2=1.20
  
  is the diff where I added it to config-switches.diff
  (ignore that SANE bit, was cleanup for another patch)
 
 Hmm. Those are not really cut'n' paste friendly for you to apply them
 to your tree.

Hehe, I felt the same after I had added links like those to IssueZilla.

So did Michael, I guess:

http://ooo.ximian.com/openoffice/

... a plain cvs export of ooo-build.

Regards,

Martin



Bug#216647: openoffice.org: Autopilot-Forms broken [still here ?]

2003-12-09 Thread Martin Kretzschmar
Am Di, den 09.12.2003 schrieb Chris Halls um 11:12:

 Anyway, on to the bug itself.  I think this must be one of those strange
 localised-but-not-localised directories, that gets duplicated into every
 language upstream.  Because of our language packs we don't have this
 massive duplication, and the directory is empty.

Attached is a patch to make the language pack script consider all
template directories as localised. This is currently true (i.e. there
will be no conflicts between different langpacks).

   I guess a fairly quick
 fix will be to create a soft link in each language pack to the english
 bitmaps directory.  I'll try and get it in for -4.

HTH
Martin
--- debian/local/openoffice-dpack-lang.~1.5.~	2003-08-11 13:31:31.0 +0200
+++ debian/local/openoffice-dpack-lang	2003-12-09 12:04:20.0 +0100
@@ -137,7 +137,8 @@ while (my ($key, $value) = each (%{$setu
 		
 		# Find language-specific candidates
 		# Exclude crash_dump.res because the filename isn't properly localised
-		if ((($key =~ /_Lang$/) || ($value-{Name} =~ /\.res$/))
+		if ((($key =~ /_Lang$/) || ($value-{Name} =~ /\.res$/) 
+		 || ($value-{Dir} =~ /_Template_/))
 		  ($value-{Name} ne crash_dump.res) ) {
 			# Prefer NetDir path over simple Dir
 			my $outpath = GetFullPath \%{$setup-{Directory}}, $value-{NetDir} ? $value-{NetDir} : $value-{Dir};


Bug#216647: openoffice.org: Autopilot-Forms broken [still here ?]

2003-12-09 Thread Martin Kretzschmar
Am Di, den 09.12.2003 schrieb Chris Halls um 18:08:
 On Tue, 2003-12-09 at 12:11, Martin Kretzschmar wrote:
  Attached is a patch to make the language pack script consider all
  template directories as localised. 
 
 And do what?  Duplicate the files in every -l10n-* pack?  Not to mention
 it looks like it will make openoffice.org-l10n-en uninstallable :P
 
 Hint: dpkg -S template/english/wizard/bitmap

er... umm... I was going to include a patch for openoffice.org.install
but my copy was too old and cvs doesn't work... (NOT!)

Martin




Re: Bug#208687: impress: can't save file

2003-11-09 Thread Martin Kretzschmar
tag 208687 + pending
thanks

Am Sa, den 08.11.2003 schrieb Martin Kretzschmar um 21:23:
 19381 says how to reproduce the bug
 
  http://www.openoffice.org/issues/show_bug.cgi?id=20861
 
 The patch seems to be here (twice):
 
 http://ooo.ximian.com/bonsai/cvsquery.cgi?treeid=defaultmodule=allbranch=branchtype=matchdir=graphics%2Fsvxfile=filetype=matchwho=clwhotype=matchsortby=Datehours=2date=explicitmindate=2003-10-23maxdate=2003-10-25cvsroot=%2Fvar%2Fcvsup
 
 ...but I don't have a tree for testing here ATM, so if anyone wants to
 add that patch to our set...

One night is enough to compile, so I can test now.

The patch indeed fixes the bug from IZ 19381 which sounds like this
Debian bug.

Added to ooo-build.

Martin



Re: Bug#208687: impress: can't save file

2003-11-08 Thread Martin Kretzschmar
Hi,

thank you, Eike

Am Sa, den 08.11.2003 schrieb Eike Rathke um 20:30:
 On Sun, Nov 02, 2003 at 10:41:12 +0100, Thomas Lundqvist wrote:
  I am using OpenOffice.org1.1.0 installed in /opt, downloaded from
  openoffice.org. My system is mainly woody/stable.
  
  It is rather hard to reconstruct since it is not possible to
  save the faulty presentation and since at least I haven't figured
  out the triggering operations that proceed the error.
 
 AFAIR it happens when the amount of drawing layer operations exceeded
 the configured undo count. A workaround seems to be to save the document
 in the old 5.x binary format, do _not_ close the document and do _not_
 reload it, and then immediately save it in the new XML format. Saving
 touches the undo buffer. See
 http://www.openoffice.org/issues/show_bug.cgi?id=19381

19381 says how to reproduce the bug

 http://www.openoffice.org/issues/show_bug.cgi?id=20861

The patch seems to be here (twice):

http://ooo.ximian.com/bonsai/cvsquery.cgi?treeid=defaultmodule=allbranch=branchtype=matchdir=graphics%2Fsvxfile=filetype=matchwho=clwhotype=matchsortby=Datehours=2date=explicitmindate=2003-10-23maxdate=2003-10-25cvsroot=%2Fvar%2Fcvsup

...but I don't have a tree for testing here ATM, so if anyone wants to
add that patch to our set...

Thanks,
Martin




Re: icons in 1.1 package

2003-10-07 Thread Martin Kretzschmar
Hi Johannes,

Am Di, den 07.10.2003 schrieb Johannes Wilm um 16:34:
 Hi,
 in the change logg I can see that you apparently switched to the Ximian
 cions.
 Hoever for me the old icons still seem to appear, but they have gotten a
 pink
 background! It looks quite strange. Is that the way it is supposed to
 look?

No ;-) Are all your language packs (openoffice.org-l10n-??) at version
1.1.0-1?

Martin



Re: [Open Office] COMPATIBLE patch

2003-09-03 Thread Martin Kretzschmar
Hi Jerome,

 It seems app-compatible.diff makes OOo use anyway the Microsoft
 formats by default.

Not exactly. doc-defaults.diff makes OOo use MS formats _by default_.

 I thought you'd have to put the COMPATIBLE environment variable to
 true or 1 to make it behave like this. It seems it is not even
 necessary.

app-compatible.diff has deprecated the first half of doc-defaults.diff.

But doc-defaults.diff wasn't updated, so it still makes MS formats the
default.

Is this correct, Michael?

Martin



Re: OOo small problems with GUI and menus

2003-09-01 Thread Martin Kretzschmar
Hi Jérôme,

 and there's a strange German item in the menu.

Send the french translation (of Word Count.../Wörter zählen...) and I'll
integrate it (into ooo-build/patches/RC3/word-count.diff). This menu item
is a Ximian feature/hack, it has got only English and German translations.
OOo falls back to German...

HTH,
   Martin



Re: Build system problems still unresolved

2003-09-01 Thread Martin Kretzschmar
Hi Jérôme,

Am Mo, 2003-09-01 um 13.22 schrieb Jérôme Warnier:
 This is exactly the problem:
 /home/jwarnier/debian/ooo/openoffice.org-1.0.99+1.1rc3/vcl/unx/source/src
 ...
 /home/jwarnier/debian/ooo/openoffice.org-1.0.99+1.1rc3/vcl/unx/source/gdi/native-msgbox
 --
 Making: ../../../../unxlngi4.pro/misc/salgdimsgbox.dpc
 dmake subdmake=true  -f makefile.mk instsetext= depend=t ALLDPC
 --
 No Dependencies
 -
 setenv UGLY_HACK_INDEED /LD_LIBRARY_PATH; \
 unsetenv LD_LIBRARY_PATH; \
 gcc-3.0 `pkg-config --cflags gtk+-2.0` `pkg-config --libs
 gtk+-2.0` -o ../../../../unxlngi4.pro/bin/msgbox-gnome msgbox.c; \
 setenv LD_LIBRARY_PATH /UGLY_HACK_INDEED
 pkg-config: error while loading shared libraries: libfakeroot.so.0:
 cannot open shared object file: No such file or directory
 pkg-config: error while loading shared libraries: libfakeroot.so.0:
 cannot open shared object file: No such file or directory
 gcc-3.0: error while loading shared libraries: libfakeroot.so.0: cannot
 open shared object file: No such file or directory
 /home/jwarnier/debian/ooo/openoffice.org-1.0.99+1.1rc3/vcl/source/control

So it's obviously a fakeroot bug/incompatibility, as Rene said.

A hack to have the files built manually would look like:

#this is the directory with the failed build
cd openoffice.org-1.0.99+1.1rc3
source LinuxIntelEnv.Set.sh
cd vcl
build
deliver
cd ..
rm debian/stampdir/instsetoo
dpkg-buildpackage -nc -b What you normally use here

Of course, this is untested.

   - // building is still not possible, yet could be really useful (can I
   do something to help with this? Can I try and tell where it breaks?)
  
  Hah. I had to see your // symbol so many times until I realized that it
  means parallel. I'm sure that the tools.openoffice.org people want to know
  where parallel compiling breaks.
 Well, it seems to me // always represent parallelism, but maybe your
 understanding is different?

The first thing that comes to mind are C++ or Java comments ;-)

What we wrote for parallel in geometry classes looked more like ||. (But
that looks like an OR ;-) 

Regards,
Martin



Re: OOo small problems with GUI and menus

2003-09-01 Thread Martin Kretzschmar
Am Mo, 2003-09-01 um 16.54 schrieb Jérôme Warnier:
 Le lun 01/09/2003 à 15:45, Martin Kretzschmar a écrit :
  Hi Jérôme,
  
   and there's a strange German item in the menu.
  
  Send the french translation (of Word Count.../Wörter zählen...) and I'll
  integrate it (into ooo-build/patches/RC3/word-count.diff). This menu item
  is a Ximian feature/hack, it has got only English and German translations.
  OOo falls back to German...
 Word Count = Compte des mots
 I'm not sure it would be accepted as is by the french team, but for now,
 it is a good enough translation.

O.K. I looked at abiword. It uses Statistiques. Would you prefer that/is
that what MS Word uses?

 Why doesn't it fall back to English?

Don't know. Maybe because it was once a hack for CP/M by a ~16 year-old
German teen? In the source you can't add an English string on its own.
You always have to add the German string, too ;-).

Martin



Re: OOo small problems with GUI and menus

2003-09-01 Thread Martin Kretzschmar
[ I hate the fact that Evolution sends the mail when I press C-RET ]

Am Mo, 2003-09-01 um 20.22 schrieb Martin Kretzschmar:

Why doesn't it fall back to English?
   
   Don't know. Maybe because it was once a hack for CP/M by a ~16 year-old
   German teen? In the source you can't add an English string on its own.
   You always have to add the German string, too ;-).
  You told me that it was in a Ximian patch, which I already had figured
  out by myself and forgotten immediately. That was why I didn't
  understand why it defaulted to German.

With OOo you get English only for English locales. Missing strings
always default to German. It's probably better if I translate the
other languages and insert the English string there. It will behave as
if English is default.

  But in fact, it probably comes
  from StarOffice.

Yes.



[PATCH] Icons from OOo Ximian Edition

2003-08-29 Thread Martin Kretzschmar
Hi,

probably too late for RC3 packages, but here's a patch to integrate the
icons from OOoXE into the Debian build system.

Some additional patches are necessary:

gui-icon-composite.diff
gui-tbx-ctrl-bg.diff
gui-tbx-new-size.diff

gui-new-icons.diff would be nice, too.

Use the get-ooo-icons target to download the latest icons.

The MANIFEST has to be changed, but .install files can be left
untouched.

And, well, I didn't compile from scratch with exactly these changes,
so...

HTH anyway,

Martin
Index: rules
===
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.120
diff -u -r1.120 rules
--- rules	28 Aug 2003 10:15:42 -	1.120
+++ rules	28 Aug 2003 20:55:28 -
@@ -275,9 +275,8 @@
 	#
 
 	# we do not need them and they make problem with dpkg-source
-	rm -f $(TOOLS_DIR)/desktop/*.png $(TOOLS_DIR)/src/*tar.gz \
-		$(TOOLS_DIR)/www/*.png
-	
+	rm -f $(TOOLS_DIR)/desktop/*.png $(TOOLS_DIR)/www/*.png
+
 	# Clean rule, if we had a system dmake..
 	#if [ -f $(SOURCE_TREE)/$(ENVFILE) ]; then \
 	#cd $(SOURCE_TREE)  . ./$(ENVFILE)  \
@@ -293,13 +292,27 @@
 	   $(SOURCE_TREE)/solver \
 	   $(SOURCE_TREE)/dmake/autom4te.cache
 
+	# undo scaling (i.e. remove stamps, scaled icons)
+	$(TOOLS_DIR)/bin/scale-icons $(SOURCE_TREE) --remove
+
+	# Delete all bmp and bmp.orig files
+	find . ! -path './ooo-icons*' -a ! -path './debian*' \
+	  -a ! -path *unx*.pro* -a ! -path './modified_files*' \
+	  -a \( -name '*.bmp*' -o -name '*.bmp.org' \) -exec rm {} \;
+
+	# Delete artwork tarball
+	rm -f $(TOOLS_DIR)/src/*tar.gz
+
+	# and extracted artwork
+	rm -rf $(SOURCE_TREE)/$(OOO_ICONS_VER)
+
 	# Restore modified files
 	if cd $(SOURCE_TREE)/modified_files; then \
 	  find . -type f -exec cp -v -p {} ../{} \; ;\
 	fi
 
 	rm -rf $(SOURCE_TREE)/modified_files
-	  
+
 	# Delete files in dmake
 	if [ -f dmake/Makefile ];then $(MAKE) -C dmake distclean; fi
 	rm -f dmake/dmakeroot.h
@@ -334,9 +347,6 @@
 build: build-arch build-indep
 build-arch: $(STAMP_DIR)/instsetoo
 build-indep: $(STAMP_DIR)/solver
-#
-# apply ximian patches and install new icons
-debian/stampdir/source.patch: debian/stampdir/ximian.patchapply debian/stampdir/ximian.icons
 
 # All 'important' targets have 2 lines.  The one that is run by
 # dpkg-buildpackage or the user, and the one that does the actual work.  This
@@ -385,7 +395,7 @@
 	dh_testdir $(TOOLS_DIR)/patches/apply.pl
 
 	$(MAKE) -f debian/rules control
-	
+
 	# Back up source files that we modify
 	for f in dmake/configure config_office/configure; do \
 	  mkdir -p modified_files/`dirname $$f`  \
@@ -419,9 +429,28 @@
 
 	touch $@
 
+build.prepare.icons: $(STAMP_DIR)/build.prepare.icons
+$(STAMP_DIR)/build.prepare.icons: $(STAMP_DIR)/build.prepare
+
+	# Back up all bmp files (!)
+	find . ! -path './ooo-icons*' -a ! -path './debian*' \
+	  -a ! -path *unx*.pro* -a ! -path './modified_files*' \
+	  -a -name '*.bmp' -exec cp -vfp --parent {} modified_files \;
+
+	cd $(TOOLS_DIR)/src  uudecode $(OOO_ICONS_VER).tar.gz.uu
+	tar xzf $(TOOLS_DIR)/src/$(OOO_ICONS_VER).tar.gz
+
+	$(TOOLS_DIR)/bin/scale-icons $(SOURCE_TREE)
+
+	# Copy new artwork into the tree
+	cp -avf $(SOURCE_TREE)/$(OOO_ICONS_VER)/* $(SOURCE_TREE)
+
+	# Force rebuild of image lists etc.
+	#find $(SOURCE_TREE) -name '*.src' -exec touch {} \;
+
 # Build step 2 - configure
 configure: $(STAMP_DIR)/configure
-$(STAMP_DIR)/configure: $(STAMP_DIR)/build.prepare 
+$(STAMP_DIR)/configure: $(STAMP_DIR)/build.prepare $(STAMP_DIR)/build.prepare.icons
 	dh_testdir
 	$(MAKE) -f debian/rules environment
 
@@ -448,8 +477,7 @@
 	$(CONFIGURE_FLAGS) \
 	 /dev/null
 	touch $@
-	
-#	--without-fonts \
+
 #--with-python \
 
 # Build step 3 - bootstrap
@@ -816,6 +844,11 @@
 	# press enter at the password prompt
 	cvs -d:pserver:[EMAIL PROTECTED]:/cvs/gnome login
 	cvs -z3 -d:pserver:[EMAIL PROTECTED]:/cvs/gnome co -d $(TOOLS_DIR) openoffice
+
+get-ooo-icons:
+	test -d $(TOOLS_DIR)/src || mkdir $(TOOLS_DIR)/src
+	wget -O $(TOOLS_DIR)/src/$(OOO_ICONS_VER).tar.gz http://ooo.ximian.com/packages/$(OOO_ICONS_VER).tar.gz
+	uuencode $(TOOLS_DIR)/src/$(OOO_ICONS_VER).tar.gz $(OOO_ICONS_VER).tar.gz  $(TOOLS_DIR)/src/$(OOO_ICONS_VER).tar.gz.uu
 
 # Get latest patch files from Chris' repository
 PATCHNAME=000_prerc3_stolen_from_ooo11rc3
cvs server: Diffing local
cvs server: Diffing local/scripts
cvs server: Diffing po
cvs server: Diffing scripts
Index: scripts/vars
===
RCS file: /cvs/debian-openoffice/oo-deb/debian/scripts/vars,v
retrieving revision 1.22
diff -u -r1.22 vars
--- scripts/vars	14 Aug 2003 17:20:48 -	1.22
+++ scripts/vars	28 Aug 2003 20:55:28 -
@@ -18,6 +18,9 @@
 # Directory of patch apply file
 PATCH_DIR=OOO_1_1_RC3
 
+# Ximian icons
+OOO_ICONS_VER=ooo-icons-RC3-3
+
 SOURCE_TREE=.
 
 # Language to use to generate main packages


Bug#189034: openoffice.org: Should conflict with out of date translation-packages

2003-04-14 Thread Martin Kretzschmar
Package: openoffice.org
Version: 1.0.3-1
Severity: normal

The package does not conflict with translation packages from previous
versions.

If a user upgrades from an older version for which he has installed
more than one translation package, only one will be automatically
upgraded (because of the Depends), others will stay on the system in
their old version. The most obvious problem (in 1.0.3) is a missing
menu bar in Impress.

Adding Conflicts: against translation packages  1.0.2-pre1.0.3
should help.


-- System Information
Debian Release: testing/unstable
Kernel Version: Linux baghira 2.4.20baghira #1 Mon Jan 6 10:40:54 CET
2003 i686 unknown unknown GNU/Linux

Versions of the packages openoffice.org depends on:
ii  openoffice.org 1.0.3-1+1  Debian specific parts of
OpenOffice.org pack
ii  openoffice.org 1.0.3-1English (US) language package for
openoffice
ii  openoffice.org 1.0.3-1German language package for
openoffice.org
ii  openoffice.org 1.0.3-1OpenOffice.org office suite binary
files
openoffice.org-l10n-ar  Not installed or no info
openoffice.org-l10n-da  Not installed or no info
openoffice.org-l10n-el  Not installed or no info
openoffice.org-l10n-es  Not installed or no info
openoffice.org-l10n-fr  Not installed or no info
openoffice.org-l10n-it  Not installed or no info
openoffice.org-l10n-ja  Not installed or no info
openoffice.org-l10n-ko  Not installed or no info
openoffice.org-l10n-nl  Not installed or no info
openoffice.org-l10n-pl  Not installed or no info
openoffice.org-l10n-pt  Not installed or no info
openoffice.org-l10n-ru  Not installed or no info
openoffice.org-l10n-sv  Not installed or no info
openoffice.org-l10n-tr  Not installed or no info
openoffice.org-l10n-zh-cn   Not installed or no info
openoffice.org-l10n-zh-tw   Not installed or no info