CVS:oo-deb/debian changelog,1.362.2.45,1.362.2.46 control,1.186.2.21,1.186.2.22 control.in,1.153.2.18,1.153.2.19 rules,1.231.2.26,1.231.2.27
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv18427/debian
Modified Files:
Tag: OPENOFFICE_ORG_1_1_3
changelog control control.in rules
Log Message:
* debian/control.in:
- add Builddep on lsb-release [RE]
- change kdelibs4-dev builddep to kdelibs4-dev | ubuntu-artwork to
disable it for Ubuntu [RE]
* debian/rules:
- use lsb_release -is to differentiate whether we build for Debian or
Ubuntu and disable the KDE stuff when building on Ubuntu, thanks
Matthias Klose for the lsb_release hint. Honour
DEB_BUILD_OPTIONS=withkde to enable build with KDE on Ubuntu [RE]
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.231.2.26
retrieving revision 1.231.2.27
diff -u -d -r1.231.2.26 -r1.231.2.27
--- rules 22 Nov 2004 23:16:35 -0000 1.231.2.26
+++ rules 26 Nov 2004 11:39:12 -0000 1.231.2.27
@@ -40,6 +40,8 @@
UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d- -f1)
# Determine our architecture.
ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+# Dist we are building for
+DIST := $(shell lsb_release -is)
# Read in architecture-specific variables of importance.
include debian/scripts/vars.$(ARCH)
@@ -65,8 +67,25 @@
--enable-fontconfig \
--with-stlport4-home=$(STLPORT_HOME) \
--with-python=/usr/bin/python \
- --enable-kde \
--enable-libsn
+
+ifneq "$(DIST)" "Ubuntu"
+ BUILD_KDE=y
+else
+ ifneq (withkde,$(findstring withkde,$(DEB_BUILD_OPTIONS)))
+ BUILD_KDE=n
+ else
+ BUILD_KDE=y
+ fi
+endif
+
+ifeq "$(BUILD_KDE)" "y"
+ CONFIGURE_FLAGS += --enable-kde
+else
+ DEBHELPER_OPTIONS=+= -Nopenoffice.org-kde
+ IGNORE_MANIFEST_CHANGES=1
+ export IGNORE_MANIFEST_CHANGES
+fi
D=4.2
USE_SYSTEM_STLPORT=y
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.153.2.18
retrieving revision 1.153.2.19
diff -u -d -r1.153.2.18 -r1.153.2.19
--- control.in 4 Nov 2004 17:56:10 -0000 1.153.2.18
+++ control.in 26 Nov 2004 11:39:12 -0000 1.153.2.19
@@ -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++-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], gimp | gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, 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, kdelibs4-dev, libgnomevfs2-dev, libstartup-notification0-dev, libebook-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], gimp | gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, 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, kdelibs4-dev | ubuntu-artwork, libgnomevfs2-dev, libstartup-notification0-dev, libebook-dev, lsb-release
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-3), debhelper (= 4.2.22)
Standards-Version: 3.6.1
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.362.2.45
retrieving revision 1.362.2.46
diff -u -d -r1.362.2.45 -r1.362.2.46
--- changelog 25 Nov 2004 12:25:04 -0000 1.362.2.45
+++ changelog 26 Nov 2004 11:39:11 -0000 1.362.2.46
@@ -5,12 +5,21 @@
- sysui-mimetypes.diff: add some more for RTF and MS Word, add
MimeType= entry to math.desktop too, thanks Nathanial McCallum and
Matthias Klose [RE]
+ * debian/control.in:
+ - add Builddep on lsb-release [RE]
+ - change kdelibs4-dev builddep to kdelibs4-dev | ubuntu-artwork to
+ disable it for Ubuntu [RE]
+ * debian/rules:
+ - use lsb_release -is to differentiate whether we build for Debian or
+ Ubuntu and disable the KDE stuff when building on Ubuntu, thanks
+ Matthias Klose for the lsb_release hint. Honour
+ DEB_BUILD_OPTIONS=withkde to enable build with KDE on Ubuntu [RE]
* debian/openoffice.org.post{inst,rm}.in: remove postinst and
do not run update_desktop_database in postrm; undefined. dh_desktop does
insert a run to update-desktop-database already anyway...
(closes: #282864) [RE]
- -- Rene Engelhard <rene@debian.org> Wed, 24 Nov 2004 23:35:03 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 26 Nov 2004 12:38:30 +0100
openoffice.org (1.1.3-2) experimental; urgency=low
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.186.2.21
retrieving revision 1.186.2.22
diff -u -d -r1.186.2.21 -r1.186.2.22
--- control 23 Nov 2004 09:12:10 -0000 1.186.2.21
+++ control 26 Nov 2004 11:39:11 -0000 1.186.2.22
@@ -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++-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], gimp | gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, 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, kdelibs4-dev, libgnomevfs2-dev, libstartup-notification0-dev, libebook-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], gimp | gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, 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, kdelibs4-dev | ubuntu-artwork, libgnomevfs2-dev, libstartup-notification0-dev, libebook-dev, lsb-release
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-3), debhelper (= 4.2.22)
Standards-Version: 3.6.1
Reply to: