./packages/openofficeorg/3.0/experimental r1054: add PLATFORMID
------------------------------------------------------------
revno: 1054
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-04-24 18:09:16 +0200
message:
add PLATFORMID
modified:
changelog
rules
scripts/vars.amd64
scripts/vars.arm
scripts/vars.armel
scripts/vars.i386
scripts/vars.ia64
scripts/vars.mips
scripts/vars.mipsel
scripts/vars.powerpc
scripts/vars.ppc64
scripts/vars.s390
scripts/vars.solaris-i386
scripts/vars.sparc
=== modified file 'changelog'
--- a/changelog 2008-04-24 16:08:25 +0000
+++ b/changelog 2008-04-24 16:09:16 +0000
@@ -4,7 +4,7 @@
- Base now doesn't quit anymore on "recently used files" in the wizard
when those got deleted/moved (closes: #452810)
* ooo-build:
- - update (r12314)
+ - update (r12321)
* debian/template.desktop.in: move to ..
* debian/startcenter.desktop.in: .. this and run ooffice now, which
will bring us to the new StartCenter. Reuse writers icon.
@@ -37,8 +37,10 @@
chages through it
- build-depend against libxrandr-dev
* debian/copyright: LGPL v3
+ * debian/scripts/vars.*: add PLATFORMID (not kfreebsd-* yet...);
+ actually add vars.ppc64
- -- Rene Engelhard <rene@debian.org> Wed, 23 Apr 2008 22:02:49 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 24 Apr 2008 18:02:28 +0200
openoffice.org (1:2.4.0-5.6pre) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-04-24 16:08:25 +0000
+++ b/rules 2008-04-24 16:09:16 +0000
@@ -241,6 +241,7 @@
# Architecture-specific changes
LIBSUFFIX := $(shell grep LIBSUFFIX debian/scripts/vars.$(ARCH) | cut -d"=" -f2)
+PLATFORMID := $(shell grep PLATFORMID debian/scripts/vars.$(ARCH) | cut -d"=" -f2)
ifneq "$(ETCH_BACKPORT)" "y"
OOO_STLPORT_ARCHS= i386
@@ -1704,6 +1705,7 @@
if [ -e $$MAINTSCRIPT.in ]; then \
sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' < $$MAINTSCRIPT.in | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' > $$MAINTSCRIPT; \
grep LIBSUFFIX debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
+ grep PLATFORMID debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
cat debian/shell-lib.sh >> $$MAINTSCRIPT; \
sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' < $$MAINTSCRIPT.in | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >> $$MAINTSCRIPT; \
perl -pi -e "s/\@LANGPACKISOS\@/$(LANGPACKISOS)/" $$MAINTSCRIPT; \
=== modified file 'scripts/vars.amd64'
--- a/scripts/vars.amd64 2006-12-20 13:36:51 +0000
+++ b/scripts/vars.amd64 2008-04-24 16:09:16 +0000
@@ -1,1 +1,2 @@
LIBSUFFIX=lx
+PLATFORMID=linux_x86_64
=== modified file 'scripts/vars.arm'
--- a/scripts/vars.arm 2007-11-09 16:15:20 +0000
+++ b/scripts/vars.arm 2008-04-24 16:09:16 +0000
@@ -1,1 +1,2 @@
LIBSUFFIX=lr
+PLATFORMID=linux_arm_oabi
=== modified file 'scripts/vars.armel'
--- a/scripts/vars.armel 2007-12-18 17:05:56 +0000
+++ b/scripts/vars.armel 2008-04-24 16:09:16 +0000
@@ -1,1 +1,2 @@
LIBSUFFIX=lr
+PLATFORMID=linux_arm_eabi
=== modified file 'scripts/vars.i386'
--- a/scripts/vars.i386 2006-12-20 13:36:51 +0000
+++ b/scripts/vars.i386 2008-04-24 16:09:16 +0000
@@ -1,1 +1,2 @@
LIBSUFFIX=li
+PLATFORMID=linux_x86
=== modified file 'scripts/vars.ia64'
--- a/scripts/vars.ia64 2008-01-20 22:46:42 +0000
+++ b/scripts/vars.ia64 2008-04-24 16:09:16 +0000
@@ -1,1 +1,2 @@
LIBSUFFIX=la
+PLATFORMID=linux_ia64
=== modified file 'scripts/vars.mips'
--- a/scripts/vars.mips 2007-01-28 11:32:58 +0000
+++ b/scripts/vars.mips 2008-04-24 16:09:16 +0000
@@ -1,1 +1,2 @@
LIBSUFFIX=lm
+PLATFORMID=linux_mips_eb
=== modified file 'scripts/vars.mipsel'
--- a/scripts/vars.mipsel 2007-10-16 23:22:40 +0000
+++ b/scripts/vars.mipsel 2008-04-24 16:09:16 +0000
@@ -1,1 +1,2 @@
LIBSUFFIX=lm
+PLATFORMID=linux_mips_el
=== modified file 'scripts/vars.powerpc'
--- a/scripts/vars.powerpc 2006-12-20 13:36:51 +0000
+++ b/scripts/vars.powerpc 2008-04-24 16:09:16 +0000
@@ -1,1 +1,2 @@
LIBSUFFIX=lp
+PLATFORMID=linux_powerpc
=== modified file 'scripts/vars.ppc64'
--- a/scripts/vars.ppc64 2008-04-24 16:03:39 +0000
+++ b/scripts/vars.ppc64 2008-04-24 16:09:16 +0000
@@ -1,1 +1,2 @@
LIBSUFFIX=lp
+PLATFORMID=linux_powerpc64
=== modified file 'scripts/vars.s390'
--- a/scripts/vars.s390 2006-12-20 13:38:46 +0000
+++ b/scripts/vars.s390 2008-04-24 16:09:16 +0000
@@ -1,1 +1,2 @@
LIBSUFFIX=l3
+PLATFORMID=linux_s390
=== modified file 'scripts/vars.solaris-i386'
--- a/scripts/vars.solaris-i386 2007-10-17 12:04:37 +0000
+++ b/scripts/vars.solaris-i386 2008-04-24 16:09:16 +0000
@@ -1,1 +1,2 @@
LIBSUFFIX=si
+PLATFORMID=solaris_x86
=== modified file 'scripts/vars.sparc'
--- a/scripts/vars.sparc 2006-12-20 13:36:51 +0000
+++ b/scripts/vars.sparc 2008-04-24 16:09:16 +0000
@@ -1,1 +1,2 @@
LIBSUFFIX=ls
+PLATFORMID=linux_sparc
Reply to: