ooo-build r12603 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon May 19 23:15:09 2008
New Revision: 12603
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12603&view=rev

Log:
2008-05-20  Rene Engelhard  <rene debian org>

        * patches/dev300/presentation-minimizer-no-license.diff,
          patches/dev300/presenterscreen-no-license.diff: also fix in the same
          way as the wiki-publisher


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/presentation-minimizer-no-license.diff
   trunk/patches/dev300/presenterscreen-no-license.diff

Modified: trunk/patches/dev300/presentation-minimizer-no-license.diff
==============================================================================
--- trunk/patches/dev300/presentation-minimizer-no-license.diff	(original)
+++ trunk/patches/dev300/presentation-minimizer-no-license.diff	Mon May 19 23:15:09 2008
@@ -61,13 +61,3 @@
  $(MISC)$/SunPresentationMinimizer$/registry$/data$/%.xcu : $(MISC)$/$(EXTNAME)$/merge$/%.xcu
  	@@-$(MKDIRHIER) $(@:d)
  	$(GNUCOPY) $< $@
-@@ -172,6 +156,7 @@
- .ENDIF			# "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
- $(DESCRIPTION) $(PHONYDESC) : $$(@:f)
- 	@@-$(MKDIRHIER) $(@:d)
--	$(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml registry/LICENSE_xxx $@
--	@echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
-+	$(COPY) $< $@
-+#	$(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml registry/LICENSE_xxx $@
-+#	@echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
- 

Modified: trunk/patches/dev300/presenterscreen-no-license.diff
==============================================================================
--- trunk/patches/dev300/presenterscreen-no-license.diff	(original)
+++ trunk/patches/dev300/presenterscreen-no-license.diff	Mon May 19 23:15:09 2008
@@ -46,7 +46,7 @@
  	$(DESCRIPTION)			\
  	$(COMPONENT_MANIFEST)	\
  	$(COMPONENT_FILES)		\
-@@ -224,23 +216,12 @@
+@@ -219,16 +211,6 @@
  	@-$(MKDIRHIER) $(@:d)
      +$(COPY) $< $@
  
@@ -63,10 +63,3 @@
  .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
  .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
  PHONYDESC=.PHONY
- .ENDIF			# "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
- $(DESCRIPTION) $(PHONYDESC) : $$(@:f)
- 	@@-$(MKDIRHIER) $(@:d)
--	$(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml registry/LICENSE_xxx $@
- 	@echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
- 
- .ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"