------------------------------------------------------------
revno: 1962
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Mon 2010-04-26 03:21:29 +0200
message:
update to use @OOBASISDIR@ and move links.in creation to install-arch, it's
not a maintscript
modified:
control
openoffice.org-evolution.links.in
openoffice.org-filter-binfilter.links.in
openoffice.org-kab.links.in
rules
=== modified file 'control'
--- a/control 2010-04-25 17:56:28 +0000
+++ b/control 2010-04-26 01:21:29 +0000
@@ -3669,7 +3669,7 @@
Package: openoffice.org-kab
Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 armel hppa ia64
ppc64 s390x sparc
-Pre-Depends: openoffice.org-common (>= 1:3.1.0-2), openoffice.org-core (>=
1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
+Pre-Depends: debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Recommends: kaddressbook
Replaces: openoffice.org-kde (<= 1:3.0.0~beta2-1)
=== modified file 'openoffice.org-evolution.links.in'
--- a/openoffice.org-evolution.links.in 2010-04-25 17:56:28 +0000
+++ b/openoffice.org-evolution.links.in 2010-04-26 01:21:29 +0000
@@ -1,1 +1,1 @@
-usr/lib/openoffice/basis3.2/program/libev...@libsuffix@.so
usr/lib/openoffice/basis3.2/registered-components/libev...@libsuffix@.so
\ No newline at end of file
+...@oobasisdir@/program/libev...@libsuffix@.so
@OOBASISDIR@/registered-components/libev...@libsuffix@.so
=== modified file 'openoffice.org-filter-binfilter.links.in'
--- a/openoffice.org-filter-binfilter.links.in 2010-04-25 17:56:28 +0000
+++ b/openoffice.org-filter-binfilter.links.in 2010-04-26 01:21:29 +0000
@@ -1,1 +1,1 @@
-usr/lib/openoffice/basis3.2/program/libbf_migratefil...@libsuffix@.so
usr/lib/openoffice/basis3.2/registered-components/libbf_migratefil...@libsuffix@.so
\ No newline at end of file
+...@oobasisdir@/program/libbf_migratefil...@libsuffix@.so
@OOBASISDIR@/registered-components/libbf_migratefil...@libsuffix@.so
=== modified file 'openoffice.org-kab.links.in'
--- a/openoffice.org-kab.links.in 2010-04-26 00:59:04 +0000
+++ b/openoffice.org-kab.links.in 2010-04-26 01:21:29 +0000
@@ -1,1 +1,1 @@
-usr/lib/openoffice/basis3.2/program/libkab1.so
usr/lib/openoffice/basis3.2/registered-components/libkab1.so
+...@oobasisdir@/program/libkab1.so
@OOBASISDIR@/registered-components/libkab1.so
=== modified file 'rules'
--- a/rules 2010-04-25 17:56:28 +0000
+++ b/rules 2010-04-26 01:21:29 +0000
@@ -2247,14 +2247,6 @@
rm -f debian/*.{pre,post}{inst,rm}
- # generate .link files from *.in
- for PKG in $(PACKAGES); do \
- LINKS=debian/$$PKG.links ; \
- if [ -e $$LINKS.in ]; then \
- sed -e "s/\...@libsuffix\@/$(LIBSUFFIX)/g" $$LINKS.in > $$LINKS ; \
- fi; \
- done
-
# generate maintainer scripts from *.in
for PKG in $(PACKAGES); do \
for FILE in postinst postrm preinst prerm; do \
@@ -2932,6 +2924,16 @@
> debian/$$i.bug-script; \
fi ;\
done
+ # generate .links files from *.in
+ for PKG in $(ARCH_DEP_PACKAGES); do \
+ LINKS=debian/$$PKG.links ; \
+ if [ -e $$LINKS.in ]; then \
+ sed -e "s/\...@libsuffix\@/$(LIBSUFFIX)/g" \
+ -e "s...@oobasisdir\@#$(OOBASISDIR)#g" \
+ < $$LINKS.in > $$LINKS ; \
+ fi; \
+ done
+
touch $@
