------------------------------------------------------------
revno: 1098
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-05-11 15:52:00 +0200
message:
fix -qa-tools' depends, no -gcj when building --without-java, fix comment,
udate ooo-build
modified:
changelog
control
control.qa.in
rules
=== modified file 'changelog'
--- a/changelog 2008-05-05 00:37:12 +0000
+++ b/changelog 2008-05-11 13:52:00 +0000
@@ -1,15 +1,18 @@
openoffice.org (1:2.4.0-6.7pre) unstable; urgency=low
* ooo-build:
- - update (r12455)
+ - update (r12510)
* debian/rules:
- update for new xulrunner 1.9 packaging using iceape-dev
+ - specify -Nopenoffice.org-gcj when building without Java
+ * debian/control.qa.in:
+ - fix -qa-tools' depends
* debian/copyright: fix "Obtained from", mention go-oo.org. Remove obsolete
section about odk/sdk_oo
* debian/control.in, debian/rules:
- fix Vcs-Svn:, make it a generated field
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 05 May 2008 02:35:36 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 11 May 2008 15:49:38 +0200
openoffice.org (1:2.4.0-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-05-05 00:37:12 +0000
+++ b/control 2008-05-11 13:52:00 +0000
@@ -3036,7 +3036,7 @@
Package: openoffice.org-qa-tools
Section: devel
Priority: extra
-Depends: ${shlibs:Depends}, openoffice.org (>> ${base-version}),
openoffice.org-filter-so52, openoffice.org-java-common
+Depends: ${shlibs:Depends}, openoffice.org (>> ${base-version}),
${ooo-binfilter-dep}, ${java-common-depends}
Recommends: openoffice.org-qa-api-tests, openoffice.org-qa-ui-tests
Conflicts: openoffice.org-core (<< 1:2.3.0~oog680m2)
Replaces: openoffice.org-common (<< 2.0.4~ood680m2)
=== modified file 'control.qa.in'
--- a/control.qa.in 2008-02-08 13:23:13 +0000
+++ b/control.qa.in 2008-05-11 13:52:00 +0000
@@ -3,8 +3,8 @@
Priority: extra
Depends: ${shlibs:Depends},
openoffice.orgVER (>> ${base-version}),
- openoffice.orgVER-filter-so52,
- openoffice.orgVER-java-common
+ ${ooo-binfilter-dep},
+ ${java-common-depends}
Recommends: openoffice.orgVER-qa-api-tests,
openoffice.orgVER-qa-ui-tests
Conflicts: openoffice.org-core (<< 1:2.3.0~oog680m2)
=== modified file 'rules'
--- a/rules 2008-05-05 00:45:39 +0000
+++ b/rules 2008-05-11 13:52:00 +0000
@@ -583,7 +583,7 @@
OOO_OFFICEBEAN_DEP = openoffice.org$(VER)-officebean
else
CONFIGURE_FLAGS += --without-java
- DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-officebean
-Nopenoffice.org$(VER)-java-common -Nopenoffice.org$(VER)-filter-mobiledev
+ DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-officebean
-Nopenoffice.org$(VER)-java-common -Nopenoffice.org$(VER)-filter-mobiledev
-Nopenoffice.org$(VER)-gcj
endif
ifneq "$(MOZILLA)" ""
@@ -2810,7 +2810,7 @@
# we need to do it in two steps. The new dpkg-shlibdeps doesn't find
# /usr/lib/libgcj-bc.so when specifying -l/usr/lib/$(GCJ_JAWT_DIR)
# and therefore we must not use it for -gcj. But we *do* need it
- # for -officebean (libjawt.so is there)
+ # for -officebean (libjawt.so is referenced there)
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
dh_shlibdeps -s -Nopenoffice.org$(VER)-officebean \
-l$(PKGDIR)-core/$(OODIR)/program \
