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

./packages/openofficeorg/3.0/experimental r1289: lenny backport



------------------------------------------------------------
revno: 1289
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-10-15 23:08:48 +0200
message:
  lenny backport
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2008-10-15 20:47:14 +0000
+++ b/changelog	2008-10-15 21:08:48 +0000
@@ -6,8 +6,10 @@
   * debian/rules:
     - don't run the smoketest again as it still causes weird build/install
       failures on the buildds
+    - remove etch-backport conditionals, add lenny-backport conditionla -
+      use internal lucene there.
 
- -- Rene Engelhard <rene@debian.org>  Wed, 15 Oct 2008 22:40:53 +0200
+ -- Rene Engelhard <rene@debian.org>  Wed, 15 Oct 2008 23:04:58 +0200
 
 openoffice.org (1:3.0.0-2) experimental; urgency=low
 

=== modified file 'rules'
--- a/rules	2008-10-15 20:47:14 +0000
+++ b/rules	2008-10-15 21:08:48 +0000
@@ -75,8 +75,8 @@
 SOURCE_TREE=ooo-build/build/$(TAG)
 STAMP_DIR=debian/stampdir
 
-ifeq "$(DISTREL)" "etch"
-  ETCH_BACKPORT=y
+ifeq "$(DISTREL)" "lenny"
+ LENNY_BACKPORT=y
 endif
 
 #########
@@ -241,36 +241,9 @@
   endif
 endif
 
-# Debian Etch backport
-ifeq "$(ETCH_BACKPORT)" "y"
-  PATCHSET=$(DIST)Etch
-  USE_SYSTEM_LIBWPS=n
-  SYSTEM_ALTLINUXHYPH=n
-  USE_LIBHYPHEN=n
-  ENABLE_MONO=n
-  CAIRO_FONTS_PATCH=n
-  HUNSPELL_MIN_VER= (>= 1.0.8-2)
-  USE_SHARED_LPSOLVE=y
-  LPSOLVE_MIN_VERSION=
-  USE_SYSTEM_LIBSVG=n
-  USE_SYSTEM_DMAKE=n
-  USE_LIBCURL4=n
-  USE_LIBSUITESPARSE=n
-  USE_SYSTEM_BOOST=y
-  USE_SYSTEM_LIBWPG=n
-  USE_SYSTEM_HSQLDB=n
-  ENABLE_REPORTDESIGN=y
-  USE_SYSTEM_JFREEREPORT=n
-  # etchs ant too old
-  ENABLE_MEDIAWIKI=n
-  NEONSONR=26
-  NEW_DPKG_SHLIBDEPS=n
-  DBVER=4.4
-  USE_STLPORT=y
-  PACKAGE_WRITER2LATEX=y
-  MOZILLA=xulrunner
-  ENABLE_GIO=n
-  USE_SYSTEM_REDLAND=n
+# Debian Lenny
+ifeq "$(LENNY_BACKPORT)" "y"
+  USE_SYSTEM_LUCENE=n
 endif
 
 #############


Reply to: