------------------------------------------------------------
revno: 2115
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Fri 2010-10-01 17:40:08 +0200
message:
use convert directly for copnverting to 24bpp bmp instead of using fix_bmp_rgb
removed:
scripts/fix_bmp_rgb
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-09-26 16:27:23 +0000
+++ b/changelog 2010-10-01 15:40:08 +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}:
@@ -53,8 +54,9 @@
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]> Wed, 22 Sep 2010 09:43:06 +0200
+ -- Rene Engelhard <[email protected]> Fri, 01 Oct 2010 16:19:56 +0200
openoffice.org (1:3.2.1-7) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2010-09-20 22:46:57 +0000
+++ b/rules 2010-10-01 15:40:08 +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]* \
@@ -3077,15 +3076,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
@@ -3457,13 +3452,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
-
