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

r759 ./packages/openofficeorg/2.2.1/unstable: --disable-access



------------------------------------------------------------
revno: 759
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2007-06-26 19:06:26 +0200
message:
  --disable-access
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2007-06-26 15:50:46 +0000
+++ b/changelog	2007-06-26 17:06:26 +0000
@@ -7,7 +7,7 @@
       + distro-configs: --disable-access, broken, thanks Mechtilde Stehmann
         for the reminder
    * debian/rules:
-     - remove BUILD_MDBTOOLS conditionals, see above
+     - --disable-access; remove BUILD_MDBTOOLS conditionals, see above
      - improve test target; make it honour nocheck for DEB_BUILD_OPTIONS,
        run smoketest per default
      - remove some ifeq "$(ETCH_BACKPORT)" "y" conditionals, one to go...
@@ -16,7 +16,7 @@
        b0rkage with cairo 1.4.8 (closes: #430135), thanks Caolan McNamara
        for the tip.
 
- -- Rene Engelhard <rene@debian.org>  Tue, 26 Jun 2007 16:38:25 +0200
+ -- Rene Engelhard <rene@debian.org>  Tue, 26 Jun 2007 18:46:09 +0200
 
 openoffice.org (2.2.1-2) unstable; urgency=low
 

=== modified file 'rules'
--- a/rules	2007-06-26 15:48:53 +0000
+++ b/rules	2007-06-26 17:06:26 +0000
@@ -110,7 +110,6 @@
 BUILD_CAIROCANVAS=y
 USE_SYSTEM_CAIRO=y
 CAIRO_FONTS_PATCH=y
-USE_SYSTEM_MDBTOOLS=y
 BUILD_KDE=y
 BUILD_DBG_PACKAGE=y
 USE_SYSTEM_BSH=y
@@ -151,6 +150,10 @@
 		--enable-atkbridge \
                 --enable-lockdown
 
+# distro-configs is too late; it already gets searched in unpack
+# when we don't do that here, too.
+CONFIGURE_FLAGS += --disable-access
+
 ifneq "$(PACKAGE_QUICKSTART)" "y"
   CONFIGURE_FLAGS+= --disable-quickstart
 endif


Reply to: