CVS:oo-deb/debian changelog,1.355,1.356 rules,1.226,1.227
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv6816
Modified Files:
changelog rules
Log Message:
- mention the usage of ooo-build branch in changelog
- add hack to apply the ARM support patch
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -d -r1.355 -r1.356
--- changelog 21 Jul 2004 14:21:08 -0000 1.355
+++ changelog 25 Jul 2004 15:59:43 -0000 1.356
@@ -1,6 +1,7 @@
openoffice.org (1.1.2-2.3pre) unstable; urgency=low
- * ARM architecture support, thanks Peter Naulls [PN], not yet enabled
+ * ARM architecture support added, thanks Peter Naulls [PN],
+ not yet enabled
* New patches:
- sparc-v8-fixes: do not use the cas statement on sparc, makes
libsal.so.3.1.0 v8-compatible (closes: #256347), thanks Jim Watson
@@ -20,12 +21,16 @@
- Add java_uno_accessbridge.jar and wildcards for other architectures [CH]
* debian/rules:
- add ARM to checks in makebinariestar [PN, RE]
+ - add hack to apply Linux/ARM support patch [RE]
+ - get/use ooo-build-1-1 branch of ooo-build in get-ooo-build [RE]
* debian/openoffice.org-bin.install:
- add ARM support [PN]
* debian/MANIFEST.arm: add [PN, RE]
* debian/scripts/vars.arm: add [PN]
+ * debian/patches/linux-arm-support.diff: add as hack until it could be
+ added to ooo-build... [RE]
- -- Rene Engelhard <rene@debian.org> Tue, 20 Jul 2004 21:03:27 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 25 Jul 2004 17:06:41 +0200
openoffice.org (1.1.2-2) unstable; urgency=low
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- rules 21 Jul 2004 19:20:37 -0000 1.226
+++ rules 25 Jul 2004 15:59:43 -0000 1.227
@@ -498,6 +498,13 @@
chmod 755 $(OOO_BUILD)/patches/apply.pl
$(OOO_BUILD)/patches/apply.pl $(CURDIR)/$(OOO_BUILD)/patches/$(PATCH_DIR) $(CURDIR)/$(BUILD_DIR) --distro=$(PATCHSET) -f
+ifeq "$(ARCH)-linux" "arm-linux"
+ if [ ! -f bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s ]; then \
+ patch -p0 --dry-run < debian/patches/linux-arm-support.diff && \
+ patch -p0 < debian/patches/linux-arm-support.diff; \
+ fi
+endif
+
mkdir -p $(STAMP_DIR)
touch $@
@@ -508,6 +515,13 @@
chmod 755 $(OOO_BUILD)/patches/apply.pl
$(OOO_BUILD)/patches/apply.pl $(CURDIR)/$(OOO_BUILD)/patches/$(PATCH_DIR) $(CURDIR)/$(BUILD_DIR) --distro=$(PATCHSET) -f -R
rm -f $(STAMP_DIR)/patch.apply
+
+ifeq "$(ARCH)-linux" "arm-linux"
+ if [ -f bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s ]; then \
+ patch -R -p0 --dry-run < debian/patches/linux-arm-support.diff \
+ && patch -R -p0 < debian/patches/linux-arm-support.diff; \
+ fi
+endif
mkdir -p $(STAMP_DIR)
touch $@
Reply to: