Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv6258
Modified Files:
Tag: OPENOFFICE_ORG680
changelog control control.in rules
Log Message:
first m82 updates
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.14.2.14
retrieving revision 1.214.2.14.2.15
diff -u -d -r1.214.2.14.2.14 -r1.214.2.14.2.15
--- rules 25 Feb 2005 21:52:10 -0000 1.214.2.14.2.14
+++ rules 13 Mar 2005 19:25:17 -0000 1.214.2.14.2.15
@@ -55,7 +55,6 @@
--with-distro=$(PATCHSET) \
--with-vendor=Debian \
--enable-package-directories \
- --disable-java \
--with-installed-ooo-dirname=openoffice$(VER) \
--with-binsuffix=2 \
--mandir=/usr/share/man
@@ -69,20 +68,6 @@
CONFIGURE_FLAGS += --with-gcc-speedup=ccache
endif
-# Flags to pass to configure of openoffice.org
-CONFIGURE_OPTIONS=--with-system-gcc --with-jdk-home=/usr/lib/SunJava2-1.4.2 \
- --with-lang=en-US --enable-libart --enable-libsn
--enable-crashdump=no \
- --with-system-zlib --with-system-freetype --with-system-jpeg
\
- --without-fonts --enable-fontconfig \
- --with-system-mozilla \
- --with-system-nas \
- --with-ant-home=/usr/share/ant --disable-crashdump \
- --with-system-python --disable-binfilter \
- --disable-epm --without-myspell-dicts \
- --with-system-libxml
-
-export CONFIGURE_OPTIONS
-
# Build python depends from current python version
PYMAJOR:=$(shell python -c "import sys; print sys.version_info[0]")
PYMINOR:=$(shell python -c "import sys; print sys.version_info[1]")
@@ -129,6 +114,7 @@
find $(SOURCE_TREE) -maxdepth 2 -name $(ARCHBUILDDIR) -type d -exec rm
-rf {} \;
clean:
+ dh_testroot
dh_testdir
if [ -r ooo-build/Makefile ]; then \
@@ -355,6 +341,11 @@
mv $(PKGDIR)-base/usr/share/applications/ooo$(VER)-base.desktop
$(PKGDIR)-core/usr/share/applications
rm -r $(PKGDIR)-base
+ # compress manpages
+ for i in calc math draw writer impress; do \
+ find $(PKGDIR)-$$i -type f -name "*.1" | xargs gzip -9; \
+ done
+
touch $@
@@ -377,6 +368,7 @@
install -d $(PYTHON_SITE)
mv debian/python-uno/$(OODIR)/program/uno.py $(PYTHON_SITE)
mv debian/python-uno/$(OODIR)/program/pyuno.so $(PYTHON_SITE)
+ touch debian/python-uno/$(OODIR)/program/pyunorc
chmod u+w debian/python-uno/$(OODIR)/program/pyunorc
( echo 'PYTHONHOME=file:///usr/lib/python$(PYMAJOR).$(PYMINOR)' ;\
echo 'PYTHONPATH=$$PYTHONHOME/lib $$ORIGIN' \
@@ -479,6 +471,9 @@
#install -d -m755
debian/ttf-opensymbol/usr/share/fonts/truetype/openoffice
#install -m644 ooo-build/fonts/opens___.ttf \
# debian/ttf-opensymbol/usr/share/fonts/truetype/openoffice
+
+ # compress manpages
+ find $(PKGDIR)-common -type f -name "*.1" | xargs gzip -9
touch $@
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.142.2.6.2.8
retrieving revision 1.142.2.6.2.9
diff -u -d -r1.142.2.6.2.8 -r1.142.2.6.2.9
--- control.in 25 Feb 2005 21:52:10 -0000 1.142.2.6.2.8
+++ control.in 13 Mar 2005 19:25:17 -0000 1.142.2.6.2.9
@@ -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: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip,
zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config,
libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], zlib1g-dev, libfreetype6-dev, libdb4.2++-dev, libaudio-dev,
xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev,
libsane-dev, libcurl3-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>=
0.1.1-6), libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon23-dev,
libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, evolution-data-server-dev,
libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev,
libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1),
lsb-release, rpm %Ubuntu=libxinerama-dev, libarts1-dev, libqt3-mt-dev,
xlibs-dev%
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip,
zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config,
libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], zlib1g-dev, libfreetype6-dev, libdb4.2++-dev, libaudio-dev,
xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev,
libsane-dev, libcurl3-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>=
0.1.1-6), libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon24-dev,
libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, evolution-data-server-dev,
libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev,
libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1),
lsb-release, rpm %Ubuntu=libxinerama-dev, libarts1-dev, libqt3-mt-dev,
xlibs-dev%
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3),
libart-2.0-dev (= 2.3.16-4), libidn11 (<< 0.5.2-1)
Standards-Version: 3.6.1
@@ -196,7 +196,7 @@
Architecture: i386 powerpc s390 sparc arm
Enhances: openoffice.orgVER
Depends: ${python-depends}, ${shlibs:Depends}, openoffice.orgVER-core (>>
${base-version})
-Replaces: openoffice.orgVER-common (<< 1.9.76)
+Replaces: openoffice.orgVER-common (<< 1.9.82)
Description: Python interface for OpenOffice.org
The Python-UNO bridge allows to use the standard OpenOffice.org API
with the python scripting language. It additionally allows
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.338.2.25.2.10
retrieving revision 1.338.2.25.2.11
diff -u -d -r1.338.2.25.2.10 -r1.338.2.25.2.11
--- changelog 25 Feb 2005 21:52:07 -0000 1.338.2.25.2.10
+++ changelog 13 Mar 2005 19:25:17 -0000 1.338.2.25.2.11
@@ -1,3 +1,18 @@
+openoffice.org2 (1.9.82-0pre) experimental; urgency=low
+
+ * upstream milestone 82:
+ - now uses libneon24 (closes: #251738)
+ * build with java, use gij/gcj.
+ * add Build-Depends: gij-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7),
+ g++ (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), libldap2-dev, libsablot0-dev,
+ sablotron, libexpat1-dev, libbgnomevfs2-dev, libant1.6-java, fastjar,
+ gjdoc [RE]
+ * build-depend on libneon24-dev instead of libneon23-dev [RE]
+ * version libnss-dev builddep (>= 1.7.5-1) [RE]
+ * compress manpages... [RE]
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 13 Mar 2005 17:39:31 +0100
+
openoffice.org2 (1.9.76-0pre) experimental; urgency=low
* Merge Ubuntu packages to Debian experimental
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.175.2.8.2.7
retrieving revision 1.175.2.8.2.8
diff -u -d -r1.175.2.8.2.7 -r1.175.2.8.2.8
--- control 25 Feb 2005 21:52:07 -0000 1.175.2.8.2.7
+++ control 13 Mar 2005 19:25:17 -0000 1.175.2.8.2.8
@@ -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: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip,
zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config,
libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], zlib1g-dev, libfreetype6-dev, libdb4.2++-dev, libaudio-dev,
xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev,
libsane-dev, libcurl3-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>=
0.1.1-6), libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon23-dev,
libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, evolution-data-server-dev,
libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev,
libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1),
lsb-release, rpm , libxinerama-dev, libarts1-dev, libqt3-mt-dev, xlibs-dev
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip,
zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config,
libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], zlib1g-dev, libfreetype6-dev, libdb4.2++-dev, libaudio-dev,
xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev,
libsane-dev, libcurl3-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>=
0.1.1-6), libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon24-dev,
libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, evolution-data-server-dev,
libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev,
libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1),
lsb-release, rpm
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3),
libart-2.0-dev (= 2.3.16-4), libidn11 (<< 0.5.2-1)
Standards-Version: 3.6.1
@@ -196,7 +196,7 @@
Architecture: i386 powerpc s390 sparc arm
Enhances: openoffice.org2
Depends: ${python-depends}, ${shlibs:Depends}, openoffice.org2-core (>>
${base-version})
-Replaces: openoffice.org2-common (<< 1.9.76)
+Replaces: openoffice.org2-common (<< 1.9.82)
Description: Python interface for OpenOffice.org
The Python-UNO bridge allows to use the standard OpenOffice.org API
with the python scripting language. It additionally allows
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
