------------------------------------------------------------
revno: 1115
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-06-13 15:19:20 +0200
message:
add BUILD_GTK conditional; disable both GTK and KDE for now...; apply KDE4
patchset if needed
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-06-12 21:04:07 +0000
+++ b/changelog 2008-06-13 13:19:20 +0000
@@ -29,7 +29,8 @@
(until sb87)
- update get-orig-source target for fixed hyph_en_US.dic
- add --enable-gio conditional
- - start KDE4 support for build-depends
+ - start of KDE4 support
+ - add BUILD_GTK conditional; disable both GTK and KDE for now...
* debian/rules, debian/control.in:
- split emailmerge out into an own package. Don't make -writer depend on
python-uno anymore so that -writer (and openoffice.org) still can be
@@ -61,7 +62,7 @@
- s/cupsys/cups/
- remove xutils build-dep, nas was using xmkmf and it's long gone here
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 12 Jun 2008 22:49:27 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 13 Jun 2008 15:18:07 +0200
openoffice.org (1:2.4.1-1) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-06-12 21:04:07 +0000
+++ b/control 2008-06-13 13:19:20 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <[email protected]>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, libxrandr-dev, bc , g++ (>> 4.3.0)
[s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libcurl4-openssl-dev ,
libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) ,
debhelper (>= 6.0.7~) , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc
mips mipsel s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel
s390 amd64 ppc64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libxml-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libformula-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
librepository-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel
amd64 ppc64 ia64] , dmake (>= 1:4.11) , libhunspell-dev (>= 1.1.5-2) ,
libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
libicu-dev , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) ,
libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64]
, liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) ,
libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , libgtk2.0-dev (>= 2.10) ,
libglib2.0-dev (>= 2.15.0)
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, libxrandr-dev, bc , g++ (>> 4.3.0)
[s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libcurl4-openssl-dev ,
libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) ,
debhelper (>= 6.0.7~) , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc
mips mipsel s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel
s390 amd64 ppc64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libxml-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libformula-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
librepository-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel
amd64 ppc64 ia64] , dmake (>= 1:4.11) , libhunspell-dev (>= 1.1.5-2) ,
libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
libicu-dev , libxslt1-dev , libcairo2-dev , libhsqldb-java (>= 1.8.0.9-1) [i386
powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386
powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , liblpsolve55-dev (>=
5.5.0.10-10), lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) ,
libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev ,
libneon27-dev , libgtk2.0-dev (>= 2.10) , libglib2.0-dev (>= 2.15.0)
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.7.2
XS-Python-Version: current
=== modified file 'rules'
--- a/rules 2008-06-12 21:04:07 +0000
+++ b/rules 2008-06-13 13:19:20 +0000
@@ -124,7 +124,7 @@
BUILD_CAIROCANVAS=y
USE_SYSTEM_CAIRO=y
CAIRO_FONTS_PATCH=y
-BUILD_KDE=y
+BUILD_KDE=n
KDE_VER=3
BUILD_DBG_PACKAGE=y
USE_SYSTEM_BSH=y
@@ -167,6 +167,7 @@
ENABLE_MINIMIZER=y
ENABLE_PRESENTER_SCREEN=y
ENABLE_PDFIMPORT=y
+BUILD_GTK=n
ENABLE_GIO=y
# when we have a package we want to have to be installed on older things with
some older
@@ -780,6 +781,15 @@
BUILD_DEPS += , kdepimlibs$(shell echo "$(KDE_VER)+1" | bc)-dev
endif
DBG_DBG_SUGGESTS+= , kdelibs-dbg, qt-x11-free-dbg
+ ifeq "$(KDE_VER)" "4"
+ CONFIGURE_FLAGS += --with-additional-sections="KDE4"
+ endif
+endif
+
+ifeq "$(BUILD_GTK)" "n"
+ CONFIGURE_FLAGS+= --disable-gtk
+ DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-gtk
-Nopenoffice.org$(VER)-gnome
+ CONFIGURE_FLAGS+= --with-images="industrial crystal hicontrast tango
$(HUMAN)"
endif
ifeq "$(BUILD_BINFILTERS)" "y"
@@ -1622,10 +1632,12 @@
cd debian/tmp/pkg; \
rm -f openoffice.org-common/$(OODIR)/program/.testtoolrc
+ifeq "$(BUILD_GTK)" "y"
# Gtk quickstarter for the eggtrtray stuff, so to -gtk (via -gnome)
mkdir -p -m755
debian/tmp/pkg/openoffice.org-gnome/$(OOBRANDDIR)/share/xdg
mv
debian/tmp/pkg/openoffice.org-common/$(OOBRANDDIR)/share/xdg/qstart.desktop \
debian/tmp/pkg/openoffice.org-gnome/$(OOBRANDDIR)/share/xdg
+endif
# move gengal stuff into -dev
mkdir -p debian/tmp/pkg/openoffice.org-dev/$(OODIR)/program
@@ -1833,10 +1845,14 @@
umask 022
# Copy files placed by ooo-build/bin/package-ooo
- for i in base calc core draw impress math writer gnome kde dev
headless; do \
+ for i in base calc core draw impress math writer gnome dev headless; do
\
rm -rf $(PKGDIR)-$$i $(PKGDIR)-$$i.*.debhelper ;\
cp -r --preserve=mode debian/tmp/pkg/openoffice.org-$$i $(PKGDIR)-$$i
|| exit 1;\
done
+ifeq "$(BUILD_KDE)" "y"
+ rm -rf $(PKGDIR)-kde $(PKGDIR)-kde.*.debhelper
+ cp -r --preserve=mode debian/tmp/pkg/openoffice.org-kde $(PKGDIR)-kde
|| exit 1
+endif
ifeq "$(BUILD_BINFILTERS)" "y"
rm -rf $(PKGDIR)-filter-binfilter
$(PKGDIR)-filter-binfilter.*.debhelper
@@ -1886,23 +1902,28 @@
# move the GNOME stuff which are *not* in gid_Module_Optional_Gnome
# (which is moved into -gnome in package-ooo) into -gnome
mkdir -p -m755 $(PKGDIR)-gnome/$(OODIR)/program
- for f in gnome-open-url.bin fps_gnome.uno.so libvclplug_gtk*.so; do \
+ mv $(PKGDIR)-core/$(OODIR)/program/gnome-open-url.bin
$(PKGDIR)-gnome/$(OODIR)/program || exit 1
+ifeq "$(BUILD_GTK)" "y"
+ for f in fps_gnome.uno.so libvclplug_gtk*.so; do \
mv $(PKGDIR)-core/$(OODIR)/program/$$f
$(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
done
for f in libeggtray* libqstart_gtk*; do \
mv $(PKGDIR)-core/$(OODIR)/program/$$f
$(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
done
+endif
# split out gtk stuff
rm -rf $(PKGDIR)-gtk
mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/program
mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk/$(OODIR)/program/
mkdir -p -m755 $(PKGDIR)-gtk/$(OOBRANDDIR)/share
+ifeq "$(BUILD_GTK)" "y"
mv $(PKGDIR)-gnome/$(OOBRANDDIR)/share/xdg
$(PKGDIR)-gtk/$(OOBRANDDIR)/share
mv $(PKGDIR)-gtk/$(OODIR)/program/ucpgvfs1.uno.so \
$(PKGDIR)-gnome/$(OODIR)/program/
mv $(PKGDIR)-core/$(OODIR)/program/gconfbe* \
$(PKGDIR)-gnome/$(OODIR)/program
+endif
mkdir -p -m755 $(PKGDIR)-evolution/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/libevoab2.so
$(PKGDIR)-evolution/$(OODIR)/program
@@ -2032,6 +2053,7 @@
> $(PKGDIR)-$$p/usr/share/applications/ooo$(VER)-$$p.desktop
|| exit 1 ;\
done
+ifeq "$(BUILD_GTK)" "y"
# qstart.desktop is different to the above. Should be handled by
# --with-unix-wrapper of ooo-build but that somehow doesn't work as
# expected. FIXME.
@@ -2040,6 +2062,7 @@
-e "s,Name=OpenOffice.org $$PRODUCTVERSION,Name=OpenOffice.org
$(VER)," \
-e "s/ / /" \
$(PKGDIR)-gtk/$(OOBRANDDIR)/share/xdg/qstart.desktop
+endif
# we don't need the share/xdgs except qstart
for f in `find debian -name '*.desktop' | grep xdg | grep -v qstart`;
do \
rm -f $$f; done
