CVS:oo-deb/debian changelog,1.338.2.25.2.20,1.338.2.25.2.21 control,1.175.2.8.2.10,1.175.2.8.2.11 control.in,1.142.2.6.2.11,1.142.2.6.2.12 rules,1.214.2.14.2.20,1.214.2.14.2.21
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv17410
Modified Files:
Tag: OPENOFFICE_ORG680
changelog control control.in rules
Log Message:
- split mozilla plugin out (GTK2)
- fix some lintian warnings
- add libnss3 (>= 1.7.5) dep to -core, no .shlibs...
- use LD_ASSUME_KERNEL="2.4.27" dh_shlibdeps to actually get results
when using TLS/NPTLed libc6-i686
- close pyuno wishlist bug (in old Ubuntu changelog ;) )
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.14.2.20
retrieving revision 1.214.2.14.2.21
diff -u -d -r1.214.2.14.2.20 -r1.214.2.14.2.21
--- rules 15 Mar 2005 17:01:28 -0000 1.214.2.14.2.20
+++ rules 15 Mar 2005 22:22:12 -0000 1.214.2.14.2.21
@@ -325,7 +325,8 @@
done
for i in "" -kde -evolution; do \
- rm -rf $(PKGDIR)$$i $(PKGDIR)$$i.*.debhelper ;\
+ rm -rf $(PKGDIR)$$i debian/mozilla-openoffice.org \
+ $(PKGDIR)$$i.*.debhelper debian/mozilla-openoffice.org.*.debhelper ;\
done
dh_installdirs -a
@@ -334,6 +335,7 @@
mkdir -p -m755 $(PKGDIR)-kde/$(OODIR)/program
mkdir -p -m755 $(PKGDIR)-gnome/$(OODIR)/program
mkdir -p -m755 $(PKGDIR)-evolution/$(OODIR)/program
+ mkdir -p -m755 debian/mozilla-openoffice.org/$(OODIR)/program
for f in kdefilepicker libfps_kde.so libvclplug_kde[0-9]*.so; do \
mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-kde/$(OODIR)/program || exit 1 ;\
done
@@ -343,6 +345,15 @@
mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
done
mv $(PKGDIR)-core/$(OODIR)/program/libevoab2.so $(PKGDIR)-evolution/$(OODIR)/program
+ for f in libnpsoplugin.so nsplugin; do \
+ mv $(PKGDIR)-core/$(OODIR)/program/$$f debian/mozilla-openoffice.org/$(OODIR)/program; \
+ done
+ cd debian/mozilla-openoffice.org && \
+ for b in mozilla mozilla-firefox; do \
+ mkdir -p usr/lib/$$b/plugins && \
+ ln -sf /$(OODIR)/program/libnpsoplugin.so \
+ usr/lib/$$b/plugins/libnpsoplugin.so; \
+ done
mkdir -p -m755 $(PKGDIR)-base/usr/share/applications \
$(PKGDIR)-core/usr/share/applications
@@ -500,6 +511,13 @@
# compress manpages
find $(PKGDIR)-common -type f -name "*.1" | xargs gzip -9
+ # fix permisson
+ chmod ugo-x $(PKGDIR)-common/$(OODIR)/program/hid.lst
+
+ # fix shebang
+ perl -pi -e 's,/bin/awk,/usr/bin/awk,'\
+ $(PKGDIR)-common/$(OODIR)/program/uri-encode
+
touch $@
@@ -534,7 +552,13 @@
dh_compress
dh_fixperms
dh_installdeb
- dh_shlibdeps -X msgbox-gnome -X getstyle-gnome $(SHLIBS_OVERRIDE)
+ifeq "$(ARCH)" "i386"
+ # this LD_ASSUME_KERNEL is for working around some bug which makes
+ # dh_shlibddeps report/find nothing with libc6-i686/TLS systems
+ LD_ASSUME_KERNEL="2.4.27" dh_shlibdeps $(SHLIBS_OVERRIDE)
+else
+ dh_shlibdeps $(SHLIBS_OVERRIDE)
+endif
mkdir -p $(PKGDIR)-core/usr/share/doc/openoffice.org$(VER)-core
debian/scripts/gen_lib_list \
> $(PKGDIR)-core/usr/share/doc/openoffice.org$(VER)-core/used_libs
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.142.2.6.2.11
retrieving revision 1.142.2.6.2.12
diff -u -d -r1.142.2.6.2.11 -r1.142.2.6.2.12
--- control.in 15 Mar 2005 18:10:01 -0000 1.142.2.6.2.11
+++ control.in 15 Mar 2005 22:22:12 -0000 1.142.2.6.2.12
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-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++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), gij-4.0 (>= 4.0-0pre7)) 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%, libldap2-dev, libexpat1-dev, libgnomevfs2-dev, libant1.6-java, gjdoc, fastjar
+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++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), gij-4.0 (>= 4.0-0pre7)) 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 (>= 1.7.5), 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%, libldap2-dev, libexpat1-dev, libgnomevfs2-dev, libant1.6-java, gjdoc, fastjar
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
@@ -47,7 +47,7 @@
Package: openoffice.orgVER-core
Architecture: i386 powerpc s390 sparc
-Depends: openoffice.orgVER-debian-files (>> 1.9.66), openoffice.orgVER-common (>> ${base-version}), openoffice.orgVER-l10n-en-us (>> ${base-version}) | openoffice.orgVER-l10n-${base-version}, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ttf-opensymbol, ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0
+Depends: openoffice.orgVER-debian-files (>> 1.9.66), openoffice.orgVER-common (>> ${base-version}), openoffice.orgVER-l10n-en-us (>> ${base-version}) | openoffice.orgVER-l10n-${base-version}, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ttf-opensymbol, ${shlibs:Depends}, libnss3 (>= 1.7.5), debconf (>= 1.2.0) | debconf-2.0
Description: OpenOffice.org office suite architecture dependent files
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -155,7 +155,8 @@
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the Gtk plugin for drawing OOo's widgets with
- Gtk+, Gnome VFS support and a Gtk/GNOMEish File Picker when running under GNOME.
+ Gtk+, Gnome VFS support and a Gtk/GNOMEish File Picker when running under
+ GNOME.
Package: openoffice.orgVER-java
Architecture: i386 powerpc s390 sparc
@@ -206,4 +207,16 @@
.
You can more information about Pyuno at
http://udk.openoffice.org/python/python-bridge.html
+
+Package: mozilla-openoffice.org
+Section: net
+Architecture: i386 powerpc s390 sparc arm
+Enhances: mozilla-browser, mozilla-firefox, openoffice.orgVER
+Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> ${base-version})
+Recommends: mozilla-firefox | mozilla-browser
+Description: OpenOffice.org Mozilla plugin
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains a Mozilla plugin which can handle all OOo documents.
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.338.2.25.2.20
retrieving revision 1.338.2.25.2.21
diff -u -d -r1.338.2.25.2.20 -r1.338.2.25.2.21
--- changelog 15 Mar 2005 18:10:00 -0000 1.338.2.25.2.20
+++ changelog 15 Mar 2005 22:22:11 -0000 1.338.2.25.2.21
@@ -19,6 +19,9 @@
- build-depend on libneon24-dev instead of libneon23-dev [RE]
- version libnss-dev builddep (>= 1.7.5-1) [RE]
- fix -cores description, it's arch-dependant [RE]
+ - add mozilla-openoffice.org [RE]
+ - make openoffice.org-core depend on libnss3 (>= 1.7.5),
+ it has no .shlibs (and no real SONAME anyway...)... [RE]
* debian/rules:
- compress manpages... [RE]
- install libstdc++.so.6 and libgcc_s.so.1 into $OODIR/program
@@ -28,6 +31,10 @@
change path to use them, ooo-build doesn't honor CC and CXX [RE]
- fix installation of Gnome stuff to get ucpgvfs1.so, gconfbe1.so and
gnome-set-default-application packaged [RE]
+ - move libnpsoplugin.so and nsplugin into own package [RE]
+ - work around the fact that dh_shlibdeps doesn't report anything on
+ TLS/NPTL-enabled systems by setting LD_ASSUME_KERNEL="2.4.27" before
+ executing it... [RE]
* debian/usr/lib/*: add content (wrapper scripts) of java-gcj-compat
1.0.14-0.0ubuntu4 except ../lib/tools.jar until we can build-depend on it
in Debian (in NEW...).
@@ -35,7 +42,7 @@
and fails if the javac alternative is set to gcj-wrapper-4.0, thanks again
Matthias Klose [RE]
- -- Rene Engelhard <rene@debian.org> Tue, 15 Mar 2005 19:09:28 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 15 Mar 2005 22:10:32 +0100
openoffice.org2 (1.9.76-0pre) experimental; urgency=low
@@ -82,7 +89,7 @@
extra icons.
* New package: python-uno containing python bindings. Initial cut:
set LD_LIBRARY_PATH=/usr/lib/openoffice2/program before importing uno
- in Python
+ in Python (closes: #220226)
* debian/rules:
- Add oobase menu entry to openoffice.org2-common
- Install oo2 icons and mimetypes
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.175.2.8.2.10
retrieving revision 1.175.2.8.2.11
diff -u -d -r1.175.2.8.2.10 -r1.175.2.8.2.11
--- control 15 Mar 2005 18:10:00 -0000 1.175.2.8.2.10
+++ control 15 Mar 2005 22:22:11 -0000 1.175.2.8.2.11
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-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++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), gij-4.0 (>= 4.0-0pre7)) 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 , libldap2-dev, libexpat1-dev, libgnomevfs2-dev, libant1.6-java, gjdoc, fastjar
+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++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), gij-4.0 (>= 4.0-0pre7)) 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 (>= 1.7.5), libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1),
lsb-release, rpm , libldap2-dev, libexpat1-dev, libgnomevfs2-dev, libant1.6-java, gjdoc, fastjar
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
@@ -47,7 +47,7 @@
Package: openoffice.org2-core
Architecture: i386 powerpc s390 sparc
-Depends: openoffice.org2-debian-files (>> 1.9.66), openoffice.org2-common (>> ${base-version}), openoffice.org2-l10n-en-us (>> ${base-version}) | openoffice.org2-l10n-${base-version}, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ttf-opensymbol, ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0
+Depends: openoffice.org2-debian-files (>> 1.9.66), openoffice.org2-common (>> ${base-version}), openoffice.org2-l10n-en-us (>> ${base-version}) | openoffice.org2-l10n-${base-version}, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ttf-opensymbol, ${shlibs:Depends}, libnss3 (>= 1.7.5), debconf (>= 1.2.0) | debconf-2.0
Description: OpenOffice.org office suite architecture dependent files
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -155,7 +155,8 @@
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the Gtk plugin for drawing OOo's widgets with
- Gtk+, Gnome VFS support and a Gtk/GNOMEish File Picker when running under GNOME.
+ Gtk+, Gnome VFS support and a Gtk/GNOMEish File Picker when running under
+ GNOME.
Package: openoffice.org2-java
Architecture: i386 powerpc s390 sparc
@@ -206,6 +207,18 @@
.
You can more information about Pyuno at
http://udk.openoffice.org/python/python-bridge.html
+
+Package: mozilla-openoffice.org
+Section: net
+Architecture: i386 powerpc s390 sparc arm
+Enhances: mozilla-browser, mozilla-firefox, openoffice.org2
+Depends: ${shlibs:Depends}, openoffice.org2-core (>> ${base-version})
+Recommends: mozilla-firefox | mozilla-browser
+Description: OpenOffice.org Mozilla plugin
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains a Mozilla plugin which can handle all OOo documents.
Package: openoffice.org2-l10n-en-us
Architecture: all
Reply to: