----- Original Message ----- From: "Chris Halls" <[EMAIL PROTECTED]> To: <debian-openoffice@lists.debian.org> Sent: Thursday, December 11, 2003 11:00 AM Subject: CVS:oo-deb/debian changelog,1.244,1.245 rules,1.170,1.171
> Update of /home/halls/cvs/debian-openoffice/oo-deb/debian > In directory gluck:/tmp/cvs-serv9097 > > Modified Files: > changelog rules > Log Message: > For Woody backport, select patchset DebianWoody that does not use the > system libfreetype patch > > > Index: changelog > =================================================================== > RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/changelog,v > retrieving revision 1.244 > retrieving revision 1.245 > diff -u -d -r1.244 -r1.245 > --- changelog 11 Dec 2003 12:54:57 -0000 1.244 > +++ changelog 11 Dec 2003 13:00:42 -0000 1.245 > @@ -2,9 +2,14 @@ > > * debian/rules: > - Fix uudecode/encoding of OpenSymbol font [CH] > + - select DebianWoody patchset for builds without the system > + libfreetype [CH] > * debian/control.in: > - Remove Recommends: x-ttcidfont-conf since Debian fontconfig has defoma > support now (thanks to Ozgur Murat Homurlu) [CH] > + * ooo-build/patches/OOO_1_1_0/apply: > + - add a second patchset, DebianWoody, that excludes > + the system libfreetype patch [CH] > > -- Chris Halls <[EMAIL PROTECTED]> Wed, 3 Dec 2003 15:08:18 +0100 > > > Index: rules > =================================================================== > RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/rules,v > retrieving revision 1.170 > retrieving revision 1.171 > diff -u -d -r1.170 -r1.171 > --- rules 11 Dec 2003 12:54:57 -0000 1.170 > +++ rules 11 Dec 2003 13:00:42 -0000 1.171 > @@ -105,6 +105,7 @@ > #CONFIGURE_FLAGS+= --with-stlport4-home=$(CURDIR)/stlport-home > USE_FONTCONFIG=y > CONFIGURE_FLAGS+= --enable-fontconfig > + PATCHSET=DebianWoody > else > # use latest gcc-3.x compiler version > _CC:=$(shell cd /usr/bin; ls gcc-3.* | tail -1) > @@ -112,6 +113,7 @@ > > # Don't use system libstlport > USE_SYSTEM_STLPORT=n > + PATCHSET=Debian > endif > > # gcc version can be overriden by setting GCCVER in scripts/vars[.arch] > @@ -123,8 +125,9 @@ > ifeq "$(_CC)" "gcc-3.0" > # gcc 3.0 Backport - disable mozilla and MANIFEST check > IGNORE_MANIFEST_CHANGES=1 > - MOZILLA=n > export IGNORE_MANIFEST_CHANGES > + MOZILLA=n > + CONFIGURE_FLAGS+= --disable-symbols > else > # gcc 3.0 didn't understand -g1, but newer compilers do > CONFIGURE_FLAGS+= --enable-symbols=SMALL > @@ -416,16 +419,8 @@ > > rm -f $(STAMP_DIR)/patch.unapply > chmod 755 $(OOO_BUILD)/patches/apply.pl > - $(OOO_BUILD)/patches/apply.pl $(OOO_BUILD)/patches/$(PATCH_DIR) $(BUILD_DIR) --distro=Debian -f > + $(OOO_BUILD)/patches/apply.pl $(OOO_BUILD)/patches/$(PATCH_DIR) $(BUILD_DIR) --distro=$(PATCHSET) -f > > -ifeq "$(USE_INTERNAL_FREETYPE)" "y" > - # Woody system - unapply system-freetype patch > - ftpatch="`ls $(BUILD_DIR)/applied_patches/???-gui-ft-dynlink-system.patch`" ; \ > - if [ -f "$$ftpatch" ]; then \ > - patch -R -l -b -p0 -f -d $(BUILD_DIR) < "$$ftpatch" && \ > - rm "$$ftpatch" ;\ > - fi > -endif > mkdir -p $(STAMP_DIR) > touch $@ > > @@ -434,7 +429,7 @@ > dh_testdir $(OOO_BUILD)/patches/apply.pl > > chmod 755 $(OOO_BUILD)/patches/apply.pl > - $(OOO_BUILD)/patches/apply.pl $(OOO_BUILD)/patches/$(PATCH_DIR) $(BUILD_DIR) --distro=Debian -f -R > + $(OOO_BUILD)/patches/apply.pl $(OOO_BUILD)/patches/$(PATCH_DIR) $(BUILD_DIR) --distro=$(PATCHSET) -f -R > rm -f $(STAMP_DIR)/patch.apply > > mkdir -p $(STAMP_DIR) > > > -- > To UNSUBSCRIBE, email to [EMAIL PROTECTED] > with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]