[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.2_rc2-1-20-g8369206



The following commit has been merged in the debian-experimental-4.0 branch:
commit 5a94451511cadeb102a04fb5fbf6f8ea12ef02de
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Apr 2 00:04:36 2013 +0200

    we need to build-depend on python3 as it contains dh_python3

diff --git a/changelog b/changelog
index 2a5b80a..ac31de9 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,8 @@ libreoffice (1:4.0.2~rc2-2) UNRELEASED; urgency=low
     - always build -dbg package if we build -subsequentcheckbase, as the
       test depends on -dbg
     - build against "new" libhsqldb1.8.0-java
+    - we need to build-depend on python3 even when building python3.3-uno
+      as it contains dh_python3...
   * debian/control.in:
     - add Breaks: on libreoffice-writer2latex/libreoffice-writer2xhtml
       (<< 1.0.2-9) due to LO 4.0 API change
diff --git a/control b/control
index ba6a2ce..bb996f0 100644
--- a/control
+++ b/control
@@ -107,6 +107,7 @@ Build-Depends: ant (>= 1.7.0),
                pkg-config,
                python (>= 2.6.6-3+squeeze4),
                python-dev (>= 2.6),
+               python3,
                python3.3-dev (>= 3.3),
                unixodbc-dev (>= 2.2.11),
                unzip,
@@ -4527,6 +4528,7 @@ Depends: ant (>= 1.7.0),
          pkg-config,
          python (>= 2.6.6-3+squeeze4),
          python-dev (>= 2.6),
+         python3,
          python3.3-dev (>= 3.3),
          unixodbc-dev (>= 2.2.11),
          unzip,
diff --git a/rules b/rules
index f32817a..aae86ee 100755
--- a/rules
+++ b/rules
@@ -698,6 +698,8 @@ endif
 
 ifeq "$(ENABLE_PYTHON)" "y"
 	BUILD_DEPS += , python (>= 2.6.6-3+squeeze4)
+	# for dh_python3
+	BUILD_DEPS += , python3
 	DBG_DBG_SUGGESTS+= , python-dbg
   ifneq "$(WHEEZY_BACKPORT)" "y"
 	BUILD_DEPS += , $(PYTHON)-dev (>= 3.3)

-- 
LibreOffice packaging repository


Reply to: