Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv2157/debian
Modified Files:
changelog control control.in rules
Log Message:
- use script-fu instead of gimp-perl, thanks martink
- add (commented out) DH_VERBOSE stuff to enable verbose debhelper output
if necessary
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- rules 2 Apr 2004 21:04:31 -0000 1.191
+++ rules 3 Apr 2004 16:27:45 -0000 1.192
@@ -33,6 +33,7 @@
# debhelper
export DH_OPTIONS
export DH_ALWAYS_EXCLUDE=CVS
+#export DH_VERBOSE=1
# Get package version info.
SOURCE_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
@@ -545,7 +546,7 @@
uudecode debian/openintro_debian.xcf.uu > \
debian/openintro_debian.xcf && \
debian/scripts/oo-xvfb-run -a debian/scripts/xcftobmp \
- debian/openintro_debian.xcf && \
+ debian/openintro_debian.xcf debian/openintro_debian.bmp && \
cp debian/openintro_debian.bmp offmgr/res/openintro_debian.bmp
# mogrify -colors 8 debian/openintro_debian.bmp && \
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- control.in 1 Apr 2004 04:24:28 -0000 1.120
+++ control.in 3 Apr 2004 16:27:45 -0000 1.121
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl |
gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0
[!powerpc], libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic |
g++-3.0 [!powerpc], xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev |
libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev,
libcurl2-dev | libcurl-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev,
libx
render-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1),
unixodbc-dev
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp, xvfb,
xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0
[!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc], libaudio-dev |
nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc],
xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev
| libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev,
libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev, libxrender-dev | xlibs-d
ev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3)
Standards-Version: 3.6.1
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -d -r1.285 -r1.286
--- changelog 2 Apr 2004 21:04:31 -0000 1.285
+++ changelog 3 Apr 2004 16:27:45 -0000 1.286
@@ -6,11 +6,15 @@
* debian/control.in:
- modify libdb builddeps to not require it on woody [RE]
- Standards-Version: 3.6.1 (no changes needed)
+ - - s/gimp-perl | gimp1.2-perl/gimp/, we now use script-fu [RE]
* debian/rules:
- disable use of external libdb and libmyspell for woody builds,
it won't work because we have to use g++-3.0 on woody and libdb3_cxx is
C++ built with g++-2.95... thanks Severin Greimel for the pointer [RE]
- make debian/rules makebinariestar working on !i386 [RE]
+ * debian/scripts/xcftobmp:
+ - make it use script-fu since gimp-perl is removed from sid, thanks
+ Martin Kretzschmar [RE]
-- Rene Engelhard <[EMAIL PROTECTED]> Fri, 2 Apr 2004 21:48:09 +0200
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- control 1 Apr 2004 04:24:28 -0000 1.153
+++ control 3 Apr 2004 16:27:45 -0000 1.154
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl |
gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0
[!powerpc], libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic |
g++-3.0 [!powerpc], xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev |
libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev,
libcurl2-dev | libcurl-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev,
libx
render-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1),
unixodbc-dev
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp, xvfb,
xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0
[!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc], libaudio-dev |
nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc],
xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev
| libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev,
libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev, libxrender-dev | xlibs-d
ev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3)
-Standards-Version: 3.5.6
+Standards-Version: 3.6.1
Package: openoffice.org
Architecture: all
