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

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Apr 29 14:04:51 2008
New Revision: 12379
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12379&view=rev

Log:
2008-04-29  Rene Engelhard  <rene debian org>

        * patches/dev300/pdfimport-no-license.diff: remove last hunk
        * patches/dev300/apply: reenable, now builds


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/pdfimport-no-license.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Apr 29 14:04:51 2008
@@ -326,7 +326,7 @@
 presentation-minimizer-no-license.diff
 presenterscreen-no-license.diff
 #FIXME: swext not in OpenOffice2 alias#wiki-publisher-no-license.diff
-#FIXME dev300-m10: pdfimport-no-license.diff
+pdfimport-no-license.diff
 
 
 [ Fixes ]

Modified: trunk/patches/dev300/pdfimport-no-license.diff
==============================================================================
--- trunk/patches/dev300/pdfimport-no-license.diff	(original)
+++ trunk/patches/dev300/pdfimport-no-license.diff	Tue Apr 29 14:04:51 2008
@@ -38,17 +38,6 @@
  $(MISC)$/pdfimport$/%.xcu : config$/%.xcu
  	@@-$(MKDIRHIER) $(@:d)
  	$(GNUCOPY) $< $@
-@@ -156,10 +146,5 @@
- .ENDIF			# "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
- $(DESCRIPTION) $(PHONYDESC) : config$/$$(@:f)
- 	@@-$(MKDIRHIER) $(@:d)
--.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
--	$(PERL) $(SOLARENV)$/bin$/licinserter.pl $< registration/license_xxx.txt $(MISC)/description.tmp
--.ELSE	
--	$(PERL) $(SOLARENV)$/bin$/licinserter.pl $< registration/LICENSE_xxx $(MISC)/description.tmp
--.ENDIF	
- 	$(SED) -e " s/IDENT_PLACEHOLDER/$(PDFI_IMPLEMENTATION_IDENTIFIER)/" $(MISC)/description.tmp > $@ 
- 	@echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
 Index: source/pdfimport/config/description.xml
 ===================================================================
 RCS file: /cvs/framework/filter/source/pdfimport/config/description.xml,v