[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.5_rc2-1-1-gb85d540
The following commit has been merged in the debian-experimental-3.6 branch:
commit b85d540c9d81f3a52300b660b2276af0aacedba1
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jan 22 00:33:01 2013 +0100
stop using lsb_release -cs, parse dpkg-parsechangelog instead
diff --git a/changelog b/changelog
index 8397909..d3e295a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:3.6.5~rc2-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - stop using lsb_release -cs, parse dpkg-parsechangelog instead.
+ avoids the base-files issue.
+
+ -- Rene Engelhard <rene@debian.org> Tue, 22 Jan 2013 00:29:09 +0100
+
libreoffice (1:3.6.5~rc2-1) experimental; urgency=low
* new upstream release candidate
diff --git a/rules b/rules
index eb0d46b..7512097 100755
--- a/rules
+++ b/rules
@@ -32,7 +32,6 @@ PACKAGES := $(ARCH_INDEP_PACKAGES) $(ARCH_DEP_PACKAGES)
include /usr/share/dpkg/architecture.mk
include /usr/share/dpkg/vendor.mk
-DISTREL := $(shell lsb_release -cs)
SHELL:=/bin/bash
SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\..$$/\1/p')
@@ -79,10 +78,6 @@ ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
endif
-#ifeq "$(DISTREL)" "wheezy"
-# WHEEZY_BACKPORT=y
-#endif
-
#########
# Default package configuration
#
@@ -476,8 +471,8 @@ ifeq "$(DEB_VENDOR)" "Debian"
CONFIGURE_FLAGS += --with-intro-progressbar-color=215,7,81
endif
-# Debian Squeeze
-ifeq "$(WHEEZY_BACKPORT)" "y"
+# Debian WHeezy
+ifeq "$(shell dpkg-parsechangelog | grep urgency | awk '{ print $$3 }')" "wheezy-backports;"
BUGS=mailto:debian-backports@lists.debian.org
SYSTEM_STUFF := $(filter-out libcmis libcdr clucene, $(SYSTEM_STUFF))
endif
@@ -1476,10 +1471,6 @@ ifeq "$(ENABLE_GIO)" "y"
perl -pi -e 's/GNOME GIO/GIO/' debian/control
endif
-#ifneq "$(WHEEZY_BACKPORT)" "y"
-# perl -pi -e "s/(Build-Conflicts: .*)/\1, base-files (= 7.0), base-files (= 7.1)/" debian/control
-#endif
-
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
perl -pi -e "s/(Build-Conflicts: .*)/\1, libhsqldb-java (>= $(HSQLDB_TOONEWVER)~)/" debian/control
endif
--
LibreOffice packaging repository
Reply to: