------------------------------------------------------------
revno: 2117 [merge]
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Mon 2010-10-04 04:05:06 +0200
message:
merge
removed:
scripts/fix_bmp_rgb
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-10-03 21:59:40 +0000
+++ b/changelog 2010-10-04 02:05:06 +0000
@@ -22,6 +22,7 @@
new ooo-build build anymore
- temporarily disable -sdbc-postgresql as unopkg apparently has problems
with .zips now...
+ - use convert directly for copnverting to 24bpp bmp instead of using
fix_bmp_rgb
* debian/control.in, debian/rules: adapt for "Test Cleanup". Build-depend
on libcppunit-dev and junit4. Remove xvfb.
* debian/*.{pre,post},{inst,rm}.in, debian/shell-lib-{components,extensions}:
@@ -37,15 +38,14 @@
* debian/control.in:
- move binfilter to suggests (and remove from openoffice.orgs
Description), it is not in the default install anymore
+ - generalize -style-* Breaks: in common to always break -style-*
+ (<< ${basis-version}) and add a Breaks on (>= 1:{next-basis-version})
+ so that we don't "loose" icons because of not-matching basis. Thanks
+ Michael Tokarev for pointing this out.
* debian/uno-libs3.symbols: update
* debian/icons: remove again
* debian/broffice.org*: update diversions
* debian/Recovery.xcu: remove, we now need to to this in main.xcd
- * debian/control.in:
- - generalize -style-* Breaks: in common to always break -style-*
- (<< ${basis-version}) and add a Breaks on (>= 1:{next-basis-version})
- so that we don't "loose" icons because of not-matching basis. Thanks
- Michael Tokarev for pointing this out.
* debian/rules, debian/scripts/vars.powerpcspe: add powerpcspe support
(Sebastian Andrzej Siewior) - closes: #594038
* debian/openoffice.org-common.triggers, debian/shell-lib-extensions.sh:
@@ -53,6 +53,7 @@
extensions in /usr/lib/openoffice/share/extensions have been
installed/updated
* debian/control.in, debian/rules: stop building industrial package
+ * debian/scripts/fix_bmp_rgb: remove
-- Rene Engelhard <[email protected]> Sun, 03 Oct 2010 23:59:19 +0200
=== modified file 'rules'
--- a/rules 2010-10-03 21:59:40 +0000
+++ b/rules 2010-10-04 02:05:06 +0000
@@ -1914,7 +1914,6 @@
set -e;\
for FILE in debian/scripts/move-if-change \
debian/scripts/cleandupes \
- debian/scripts/fix_bmp_rgb \
debian/scripts/get_libebook_dep.sh \
$(OOO_BUILD_TREE)/configure \
$(OOO_BUILD_TREE)/bin/[a-z]* \
@@ -3072,15 +3071,11 @@
done
t=`mktemp -q`.bmp ; \
if dpkg-parsechangelog | grep urgency | egrep -q "\~.*m[0123456789]+";
then \
- convert
$(SOURCE_TREE)/ooo_custom_images/dev_nologo_broffice/introabout/intro.png $$t
&& \
- debian/scripts/fix_bmp_rgb \
- $$t \
-
debian/broffice.org$(VER)/$(OOBRANDDIR)/program/intro.bmp; \
+ convert -compress none -type truecolor -resize 548x364 \
+
$(SOURCE_TREE)/ooo_custom_images/dev_nologo_broffice/introabout/intro.png
debian/broffice.org$(VER)/$(OOBRANDDIR)/program/intro.bmp; \
else \
- convert
$(SOURCE_TREE)/ooo_custom_images/nologo_broffice/introabout/intro.png $$t && \
- debian/scripts/fix_bmp_rgb \
- $$t \
-
debian/broffice.org$(VER)/$(OOBRANDDIR)/program/intro.bmp; \
+ convert -compress none -type truecolor -resize 548x364 \
+
$(SOURCE_TREE)/ooo_custom_images/nologo_broffice/introabout/intro.png
debian/broffice.org$(VER)/$(OOBRANDDIR)/program/intro.bmp; \
fi
install -m644
$(SOURCE_TREE)/ooo_custom_images/broffice/introabout/about.png \
debian/broffice.org$(VER)/$(OOBRANDDIR)/program/about.png
@@ -3452,13 +3447,11 @@
# fix intro
t=`mktemp -q`.bmp ; \
if dpkg-parsechangelog | grep urgency | egrep -q "\~.*m[0123456789]+";
then \
- convert
$(SOURCE_TREE)/ooo_custom_images/dev_nologo/introabout/intro.png $$t && \
- debian/scripts/fix_bmp_rgb \
- $$t $(PKGDIR)-common/$(OOBRANDDIR)/program/intro.bmp; \
+ convert -compress none -type truecolor -resize 548x364 \
+
$(SOURCE_TREE)/ooo_custom_images/dev_nologo/introabout/intro.png
$(PKGDIR)-common/$(OOBRANDDIR)/program/intro.bmp; \
else \
- convert
$(SOURCE_TREE)/ooo_custom_images/nologo/introabout/intro.png $$t && \
- debian/scripts/fix_bmp_rgb \
- $$t $(PKGDIR)-common/$(OOBRANDDIR)/program/intro.bmp; \
+ convert -compress none -type truecolor -resize 548x364 \
+
$(SOURCE_TREE)/ooo_custom_images/nologo/introabout/intro.png
$(PKGDIR)-common/$(OOBRANDDIR)/program/intro.bmp; \
fi; \
rm -f $$t && rm -f $(PKGDIR)-common/$(OOBRANDDIR)/program/intro.png
endif
=== removed file 'scripts/fix_bmp_rgb'
--- a/scripts/fix_bmp_rgb 2010-09-26 16:27:23 +0000
+++ b/scripts/fix_bmp_rgb 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-temp=`mktemp -q`
-convert -compress none -resize 548x364 $1 $temp
-bmptoppm $temp | ppmtobmp -bpp 24 > $2
-rm -f $temp
-
