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

./packages/libreoffice/3.3.0/experimental r2264: fix lenny backport



------------------------------------------------------------
revno: 2264
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2010-12-29 18:28:03 +0100
message:
  fix lenny backport
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2010-12-28 13:25:52 +0000
+++ b/changelog	2010-12-29 17:28:03 +0000
@@ -1,3 +1,11 @@
+libreoffice (1:3.3.0~rc2-3) UNRELEASED; urgency=low
+
+  * merge OOo lenny-backport fixes
+    + keep 3.0 (quilt) for lenny-backports now that it supports it
+    + really use internal mythes 
+
+ -- Rene Engelhard <rene@debian.org>  Wed, 29 Dec 2010 18:25:14 +0100
+
 libreoffice (1:3.3.0~rc2-2) experimental; urgency=low
 
   [ Rene Engelhard ]

=== modified file 'rules'
--- a/rules	2010-12-27 18:24:21 +0000
+++ b/rules	2010-12-29 17:28:03 +0000
@@ -401,7 +401,6 @@
   # 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
-  DEBSRC_VERSION=1.0
   USE_SYSTEM_REDLAND=n
   USE_SYSTEM_TEXTCAT_DATA=n
   USE_SYSTEM_LIBWPD=n
@@ -414,6 +413,8 @@
   USE_SYSTEM_LIBWPD=n
   USE_SYSTEM_LIBWPG=n
   USE_SYSTEM_LIBWPS=n
+  USE_EXTERNAL_MYTHES=n
+  JUNIT_MIN_VER=
 endif
 
 # the archive only accepts bzip2 compressed members on 3.0 (quilt)
@@ -423,8 +424,6 @@
 else
   USE_BZIP_COMPRESS=n
   PRUNE_OOOBUILD=y
-  USE_EXTERNAL_MYTHES=n
-  JUNIT_MIN_VER=
 endif
 
 #############


Reply to: