CVS:oo-deb/debian changelog,1.362.2.35,1.362.2.36 rules,1.231.2.22,1.231.2.23
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv14957/debian
Modified Files:
Tag: OPENOFFICE_ORG_1_1_3
changelog rules
Log Message:
remove ARM dmake hack again, makefile.mk now fixed, thanks Chris
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.362.2.35
retrieving revision 1.362.2.36
diff -u -d -r1.362.2.35 -r1.362.2.36
--- changelog 7 Nov 2004 17:32:14 -0000 1.362.2.35
+++ changelog 8 Nov 2004 10:40:44 -0000 1.362.2.36
@@ -7,9 +7,6 @@
JDK 1.4?) (closes: #260435) [RE]
* debian/rules:
- remove patch apply conditionals on arm, now in ooo-build proper [RE]
- - add hack to run a dmake in bridges/source/cpp_uno/gcc3_linux_arm to
- get the directory be able to autobuild since it somehow only works on
- second run... [RE]
* debian/patches/linux-arm-support.diff: remove, now in ooo-build proper [RE]
-- Rene Engelhard <rene@debian.org> Sun, 7 Nov 2004 18:23:23 +0100
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.231.2.22
retrieving revision 1.231.2.23
diff -u -d -r1.231.2.22 -r1.231.2.23
--- rules 7 Nov 2004 20:37:34 -0000 1.231.2.22
+++ rules 8 Nov 2004 10:40:44 -0000 1.231.2.23
@@ -697,15 +697,6 @@
$(STAMP_DIR)/solver: $(STAMP_DIR)/bootstrap
dh_testdir
-ifeq "$(ARCH)-linux" "arm-linux"
- # the first try somehow fails and the second one suceeds. see
- # http://porting.openoffice.org/servlets/ReadMsg?list=dev&msgNo=14612
- # hack around this by just trying a dmake here and the subsequent
- # normal "build" should work then
- -. $(SOURCE_TREE)/$(ENVFILE); \
- cd $(SOURCE_TREE)/bridges/source/cpp_uno/gcc3_linux_arm && $(DMAKE)
-endif
-
. $(SOURCE_TREE)/$(ENVFILE); cd $(SOURCE_TREE)/instsetoo && \
$(BUILDCMD) $(STARTFROM) $(BUILDFLAGS) -- instsetext= $(DMAKEFLAGS)
Reply to: