./packages/openofficeorg/3.2/experimental r1748: merge cut'n'paste fix
------------------------------------------------------------
revno: 1748 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sat 2009-12-19 18:18:09 +0100
message:
merge cut'n'paste fix
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-12-19 00:12:04 +0000
+++ b/changelog 2009-12-19 17:18:09 +0000
@@ -41,7 +41,7 @@
- move libcalc??.so into -base as it actually is a db driver, not a
calc component. Makes Base start up without -calc installed now...
- -- Rene Engelhard <rene@debian.org> Fri, 18 Dec 2009 23:07:39 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 19 Dec 2009 18:05:14 +0100
openoffice.org (1:3.1.1-10) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2009-12-19 00:12:04 +0000
+++ b/rules 2009-12-19 17:18:09 +0000
@@ -2360,8 +2360,9 @@
done
endif
mv $(PKGDIR)-core/$(OODIR)/program/libflat*so \
- $(PKGDIR)-base/$(OODIR)/program; \
- mv $(PKGDIR)-core/$(OODIR)/program/libcalc*so \
+ $(PKGDIR)-base/$(OODIR)/program
+ # http://www.openoffice.org/issues/show_bug.cgi?id=107779
+ mv $(PKGDIR)-calc/$(OODIR)/program/libcalc*so \
$(PKGDIR)-base/$(OODIR)/program; \
# move vba stuff into -calc, they are calc-only and linked to
Reply to: