Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv31966
Modified Files:
changelog rules
Log Message:
- mention setup-in-bind-mount and build-sparc-boost in changelog
- add detection for green-threads libhpi* on powepc, issue an big fat
warning if it is found in an system-wide location
- close the two RC bugs
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- changelog 29 Sep 2003 22:47:11 -0000 1.186
+++ changelog 30 Sep 2003 15:03:19 -0000 1.187
@@ -1,6 +1,8 @@
openoffice.org (1.0.99+1.1rc5b-0pre1) unstable; urgency=low
* New upstream version: 1.1 rc5 [CH]
+ * package now builds on powerpc; issue a warning is a file is found
+ which could lead to ppc builds fail (closes: #206238)
* more Ximian merge:
+ print-fontconfig [MM], padmin-nofontconfig [CH]: use fontconfig for font
configuration. Remove font dialog from padmin.
@@ -26,6 +28,9 @@
not jar xf...
+ debian-splash [RE]: use a "Debian splashscreen" and modify about
information accordingly..
+ + setup-in-bind-mount [CH]: Work around 'absolute programpath cannot be
+ found.' error when running setup in a bind mount IZ#20459
+ + build-sparc-boost [CH]: fix atomic dec/inc for Sparc IZ#15502
* debian/rules:
+ fix typos, makes mozilla autodisable actually work, thanks
Jerome Warnier [RE]
@@ -72,7 +77,7 @@
* debian/setperms:
+ add xcftobmp [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 28 Sep 2003 22:12:28 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 30 Sep 2003 16:37:23 +0200
openoffice.org (1.0.99+1.1rc3-1) unstable; urgency=low
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- rules 29 Sep 2003 22:47:11 -0000 1.128
+++ rules 30 Sep 2003 15:03:19 -0000 1.129
@@ -500,6 +500,22 @@
# or specify a JDK location with
DEB_BUILD_OPTIONS=jdkhome=/absolute/path/to/jdk
test -x /$(JDK_HOME)/bin/javac
+ # test for libhpi.so and warn ppc folks....
+ifeq "$(ARCH)" "powerpc"
+ find /$(JDK_HOME) -type f -name "libhpi*" | grep usr | grep green \
+ > debian/libhpi.search && if [ -s debian/libhpi.search ]; then \
+ echo ""; echo ""; \
+ echo
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" ;
\
+ echo "green_threads libhpi.so found in"; \
+ echo "`cat debian/libhpi.search | sed -e s,//,/,`.";\
+ echo "This could let the build fail with \"OUCH: nested memory code, to
1 levels.\""; \
+ echo "For a working build you may want to remove that file..."; \
+ echo
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; \
+ echo ""; echo ""; \
+ fi; \
+ rm debian/libhpi.search
+endif
+
# Make sure we have /proc mounted - otherwise idlc will fail later.
test -r /proc/version
