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

./packages/openofficeorg/3.0/experimental r1264: update ooo-build; conflict against not matching -qa-ui-tests; lintian fixes



------------------------------------------------------------
revno: 1264
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Thu 2008-09-25 08:10:10 +0200
message:
  update ooo-build; conflict against not matching -qa-ui-tests; lintian fixes
modified:
  changelog
  control.in
  openoffice.org-report-builder-bin.lintian-overrides
  rules
    ------------------------------------------------------------
    revno: 1022.1.164
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Wed 2008-09-24 10:25:23 +0200
    message:
      soffice-detect-mozilla-certificates.diff update
    modified:
      changelog
    ------------------------------------------------------------
    revno: 1022.1.165
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Wed 2008-09-24 15:03:20 +0200
    message:
      fix override
    modified:
      changelog
      openoffice.org-report-builder-bin.overrides.lintian
=== modified file 'changelog'
--- a/changelog	2008-09-25 05:45:07 +0000
+++ b/changelog	2008-09-25 06:10:10 +0000
@@ -1,3 +1,18 @@
+openoffice.org (1:3.0.0~rc2-1.2pre) experimental; urgency=low
+
+  * ooo-build:
+    - update (r14052)
+      - soffice-detect-mozilla-certificates.diff: only do a full find for
+        cert8.db when we don't find it with just maxdepth 2 (closes: #499062) 
+  * debian/rules:
+    - remove extraneous LICENSE file again
+  * debian/openoffice.org-report-builder-bin.overrides.lintian: fix
+  * debian/control.in:
+    - conflict against non-matching versions of -qa-ui-tools now that
+      the new "testautomation" module follows cwses
+
+ -- Rene Engelhard <rene@debian.org>  Sun, 21 Sep 2008 20:43:06 +0200
+
 openoffice.org (1:3.0.0~rc2-1) experimental; urgency=high
 
   * OpenOffice.org 3.0 release candidate 2 (OOO300_m7)

=== modified file 'control.in'
--- a/control.in	2008-08-27 03:32:58 +0000
+++ b/control.in	2008-09-25 06:10:10 +0000
@@ -227,7 +227,9 @@
  openoffice.orgVER-dev (<< ${Source-Version}),
  libcairo2 (= 1.4.8-1),
  libicu38 (= 3.8~d01-1),
- cli-uno-bridge (<< 1:3.0.0~dev300m22)
+ cli-uno-bridge (<< 1:3.0.0~dev300m22),
+ openoffice.org-qa-ui-tests (<< ${base-version}},
+ openoffice.org-qa-ui-tests (>= ${base-version}.1}
 Provides: openoffice.orgVER-bundled, 
  openoffice.org2-core,
  openoffice.org-java,

=== modified file 'openoffice.org-report-builder-bin.lintian-overrides'
--- a/openoffice.org-report-builder-bin.lintian-overrides	2008-08-22 16:43:46 +0000
+++ b/openoffice.org-report-builder-bin.lintian-overrides	2008-09-25 06:10:10 +0000
@@ -1,1 +1,1 @@
-openoffice.org-report-builder: binary-or-shlib-defines-rpath
+openoffice.org-report-builder-bin: binary-or-shlib-defines-rpath

=== modified file 'rules'
--- a/rules	2008-09-25 05:45:07 +0000
+++ b/rules	2008-09-25 06:10:10 +0000
@@ -2709,7 +2709,7 @@
 	# fix permission
 	chmod 644 $(PKGDIR)-common/$(OODIR)/program/hid.lst
 
-	rm -rf $(PKGDIR)-common/$(OODIR)/LICENSE
+	rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/LICENSE
 
 	# move uno_packages/cache to /var and create symlink for for
 	# documentation referencing it...


Reply to: