Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv22766
Modified Files:
changelog rules
Log Message:
- mention sysui-translations.diff
- make makebinariestar working for !i386
- move rm of RH's splash things to the other rm's for binary-stuff to
not have them on differen places around
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- changelog 1 Apr 2004 04:24:28 -0000 1.284
+++ changelog 2 Apr 2004 21:04:31 -0000 1.285
@@ -1,13 +1,18 @@
openoffice.org (1.1.1-1.2pre) unstable; urgency=low
+ * New patches:
+ - sysui-translations.diff: add .fi translations to sysui, thanks
+ Martin-Éric Racine (closes: #236796)
* debian/control.in:
- modify libdb builddeps to not require it on woody [RE]
- Standards-Version: 3.6.1 (no changes needed)
* debian/rules:
- disable use of external libdb and libmyspell for woody builds,
- thanks Severin Greimel for the pointer [RE]
+ it won't work because we have to use g++-3.0 on woody and libdb3_cxx is
+ C++ built with g++-2.95... thanks Severin Greimel for the pointer [RE]
+ - make debian/rules makebinariestar working on !i386 [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 1 Apr 2004 06:01:22 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 2 Apr 2004 21:48:09 +0200
openoffice.org (1.1.1-1) unstable; urgency=low
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- rules 1 Apr 2004 04:24:28 -0000 1.190
+++ rules 2 Apr 2004 21:04:31 -0000 1.191
@@ -328,7 +328,9 @@
# we do not need them and they make problem with dpkg-source....
rm -f $(OOO_BUILD)/desktop/*.png $(OOO_BUILD)/www/*.png \
$(OOO_BUILD)/www/images/*.png $(OOO_BUILD)/templates/*.s* \
- $(OOO_BUILD)/www/l10n/*.gif
+ $(OOO_BUILD)/www/l10n/*.gif \
+ $(OOO_BUILD)/src/open*bmp
+
if [ -d $(OOO_BUILD)/test ]; then cd $(OOO_BUILD)/test && \
find . -type f | xargs rm -f; fi
@@ -347,10 +349,6 @@
rm -f debian/openintro_debian.xcf debian/openintro_debian.bmp \
offmgr/res/openintro_debian.bmp
- # remove Red Hat binary bitmaps
- rm -f ooo-build/src/openabout_redhat.bmp \
- ooo-build/src/openintro_redhat.bmp
-
# undo scaling (i.e. remove stamps, scaled icons)
chmod 755 $(OOO_BUILD)/bin/scale-icons
if [ -d modified_files ]; then \
@@ -1183,9 +1181,15 @@
# Take a tarfile of all the non-stripped binaries in solver, for generating
backtraces
# from coredumps.
makebinariestar:
+ifeq "$(ARCH)" "i386"
cd $(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR) && \
find bin lib | xargs file | sed -n '/LSB \(executable\|shared
object\),.* not stripped/ s/:.*$$//p' | \
- tar -T - -jcvf
$(CURDIR)/../openoffice-binaries.$(SOURCE_VERSION).tar.bz2
+ tar -T - -jcvf
$(CURDIR)/../openoffice.org-binaries_$(SOURCE_VERSION)_$(ARCH).tar.bz2
+else
+ cd $(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR) && \
+ find bin lib | xargs file | sed -n '/MSB \(executable\|shared
object\),.* not stripped/ s/:.*$$//p' | \
+ tar -T - -jcvf
$(CURDIR)/../openoffice.org-binaries_$(SOURCE_VERSION)_$(ARCH).tar.bz2
+endif
# -------------------------------------------------------
