------------------------------------------------------------
revno: 1106
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-05-23 17:25:25 +0200
message:
remove overseen OOO_ARCHS and fix control and maintscripts dependencies
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-05-23 12:16:12 +0000
+++ b/changelog 2008-05-23 15:25:25 +0000
@@ -9,6 +9,8 @@
- update for new xulrunner 1.9 packaging using iceape-dev.
Use MOZILLA=iceape (closes: #480813)
- specify -Nopenoffice.org-gcj when building without Java
+ - remove overseen $(OOO_ARCHS); make control/maintscripts depend on all
+ .ins for it (removes duplicate contro.gcj.in). Thanks Chris Cheney
* debian/control.in, debian/rules:
- libsapdbc-java was removed, stop suggesting it and adding it to OOos
CLASSPATH
@@ -19,7 +21,7 @@
* debian/control.in, debian/rules:
- fix Vcs-Svn:, make it a generated field
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 23 May 2008 09:39:40 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 23 May 2008 17:14:48 +0200
openoffice.org (1:2.4.0-6) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-05-19 09:34:26 +0000
+++ b/rules 2008-05-23 15:25:25 +0000
@@ -418,7 +418,7 @@
WRITER_PYUNO_DEP = python-uno (>= $(UPSTREAM_VERSION))
DBG_DBG_SUGGESTS+= , python-dbg
else
- BUILD_DEPS += , python [$(OOO_ARCHS)]
+ BUILD_DEPS += , python
endif
ifeq "$(ETCH_BACKPORT)" "y"
@@ -1088,7 +1088,7 @@
# Generate control file, because we have so many different languages
# Based on script by Martin Quinson <[EMAIL PROTECTED]>
control: debian/control
-debian/control: debian/control.in debian/control.lang.in
debian/control.help.in debian/control.fonts.in debian/control.sdk.in
debian/control.mozilla.in debian/control.gcj.in debian/control.gcj.in
debian/control.mono.in debian/control.qa.in debian/control.postgresql.in
ooo-build/bin/openoffice-xlate-lang debian/rules
+debian/control: $(wildcard debian/control*in)
ooo-build/bin/openoffice-xlate-lang debian/rules
chmod 755 ooo-build/bin/openoffice-xlate-lang
sed -e "s#openoffice.orgVER#openoffice.org$(VER)#g" \
-e "s#broffice.orgVER#broffice.org$(VER)#g" \
@@ -1613,7 +1613,7 @@
#
# Generate maintainer scripts
maintscripts: $(STAMP_DIR)/maintscripts
-$(STAMP_DIR)/maintscripts: debian/shell-lib.sh debian/control
+$(STAMP_DIR)/maintscripts: debian/shell-lib.sh $(wildcard debian/*.preinst.in)
$(wildcard debian/*.postinst.in) $(wildcard debian/*.prerm.in) $(wildcard
debian/*.postrm.in) debian/scripts/vars.$(ARCH) debian/control
dh_testdir
rm -f debian/*.{pre,post}{inst,rm}
