CVS:oo-deb/debian changelog,1.430,1.431 rules,1.257,1.258
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv1584/debian
Modified Files:
changelog rules
Log Message:
- add missing else to get the language-build special casing for the
buildds work again, makes them not build OOo completely twice....
- set urgency to high
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -d -r1.430 -r1.431
--- changelog 22 Feb 2005 19:57:01 -0000 1.430
+++ changelog 23 Feb 2005 13:14:24 -0000 1.431
@@ -1,11 +1,13 @@
-openoffice.org (1.1.3-6.7pre) unstable; urgency=low
+openoffice.org (1.1.3-6.7pre) unstable; urgency=high
* debian/rules:
- fix get-ooo-build to get right ooo-build branch [RE]
+ - add missing else to get the language-build special casing for the
+ buildds work again, makes them not build OOo completely twice.... [RE]
* debian/control.in:
- version conflict with kwin-style-baghira (<< 0.6) [CH]
- -- Chris Halls <halls@debian.org> Tue, 22 Feb 2005 19:55:11 +0000
+ -- Rene Engelhard <rene@debian.org> Wed, 23 Feb 2005 14:00:07 +0100
openoffice.org (1.1.3-6) unstable; urgency=high
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -d -r1.257 -r1.258
--- rules 20 Feb 2005 23:06:38 -0000 1.257
+++ rules 23 Feb 2005 13:14:24 -0000 1.258
@@ -122,14 +122,15 @@
ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
BUILD_ALL_LANGPACKS=n
BUILDLANG:=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^.*lang=\([^,]*\),.*/\1/p')
- ifeq "$(DIST)" "Debian"
- # the buildds do binary-only builds; thefore we only need to build en
- # (thanks James Troup for the username info)
- ifeq (buildd,$(shell whoami))
- BUILD_ALL_LANGPACKS=n
- BUILDLANG:=en
- endif
+else
+ ifeq "$(DIST)" "Debian"
+ # the buildds do binary-only builds; thefore we only need to build en
+ # (thanks James Troup for the username info)
+ ifeq (buildd,$(shell whoami))
+ BUILD_ALL_LANGPACKS=n
+ BUILDLANG:=en
endif
+ endif
endif
ifeq "$(BUILD_ALL_LANGPACKS)" "y"
Reply to: