CVS:oo-deb/debian changelog,1.262.4.14,1.262.4.15 control,1.147.4.12,1.147.4.13 control.in,1.114.4.9,1.114.4.10 rules,1.182.4.8,1.182.4.9
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv26904
Modified Files:
Tag: OPENOFFICE_ORG_1_1_1
changelog control control.in rules
Log Message:
- changelog restructuring
- mention new system-* patches and do a
--with-system-x11-extensions-headers (sic!) :) and remove vcl/prj/build.lst
in clean
- add appropriate Build-Depends:
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.182.4.8
retrieving revision 1.182.4.9
diff -u -d -r1.182.4.8 -r1.182.4.9
--- rules 6 Mar 2004 15:13:09 -0000 1.182.4.8
+++ rules 8 Mar 2004 17:07:28 -0000 1.182.4.9
@@ -55,7 +55,8 @@
--with-system-sane-headers \
--with-system-curl \
--with-system-myspell \
- --with-system-altlinuxhyph
+ --with-system-altlinuxhyph \
+ --with-system-x11-extensions-headers
# If DEB_BUILD_OPTIONS contains jdkhome=/absolute/path/to/jdk, build with the
# JDK at /absolute/path/to/jdk.
@@ -118,6 +119,7 @@
USE_SYSTEM_STLPORT=n
#CONFIGURE_FLAGS+= --with-stlport4-home=$(CURDIR)/stlport-home
CONFIGURE_FLAGS+= --enable-fontconfig
+ #CONFIGURE_FLAGS+= --with-system-neon
PATCHSET=Debian
DEBIANUTILSDEPENDS=, debianutils (>= 2.0)
else
@@ -396,6 +398,7 @@
rm -f berkeleydb/prj/d.lst
rm -f extensions/prj/build.lst
+ rm -f vcl/prj/build.lst
for i in xmlhelp/source/com/sun/star/help/*.java.in; do \
rm -f `basename $$i .in`; \
done
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.114.4.9
retrieving revision 1.114.4.10
diff -u -d -r1.114.4.9 -r1.114.4.10
--- control.in 6 Mar 2004 15:13:09 -0000 1.114.4.9
+++ control.in 8 Mar 2004 17:07:28 -0000 1.114.4.10
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Jan-Hendrik Palic <jan.palic@linux-debian.de>, Rene Engelhard <rene@debian.org>
-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, 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
+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, 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-de
v (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1)
Build-Conflicts: libhnj-dev, g++-3.3 (= 1:3.3.3-0pre3)
Standards-Version: 3.5.6
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.262.4.14
retrieving revision 1.262.4.15
diff -u -d -r1.262.4.14 -r1.262.4.15
--- changelog 6 Mar 2004 22:35:13 -0000 1.262.4.14
+++ changelog 8 Mar 2004 17:07:27 -0000 1.262.4.15
@@ -1,9 +1,19 @@
openoffice.org (1.1.1+cvs20040229-1.pre2) experimental; urgency=low
- * remove mimelnk files KDE 3.2 took over (closes: #234670) and
- remove the version info of the remaining ones in openoffice.org-mimelnk.
- Make openoffice.org-mimlnk recommend kdelibs-data (>> 4:3.2.0) and
- therefore only suggest it from openoffice.org
+ * New patches:
+ - system-neon: build and link dynamically against system neon
+ (now only against 0.23 which isn't in Debian anymore :/ ) [RE]
+ - system-x11-extensions: use system X11 extensions headers for build
+ ((X)render.h, renderproto.h) [RE]
+ * debian/rules:
+ - remove mimelnk files KDE 3.2 took over (closes: #234670) and remove
+ the version info of the remaining ones in openoffice.org-mimelnk.
+ - --with-system-x11-extensions-headers [RE]
+ * debian/control.in:
+ - Make openoffice.org-mimlnk recommend kdelibs-data (>> 4:3.2.0) and
+ therefore only suggest it from openoffice.org
+ - add libxrender-dev | xlibs-dev (<< 4.3.0-1) and
+ render-dev | xlibs-dev (<< 4.3.0-1) to Build-Depends:
-- Rene Engelhard <rene@debian.org> Sat, 6 Mar 2004 14:50:52 +0100
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.147.4.12
retrieving revision 1.147.4.13
diff -u -d -r1.147.4.12 -r1.147.4.13
--- control 6 Mar 2004 15:13:09 -0000 1.147.4.12
+++ control 8 Mar 2004 17:07:27 -0000 1.147.4.13
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Jan-Hendrik Palic <jan.palic@linux-debian.de>, Rene Engelhard <rene@debian.org>
-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, 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
+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, 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-de
v (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1)
Build-Conflicts: libhnj-dev, g++-3.3 (= 1:3.3.3-0pre3)
Standards-Version: 3.5.6
Reply to: