./packages/openofficeorg/3.2.1/experimental r1988: merge
------------------------------------------------------------
revno: 1988 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2010-05-18 17:23:29 +0200
message:
merge
added:
openoffice.org-kab.bug-script.in
modified:
changelog
openoffice.org-evolution.bug-script.in
openoffice.org-filter-binfilter.bug-script.in
rules
=== modified file 'changelog'
--- a/changelog 2010-05-17 15:12:54 +0000
+++ b/changelog 2010-05-18 15:23:29 +0000
@@ -5,6 +5,9 @@
* debian/control.in:
- add Breaks: -style-* as with new -common and old -style the newly branded
startcenter is broken, thanks Mechtilde Stehmann
+ * debian/rules,
+ debian/openoffice.org-{filter-binfilter,evolution,kab}.bug-script.in:
+ fix component bug scripts and add the kab one
-- Rene Engelhard <rene@debian.org> Fri, 14 May 2010 16:39:37 +0200
=== modified file 'openoffice.org-evolution.bug-script.in'
--- a/openoffice.org-evolution.bug-script.in 2010-02-02 23:10:41 +0000
+++ b/openoffice.org-evolution.bug-script.in 2010-05-18 15:17:51 +0000
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/openoffice/program/unopkg list --shared org.openoffice.legacy.mailmerge.py >&3
+/usr/lib/ure/bin/regview /var/lib/openoffice/basis@BASIS_VERSION@/program/services.rdb | grep evoab >&3
=== modified file 'openoffice.org-filter-binfilter.bug-script.in'
--- a/openoffice.org-filter-binfilter.bug-script.in 2010-02-02 23:10:41 +0000
+++ b/openoffice.org-filter-binfilter.bug-script.in 2010-05-18 15:17:51 +0000
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/ure/bin/regview /var/lib/openoffice/basis3.1/program/services.rdb | grep bf_ >&3
+/usr/lib/ure/bin/regview /var/lib/openoffice/basis@BASIS_VERSION@/program/services.rdb | grep bf_ >&3
=== added file 'openoffice.org-kab.bug-script.in'
--- a/openoffice.org-kab.bug-script.in 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-kab.bug-script.in 2010-05-18 15:17:51 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/lib/ure/bin/regview /var/lib/openoffice/basis@BASIS_VERSION@/program/services.rdb | grep kab >&3
=== modified file 'rules'
--- a/rules 2010-05-14 17:55:33 +0000
+++ b/rules 2010-05-18 15:23:29 +0000
@@ -2908,6 +2908,7 @@
if [ -e debian/$$i.bug-script.in ]; then \
cat debian/$$i.bug-script.in \
| sed -e "s/@PLATFORMID@/$(PLATFORMID)/" \
+ | sed -e "s/@BASIS_VERSION@/$(BASIS_VERSION)/" \
> debian/$$i.bug-script; \
fi ;\
done
@@ -3347,6 +3348,7 @@
if [ -e debian/$$i.bug-script.in ]; then \
cat debian/$$i.bug-script.in \
| sed -e "s/@PLATFORMID@/$(PLATFORMID)/" \
+ | sed -e "s/@BASIS_VERSION@/$(BASIS_VERSION)/" \
> debian/$$i.bug-script; \
fi ;\
done
Reply to: