]>
Commit | Line | Data |
---|---|---|
02b68c40 AM |
1 | Index: ChangeLog |
2 | =================================================================== | |
3 | RCS file: /cvs/gnome/ooo-build/ChangeLog,v | |
4 | retrieving revision 1.908 | |
5 | retrieving revision 1.909 | |
6 | diff -u -u -r1.908 -r1.909 | |
7 | --- ooo-build/ChangeLog 26 Jun 2004 18:52:22 -0000 1.908 | |
8 | +++ ChangeLog 27 Jun 2004 17:07:46 -0000 1.909 | |
9 | @@ -1,3 +1,8 @@ | |
10 | +2004-06-27 Rene Engelhard <rene@debian.org> | |
11 | + | |
12 | + * patches/OOO_1_1/print-fonconfig.diff: doh, hunk for | |
13 | + psprint/util/makefile.mk got lost, readd | |
14 | + | |
15 | 2004-06-26 Michael Meeks <michael@ximian.com> | |
16 | ||
17 | * Version 1.1.60 | |
18 | Index: patches/OOO_1_1/print-fontconfig.diff | |
19 | =================================================================== | |
20 | RCS file: /cvs/gnome/ooo-build/patches/OOO_1_1/print-fontconfig.diff,v | |
21 | retrieving revision 1.13 | |
22 | retrieving revision 1.14 | |
23 | diff -u -u -r1.13 -r1.14 | |
24 | --- ooo-build/patches/OOO_1_1/print-fontconfig.diff 12 Jun 2004 18:28:43 -0000 1.13 | |
25 | +++ ooo-build/patches/OOO_1_1/print-fontconfig.diff 27 Jun 2004 17:07:46 -0000 1.14 | |
26 | @@ -861,3 +861,16 @@ | |
27 | SHL1DEF= $(MISC)$/$(SHL1TARGET).def | |
28 | ||
29 | DEF1NAME =$(SHL1TARGET) | |
30 | +--- psprint/util/makefile.mk-old 2004-06-27 18:48:42.000000000 +0200 | |
31 | ++++ psprint/util/makefile.mk 2004-06-27 18:48:12.000000000 +0200 | |
32 | +@@ -105,6 +105,10 @@ | |
33 | + $(SALLIB) \ | |
34 | + -lX11 | |
35 | + | |
36 | ++.IF "$(FONTCONFIG_FONTS)" == "YES" | |
37 | ++SHL1STDLIBS+=$(FONTCONFIG_LIBS) | |
38 | ++.ENDIF | |
39 | ++ | |
40 | + .IF "$(SOLAR_JAVA)"!="" | |
41 | + SHL1STDLIBS+=$(JVMACCESSLIB) | |
42 | + .ENDIF |