------------------------------------------------------------
revno: 2320
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Wed 2011-01-12 02:48:45 +0100
message:
correctly generate presenter-consoles description.xml
added:
patches/presenter-screen-fix-description.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2011-01-11 22:32:21 +0000
+++ b/changelog 2011-01-12 01:48:45 +0000
@@ -4,6 +4,8 @@
* debian/patches/java-common-message-LibreOffice.diff: fix patched-in
java-common message to say libreoffice-java-common (closes: #609660)
+ * debian/patches/presenter-screen-fix-description.diff: fix for correctly
+ generating -presenter-consoles description.xml
* debian/rules
- bump SPI (c) upto 2011
@@ -31,7 +33,7 @@
- actually add Replaces: on openoffice.org-common (closes: #602867)
- change Homepage: to point to www.libreoffice.org
- -- Rene Engelhard <r...@debian.org> Tue, 11 Jan 2011 23:30:55 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 12 Jan 2011 02:47:36 +0100
libreoffice (1:3.3.0~rc2-3) experimental; urgency=low
=== added file 'patches/presenter-screen-fix-description.diff'
--- a/patches/presenter-screen-fix-description.diff 1970-01-01 00:00:00
+0000
+++ b/patches/presenter-screen-fix-description.diff 2011-01-12 01:48:45
+0000
@@ -0,0 +1,27 @@
+--- /dev/null 2011-01-11 03:35:24.022846774 +0100
++++
libreoffice-3.3.0/libreoffice-build/patches/dev300/presenter-screen-fix-description.diff
2011-01-12 02:41:55.000000000 +0100
+@@ -0,0 +1,13 @@
++diff --git a/sdext/source/presenter/makefile.mk
b/sdext/source/presenter/makefile.mk
++index 696d0e5..9e25e34 100755
++--- sdext/source/presenter/makefile.mk
+++++ sdext/source/presenter/makefile.mk
++@@ -372,7 +372,7 @@ PHONYDESC=.PHONY
++ $(DESCRIPTION) $(PHONYDESC) : $$(@:f)
++ @-$(MKDIRHIER) $(@:d)
++ @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
++- $(TYPE) description.tmp | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
+++ $(TYPE) description.xml | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
++
++
++ .ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
+--- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply-old
2011-01-12 02:44:25.000000000 +0100
++++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply 2011-01-12
02:45:00.000000000 +0100
+@@ -2106,6 +2106,8 @@
+ # needs some more love, see comments in issue
+ framework-extra-job-config.diff, i#107568, thorsten
+
++presenter-screeen-fix-description.diff
++
+ [ BuildBits ]
+ # build the extra extensions when enabled
+ postprocess-extra-extensions.diff, i#123456, pmladek
=== modified file 'patches/series'
--- a/patches/series 2011-01-11 19:11:44 +0000
+++ b/patches/series 2011-01-12 01:48:45 +0000
@@ -6,3 +6,4 @@
fix-wrapper-manpage-install.diff
java-common-message-LibreOffice.diff
fix-hr-and-te-translations.diff
+presenter-screen-fix-description.diff
