------------------------------------------------------------
revno: 798
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2007-07-23 22:07:00 +0200
message:
remove Sun logo from the BrOffice.org bitmaps which don't have a nologo
variant (yet), imagemagick -> graphicsmagick
modified:
changelog
control
control.in
rules
scripts/fix_image_rgb
=== modified file 'changelog'
--- a/changelog 2007-07-22 10:28:46 +0000
+++ b/changelog 2007-07-23 20:07:00 +0000
@@ -33,12 +33,15 @@
- build-depend on gperf for OOXML patchset
- fix some stuff for etch backports
- install splash screens directly from OOos source tree after fixing
- their RGBness
+ their RGBness and removing the Sun logo in the BrOffice.org case
+ - migrate to graphicsmagick as convert from imagemagick (at least etchs)
+ does create a broken BMP out of the Sun logo removal step..
* debian/control.in:
- build-depend on libxml-parser-perl
- Add XS-Vcs-{Bzr,Svn} fields
- we need to build-depend on dmake (>= 1:4.7)
- build-depend on netpbm
+ - remove imagemagick; add graphicsmagick
* debian/*.menu, debian/*.overrides.lintian:
- update for 2.3
* debian/README.Debian-source: update
@@ -47,7 +50,7 @@
* debian/br{intro,about}.bmp.uu: remove, obsolete
* debian/scripts/fix_image_rgb: add
- -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 22 Jul 2007 12:26:10 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 23 Jul 2007 22:05:26 +0200
openoffice.org (2.2.1-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2007-07-22 10:28:46 +0000
+++ b/control 2007-07-23 20:07:00 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc
sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386
powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf
[i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64],
pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64
ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc
sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64],
libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc
amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386
powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64],
libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc
sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev
[i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64
ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386
powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64],
libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc
amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386
powerpc sparc amd64 ppc64], imagemagick [i386 powerpc sparc amd64 ppc64],
netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64
ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc
sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64],
x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11)
[i386 powerpc sparc amd64 ppc64], libdb4.4-dev [i386 powerpc sparc amd64
ppc64], libxml-parser-perl [i386 powerpc sparc amd64 ppc64], gperf [i386
powerpc sparc amd64 ppc64], , libcurl4-gnutls-dev [i386 powerpc sparc amd64
ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64 ppc64], debhelper
(>= 5.0.37.2), python-dev (>= 2.4) [i386 powerpc sparc amd64 ppc64] , dpkg-dev
(>= 1.13.19) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64
ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>=
0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc
sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64
ppc64] , libdb4.4-java [i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc
sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev
[i386 powerpc sparc amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64
ppc64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64 ppc64] ,
libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64 ppc64] ,
libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64 ppc64] ,
portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3)
[i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64]
, libsvg-dev [i386 powerpc sparc amd64 ppc64] , libicu36-dev [i386 powerpc
sparc amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] ,
libcairo2-dev [i386 powerpc sparc amd64 ppc64], libglitz-glx1-dev [i386 powerpc
sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64
ppc64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc amd64 ppc64] , bsh
(>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev (>=
5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386
powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64
ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] ,
libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] ,
libneon26-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386
powerpc sparc amd64 ppc64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc
sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386
powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf
[i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64],
pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64
ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc
sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64],
libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc
amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386
powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64],
libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc
sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev
[i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64
ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386
powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64],
libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc
amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386
powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64],
netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64
ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc
sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64],
x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11)
[i386 powerpc sparc amd64 ppc64], libdb4.4-dev [i386 powerpc sparc amd64
ppc64], libxml-parser-perl [i386 powerpc sparc amd64 ppc64], gperf [i386
powerpc sparc amd64 ppc64], , libcurl4-gnutls-dev [i386 powerpc sparc amd64
ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64 ppc64], debhelper
(>= 5.0.37.2), python-dev (>= 2.4) [i386 powerpc sparc amd64 ppc64] , dpkg-dev
(>= 1.13.19) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64
ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>=
0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc
sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64
ppc64] , libdb4.4-java [i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc
sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev
[i386 powerpc sparc amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64
ppc64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64 ppc64] ,
libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64 ppc64] ,
libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64 ppc64] ,
portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3)
[i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64]
, libsvg-dev [i386 powerpc sparc amd64 ppc64] , libicu36-dev [i386 powerpc
sparc amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] ,
libcairo2-dev [i386 powerpc sparc amd64 ppc64], libglitz-glx1-dev [i386 powerpc
sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64
ppc64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc amd64 ppc64] , bsh
(>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev (>=
5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386
powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64
ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] ,
libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] ,
libneon26-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386
powerpc sparc amd64 ppc64]
Build-Conflicts: libcairo2 (= 1.4.8-1)
Standards-Version: 3.7.2
XS-Python-Version: current
=== modified file 'control.in'
--- a/control.in 2007-07-22 10:28:46 +0000
+++ b/control.in 2007-07-23 20:07:00 +0000
@@ -39,7 +39,7 @@
fastjar [%OOO_ARCHS%],
libsndfile1-dev [%OOO_ARCHS%],
xsltproc [%OOO_ARCHS%],
- imagemagick [%OOO_ARCHS%],
+ graphicsmagick [%OOO_ARCHS%],
netpbm [%OOO_ARCHS%],
fdupes [%OOO_ARCHS%],
xml-core [%OOO_ARCHS%],
=== modified file 'rules'
--- a/rules 2007-07-22 10:28:46 +0000
+++ b/rules 2007-07-23 20:07:00 +0000
@@ -1950,11 +1950,13 @@
cat $(PKGDIR)-common/usr/share/applications/ooo-template.desktop \
| sed -e "s/ooff/broff/" | sed -e "s/OpenO/BrO/" \
>
debian/broffice.org/usr/share/applications/ooo-template.desktop
- # FIXME: This also needs removal of the Sun stuff there.
if dpkg-parsechangelog | grep urgency | grep -q $(SRCNUM); then \
- debian/scripts/fix_image_rgb \
+ gm convert -fill white -draw 'rectangle 0,225,500,500' \
$(SOURCE_TREE)/ooo_custom_images/dev_broffice/introabout/intro.bmp \
debian/broffice.org/$(OODIR)/program/intro.bmp; \
+ debian/scripts/fix_image_rgb \
+ debian/broffice.org/$(OODIR)/program/intro.bmp \
+ debian/broffice.org/$(OODIR)/program/intro.bmp; \
else \
debian/scripts/fix_image_rgb \
$(SOURCE_TREE)/ooo_custom_images/broffice/introabout/intro.bmp \
@@ -2143,7 +2145,7 @@
# convert icons to xpm; we need them for the Debian menu policy...
cd $(PKGDIR)-common/usr/share/icons/gnome/32x32/apps && \
- for x in *.png; do convert $$x `basename $$x .png`.xpm; done
+ for x in *.png; do gm convert $$x `basename $$x .png`.xpm; done
ifeq "$(ENABLE_JAVA)" "y"
# symlink jars we use externally
=== modified file 'scripts/fix_image_rgb'
--- a/scripts/fix_image_rgb 2007-07-22 10:28:46 +0000
+++ b/scripts/fix_image_rgb 2007-07-23 20:07:00 +0000
@@ -1,6 +1,6 @@
#!/bin/sh -e
temp=`mktemp -q`
-convert -compress none $1 $temp
+gm convert -compress none $1 $temp
# thanks to Martin Hasch <[EMAIL PROTECTED]> for this tip.
bmptoppm $temp | ppmtobmp -bpp 24 > $2
