[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

CVS:oo-deb/debian changelog,1.319,1.320 rules,1.209,1.210



Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv22587

Modified Files:
	changelog rules 
Log Message:
make solver.langpacks target a noop if not all langpacks are built - helps
builds with delouput...


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- changelog	15 May 2004 16:57:15 -0000	1.319
+++ changelog	16 May 2004 15:22:04 -0000	1.320
@@ -38,6 +38,8 @@
       use --with-stlport4-home=/usr [RE]
     - get-ooo-build: Gnome CVS module name has changed from openoffice to
       ooo-build [CH]
+    - make solver.langpacks target a noop if not all langpacks are built -
+      helps builds with delouput... [RE]
   * debian/scripts/vars:
     - add KDE icon locations [CH]
   * debian/README:
@@ -54,7 +56,7 @@
   * debian/openintro_debian.xcf.uu: modified for better text and Debian logo
     alignment [MK]
 
- -- Rene Engelhard <rene@debian.org>  Sat, 15 May 2004 18:51:51 +0200
+ -- Rene Engelhard <rene@debian.org>  Sun, 16 May 2004 15:35:59 +0200
 
 openoffice.org (1.1.1-2) unstable; urgency=high
 

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- rules	7 May 2004 20:50:40 -0000	1.209
+++ rules	16 May 2004 15:22:04 -0000	1.210
@@ -697,6 +697,7 @@
 # Build all projects needed for installation sets for all possible languages
 solver.langpacks: $(STAMP_DIR)/solver.langpacks
 $(STAMP_DIR)/solver.langpacks: $(STAMP_DIR)/bootstrap
+ifeq "$(BUILD_ALL_LANGPACKS)" "y"
 	dh_testdir
 	. $(SOURCE_TREE)/$(ENVFILE).langpacks; cd $(SOURCE_TREE)/instsetoo && \
 	    $(BUILDCMD) $(STARTFROM) $(BUILDFLAGS) -- instsetext= $(DMAKEFLAGS)
@@ -705,6 +706,7 @@
 	touch $(STAMP_DIR)/solver
 
 	touch $@
+endif
 
 # Build insetsetoo installation scrips for langpacks
 setupins: $(STAMP_DIR)/setupins



Reply to: