------------------------------------------------------------
revno: 1496
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Wed 2009-04-15 13:38:25 +0200
message:
update ooo-build - Python26 patchset and scsolver are gone...
removed:
openoffice.org-calc.postinst.in
openoffice.org-calc.preinst.in
openoffice.org-calc.prerm.in
openoffice.org-calc.script.bug.in
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-04-15 10:02:33 +0000
+++ b/changelog 2009-04-15 11:38:25 +0000
@@ -1,5 +1,8 @@
openoffice.org (1:3.1.0~rc1-3) UNRELEASED; urgency=low
+ * ooo-build
+ - update (f51d5e08421d33dc4d88f193c252451c6262a23f)
+
* debian/control.in, debian/control.kde.in, debian/rules:
- disable -kde and -kdeab as they're for KDE3 (closes: #523899). Improve
BUILD_KDE conditional
@@ -9,6 +12,10 @@
in 3.8.0. (ccache,lang=en-US de -> ccache lang=en-US,de)
* debian/rules, debian/control.debug.in:
- fix lintians dbg-package-missing-depends
+ * debian/rules:
+ - remove Python26 special-casing, we now have a generic patch for 2.4 and
+ 2.6
+ - remove scsolver stuff, scsolver is gone from ooo-build
-- Rene Engelhard <[email protected]> Mon, 13 Apr 2009 19:43:23 +0200
=== modified file 'control'
--- a/control 2009-04-15 09:38:01 +0000
+++ b/control 2009-04-15 11:38:25 +0000
@@ -156,7 +156,7 @@
Package: openoffice.org-calc
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}), ${shlibs:Depends}, ${lpsolve-dep},
${scsolver-shlibs:Depends}, ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}), ${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends}
Replaces: openoffice.org2-core (<< 1.9.113-0pre1), openoffice.org (<< 1.9),
openoffice.org-debian-files, openoffice.org-core (<= 2.2.0-4),
openoffice.org2-calc (<< ${binary:Version}), openoffice.org-common (<<
2.0.3+2.0.4m179)
Conflicts: openoffice.org-bin (<< 1.9), openoffice.org-debian-files,
openoffice.org2-calc (<< ${binary:Version})
Provides: openoffice.org2-calc
=== modified file 'control.in'
--- a/control.in 2009-04-15 09:38:01 +0000
+++ b/control.in 2009-04-15 11:38:25 +0000
@@ -352,7 +352,7 @@
Depends: openoffice.orgVER-core (= ${binary:Version}),
openoffice.orgVER-base-core (= ${binary:Version}),
${shlibs:Depends},
- ${lpsolve-dep}, ${scsolver-shlibs:Depends},
+ ${lpsolve-dep},
${misc:Depends}
Replaces: openoffice.org2-core (<< 1.9.113-0pre1),
openoffice.org (<< 1.9),
=== removed file 'openoffice.org-calc.postinst.in'
--- a/openoffice.org-calc.postinst.in 2008-08-16 02:33:23 +0000
+++ b/openoffice.org-calc.postinst.in 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=openoffice.org-wiki-publisher
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension
/usr/lib/openoffice/share/extension/install/scsolver.uno.oxt
-fi
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-calc.preinst.in'
--- a/openoffice.org-calc.preinst.in 2008-08-16 02:33:23 +0000
+++ b/openoffice.org-calc.preinst.in 1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# preinst script for openoffice.org-calc
-
-THIS_PACKAGE=openoffice.org-calc
-THIS_SCRIPT=preinst
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- upgrade)
- # we might upgrade from a -calc version which hasn't the
- # extension
- if /usr/lib/openoffice/program/unopkg list --shared | grep -q
org.go-oo.CalcSolver; then
- remove_extension org.go-oo.CalcSolver
- fi
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-calc.prerm.in'
--- a/openoffice.org-calc.prerm.in 2008-08-16 02:33:23 +0000
+++ b/openoffice.org-calc.prerm.in 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# preinst script for openoffice.org-calc
-
-THIS_PACKAGE=openoffice.org-calc
-THIS_SCRIPT=prerm
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- remove)
- remove_extension org.go-oo.CalcSolver
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-calc.script.bug.in'
--- a/openoffice.org-calc.script.bug.in 2008-08-16 02:33:23 +0000
+++ b/openoffice.org-calc.script.bug.in 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/lib/openoffice/program/unopkg list --shared org.go-oo.CalcSolver >&3
=== modified file 'rules'
--- a/rules 2009-04-15 10:07:34 +0000
+++ b/rules 2009-04-15 11:38:25 +0000
@@ -208,8 +208,6 @@
ifeq "$(BUILD_GTK)" "y"
PACKAGE_NPSOPLUGIN=y
endif
-# y means Koheis solver
-USE_SCSOLVER=n
# "new" source split? This is to be n when to use
# Suns tarballs.
WITH_SPLIT=y
@@ -500,17 +498,6 @@
endif
endif
DBG_DBG_SUGGESTS+= , python-dbg
- ifeq "$(PYTHON_VERSION)" "current"
- ifeq "$(PYMAJOR).$(PYMINOR)" "2.6"
- ADDITIONAL_SECTIONS += Python26
- BUILD_DEPS += , python-dev (>= 2.6)
- else
- BUILD_DEPS += , python-dev (>= 2.4)
- endif
- else
- ifeq "$(PYTHON_VERSION)" "2.6"
- ADDITIONAL_SECTIONS += Python26
- endif
BUILD_DEPS += , python$(PYTHON_VERSION)-dev
CONFIGURE_FLAGS += PYTHON=$(PYTHON)
endif
@@ -861,12 +848,6 @@
endif
endif
-ifeq "$(USE_SCSOLVER)" "y"
- ADDITIONAL_SECTIONS += CalcSolver
-else
- CONFIGURE_FLAGS += --disable-scsolver
-endif
-
ifeq "$(BUILD_GTK)" "n"
CONFIGURE_FLAGS+= --disable-gtk
DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-gtk
-Nopenoffice.org$(VER)-gnome
@@ -1407,10 +1388,6 @@
perl -pi -e 's/Package: openoffice.org$(VER)-help-en-us/Package:
openoffice.org$(VER)-help-en-us\nReplaces: openoffice.org$(VER)-common (<<
1:3.0.0~dev300m28)/' debian/control
-ifeq "$(USE_SCSOLVER)" "y"
- perl -pi -e 's/spreadsheet component for OpenOffice.org.$$/spreadsheet
component for OpenOffice.org.\n It also contains the scsolver calc solver,
replacing Suns solver./' debian/control
-endif
-
ifeq "$(ENABLE_GIO)" "y"
perl -pi -e 's/VFS/GIO/' debian/control
# fix up "GNOME GIO"
@@ -1856,11 +1833,6 @@
done; \
done
-ifneq "$(USE_SCSOLVER)" "y"
- rm -f debian/openoffice.org-calc.postinst
- rm -f debian/openoffice.org-calc.prerm
-endif
-
touch $@
# Install files generated by setup into package directories
@@ -2424,13 +2396,6 @@
$(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extension/install/pdfimport.oxt
endif
-ifeq "$(USE_SCSOLVER)" "y"
- install -D -m644 $(SOURCE_TREE)/scsolver/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/bin/scsolver.uno.oxt \
-
$(PKGDIR)-calc/$(OOBRANDDIR)/share/extension/install/scsolver.uno.oxt
- # we don't need it anymore - the menu entry is replaced with Koheis
- rm -f $(PKGDIR)-calc/$(OODIR)/program/libsolver*.so
-endif
-
for i in $(ARCH_DEP_PACKAGES); do \
install -D -m644 debian/presubj \
debian/$$i/usr/share/bug/$$i/presubj; \
@@ -2446,10 +2411,6 @@
debian/$$i/usr/share/bug/$$i/script; \
fi ;\
done
-ifneq "$(USE_SCSOLVER)" "y"
- rm -f debian/openoffice.org-calc.script
- rm -f
debian/openoffice.org-calc/usr/share/bug/openoffice.org-calc/script
-endif
touch $@
@@ -2930,10 +2891,6 @@
done; \
done
dh_installchangelogs -s -Nlibmythes-dev
-ifeq "$(USE_SCSOLVER)" "y"
- install -m644 $(SOURCE_TREE)/scsolver/ChangeLog \
-
$(PKGDIR)-calc/usr/share/doc/openoffice.org-calc/ChangeLog.scsolver
-endif
ifneq "$(USE_EXTERNAL_MYTHES)" "y"
dh_installchangelogs -plibmythes-dev
endif
@@ -3002,14 +2959,6 @@
-Sdebian/ure/$(OOUREDIR)/lib \
$(SOURCE_TREE)/connectivity/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc*.so \
> debian/openoffice.org$(VER)-sdbc-postgresql.substvars
-ifeq "$(USE_SCSOLVER)" "y"
-
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
- dpkg-shlibdeps -O -pscsolver-shlibs \
- -Sdebian/uno-libs3/$(OOUREDIR)/lib \
- -Sdebian/ure/$(OOUREDIR)/lib \
- $(SOURCE_TREE)/scsolver/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/libscsolver.uno.so \
- >> debian/openoffice.org$(VER)-calc.substvars
-endif
ifeq "$(ENABLE_MINIMIZER)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dpkg-shlibdeps -O \
