[SCM] LibreOffice packaging repository branch, master, updated. ae161aa34866c5490b1c49b9ea78dd2fea0d1e4f
The following commit has been merged in the master branch:
commit 1ee6b7a7045b17bf9474e931d447912fabdbc4fe
Author: Rene Engelhard <rene@debian.org>
Date: Mon Mar 21 22:47:10 2011 +0000
remove lenny-backport support; lenny hasn't a dpkg-maintscript-helper
diff --git a/changelog b/changelog
index c15d701..f1a693c 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,8 @@ libreoffice (1:3.3.2~rc2-2) UNRELEASED; urgency=low
- move dh_link before dh_python2 as dh_python2 gets confused by symlinks
before dh_link fixed them up
- don't add shell-lib-conffiles.sh to maintscripts anymore
+ - remove lenny-backport support; lenny hasn't a dpkg-maintscript-helper
+ - make base-files build-conflict also work after 6.0.1
* debian/libreoffice-common.p*.in:
- remove hardcoded rm_conffile. use dpkg-maintscript-helper
- move psprint.conf, sofficerc and soffice.sh (closes: #619113)
diff --git a/control b/control
index c55534d..fae6087 100644
--- a/control
+++ b/control
@@ -5,7 +5,7 @@ Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], 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, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, wget | curl, g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390], dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite-dev, libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev (>= 1.12), openjdk-6-jdk [alpha amd64 armel armhf i386 powerpc powerpcspe ppc64
s390 s390x sparc], gcj-native-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel], libcommons-logging-java, libservlet2.5-java, xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd
-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev, libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, libtextcat-data-utf8, fontforge
-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), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 5), base-files (= 6.0), libhsqldb-java (>= 1.8.1~)
+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), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (>= 6.0), base-files (<< 6.1~), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.8.4
XS-Python-Version: current
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
diff --git a/rules b/rules
index 674d215..354f08e 100755
--- a/rules
+++ b/rules
@@ -93,10 +93,6 @@ TARFILE_LOCATION=$(CURDIR)/ext-sources
export TARFILE_LOCATION
USE_SOURCE_TARBALLS=y
-ifeq "$(DISTREL)" "lenny"
- LENNY_BACKPORT=y
-endif
-
ifeq "$(DISTREL)" "squeeze"
SQUEEZE_BACKPORT=y
endif
@@ -191,11 +187,7 @@ ifeq "$(KDE_VER)" "3"
endif
ifeq "$(KDE_VER)" "4"
QT_MINVER= (>= 4.5)
- # somehow lenny-backport picks this up although
- # KDE is 3...
- ifneq "$(LENNY_BACKPORT)" "y"
- KDELIBS_MINVER= (>= 4:4.3.4)
- endif
+ KDELIBS_MINVER= (>= 4:4.3.4)
endif
BUILD_DBG_PACKAGE=y
SYSTEM_STUFF += beanshell
@@ -444,36 +436,6 @@ ifeq "$(DIST)" "Debian"
endif
endif
-# Debian Lenny
-ifeq "$(LENNY_BACKPORT)" "y"
- BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out boost icu jfreereport libwpd libwpg libwps lucene mdds redland, $(SYSTEM_STUFF))
- MONO_MINVER= (>= 1.2.3)
- MONO2=n
- LPSOLVE_MIN_VERSION= (>= 5.5.0.10-10)
- SUITESPARSE_MIN_VERSION= (>= 3.1.0)
- BUILD_KDE=y
-ifeq "$(BUILD_KDE)" "y"
- ENABLE_KDEAB=y
-endif
- KDE_VER=3
- CURL_SECTYPE=openssl
- HSQLDB_MINVER= (>> 1.8.0.9)
-ifneq (,$(filter ia64 mips% kfreebsd%, $(ARCH)))
- JDK=java-gcj-compat-dev
-endif
- DICT_DIR=/usr/share/myspell/dicts
- HYPH_DIR=/usr/share/myspell/dicts
- THES_DIR=/usr/share/myspell/dicts
- MOZILLA=iceape
- # only works with system-mysqlcppconn on lenny (the thing has a hardoced
- # so.16). And mysql-connector-c++ is not in lenny.
- ENABLE_MYSQLNATIVE=n
- USE_SYSTEM_TEXTCAT_DATA=n
- ENABLE_GCONF=n
- PYTHON_HELPER=dh_pycentral
-endif
-
# Debian Squeeze
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUGS=mailto:debian-backports@lists.debian.org
@@ -509,11 +471,7 @@ ifeq "$(USE_BZIP_COMPRESS)" "y"
BUILDDEB_OPTIONS = -- -Zbzip2
endif
-ifeq "$(LENNY_BACKPORT)" "y"
- BUILD_DEPS += , dpkg-dev (>= 1.14.27)
-else
BUILD_DEPS += , dpkg-dev (>= 1.15.1)
-endif
ifneq "$(OOO_OGLTRANS_ARCHS)" ""
BUILD_DEPS += , libgl1-mesa-dev$(OOO_NO_OGLTRANS_ARCHS), libglu1-mesa-dev$(OOO_NO_OGLTRANS_ARCHS)
@@ -722,11 +680,7 @@ ifeq "$(ENABLE_JAVA)" "y"
TEST_JAVA_HOME=$(JAVA_HOME)
ifeq "$(BUILD_JARS_NATIVE)" "y"
CONFIGURE_FLAGS += --enable-gcjaot
- ifeq "$(LENNY_BACKPORT)" "y"
- BUILD_DEPS += , default-jdk-builddep$(OOO_NO_GCJ_ARCHS), gij$(OOO_NO_GCJ_ARCHS), java-gcj-compat-dev (>= 1.0.76-7)$(OOO_NO_GCJ_ARCHS), libgcj-bc$(OOO_GCJ_ARCHS)
- else
BUILD_DEPS += , gcj-native-helper$(OOO_NO_GCJ_ARCHS), libgcj-common (>= 1:4.4.1)$(OOO_NO_GCJ_ARCHS)
- endif
else
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
BUILD_DEPS += , gcj-jdk [$(OOO_GCJ_JDK_ARCHS)]
@@ -765,13 +719,9 @@ export JAVA_HOME
endif
ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(DIST)" "Debian"
- ifeq "$(LENNY_BACKPORT)" "y"
- BUILD_DEPS += , mingw32$(OOO_NO_JAVA_ARCHS)
- else
BUILD_DEPS += , gcc-mingw32$(OOO_NO_JAVA_ARCHS), mingw32-runtime$(OOO_NO_JAVA_ARCHS)
- endif
- CONFIGURE_FLAGS += --enable-build-unowinreg
- CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
+ CONFIGURE_FLAGS += --enable-build-unowinreg
+ CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
endif
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
@@ -781,12 +731,8 @@ export JAVA_HOME
MEDIAWIKI_JAR_DEPENDS := , libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java
BUILD_DEPS += $(MEDIAWIKI_BUILD_DEPS)
CONFIGURE_FLAGS += --with-commons-codec-jar=/usr/share/java/commons-codec.jar --with-commons-lang-jar=/usr/share/java/commons-lang.jar --with-commons-httpclient-jar=/usr/share/java/commons-httpclient.jar --with-commons-logging-jar=/usr/share/java/commons-logging.jar
- ifeq "$(LENNY_BACKPORT)" "y"
- CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
- else
CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
- endif
endif
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
@@ -801,12 +747,8 @@ export JAVA_HOME
REPORT_BUILDER_BUILD_DEPS += , libcommons-logging-java$(OOO_NO_JAVA_ARCHS)
REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java
CONFIGURE_FLAGS += --with-commons-logging-jar=/usr/share/java/commons-logging.jar
- ifeq "$(LENNY_BACKPORT)" "y"
- CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
- else
CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
- endif
endif
CONFIGURE_FLAGS += --enable-report-builder
endif
@@ -1543,11 +1485,8 @@ ifeq "$(ENABLE_GIO)" "y"
perl -pi -e 's/GNOME GIO/GIO/' debian/control
endif
-ifneq "$(LENNY_BACKPORT)" "y"
- perl -pi -e "s/(Build-Conflicts: .*)/\1, base-files (= 5)/" debian/control
-endif
ifneq "$(SQUEEZE_BACKPORT)" "y"
- perl -pi -e "s/(Build-Conflicts: .*)/\1, base-files (= 6.0)/" debian/control
+ perl -pi -e "s/(Build-Conflicts: .*)/\1, base-files (>= 6.0), base-files (<< 6.1~)/" debian/control
endif
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
@@ -3167,11 +3106,8 @@ ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
done
endif
-# we first need to find out whether it works on lenny, see issue 105172
-ifneq "$(LENNY_BACKPORT)" "y"
# enable session handling and recovery
perl -pi -e 's,<prop oor:name="DocumentStoreUIEnabled" oor:type="xs:boolean"><value>false</value></prop>,<prop oor:name="DocumentStoreUIEnabled" oor:type="xs:boolean"><value>true</value></prop>,' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
-endif
# examples. move where they belong
mkdir -p $(PKGDIR)-common/usr/share/doc/libreoffice-common/examples
@@ -3249,9 +3185,6 @@ ifeq "$(BUILD_DBG_PACKAGE)" "y"
else
dh_strip -s
endif
-ifeq "$(LENNY_BACKPORT)" "y"
- dh_desktop -s
-endif
dh_icons -s
ifeq "$(ENABLE_MONO)" "y"
dh_installcligac -s
@@ -3444,9 +3377,6 @@ endif
dh_lintian -i
dh_bugfiles -i -A
dh_fixperms -i
-ifeq "$(LENNY_BACKPORT)" "y"
- dh_desktop -i
-endif
dh_icons -i
dh_installxmlcatalogs -i
ifeq "$(ENABLE_MONO)" "y"
--
LibreOffice packaging repository
Reply to: