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

./packages/openofficeorg/3.1/experimental r1352: merge



------------------------------------------------------------
revno: 1352
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2008-12-16 11:14:49 +0100
message:
  merge
added:
  source.lintian-overrides
modified:
  changelog
  rules
    ------------------------------------------------------------
    revno: 1332.1.1
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Thu 2008-12-04 18:03:32 +0100
    message:
      override bogus missing-build-dependency-for-dh_-command
    added:
      source.lintian-overrides
    modified:
      changelog
    ------------------------------------------------------------
    revno: 1332.1.2
    committer: Rene Engelhard <rene@debian.org>
    branch nick: experimental
    timestamp: Fri 2008-12-05 12:55:03 +0100
    message:
      close #434510
    modified:
      changelog
    ------------------------------------------------------------
    revno: 1332.1.3
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Tue 2008-12-09 23:03:41 +0100
    message:
      better description, update ooo-build
    modified:
      changelog
    ------------------------------------------------------------
    revno: 1332.1.4
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Wed 2008-12-10 23:06:22 +0100
    message:
      merge
    modified:
      changelog
      rules
        ------------------------------------------------------------
        revno: 1331.1.1
        committer: Rene Engelhard <rene@debian.org>
        branch nick: debian
        timestamp: Wed 2008-12-10 23:04:24 +0100
        message:
          +    - update .so -> -dev merging to the fact that 3.0s SDK does not have
          +      the .so symlinks for libuno_* anymore but only for the internal xmlsec.
        modified:
          changelog
          rules
    ------------------------------------------------------------
    revno: 1332.1.5
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Wed 2008-12-10 23:07:22 +0100
    message:
      typo
    modified:
      rules
        ------------------------------------------------------------
        revno: 1331.1.2
        committer: Rene Engelhard <rene@debian.org>
        branch nick: debian
        timestamp: Wed 2008-12-10 23:07:06 +0100
        message:
          typo
        modified:
          rules
    ------------------------------------------------------------
    revno: 1332.1.6
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Wed 2008-12-10 23:17:36 +0100
    message:
      gah
    modified:
      rules
        ------------------------------------------------------------
        revno: 1331.1.3
        committer: Rene Engelhard <rene@debian.org>
        branch nick: debian
        timestamp: Wed 2008-12-10 23:17:18 +0100
        message:
          gah
        modified:
          rules
    ------------------------------------------------------------
    revno: 1332.1.7
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Sun 2008-12-14 22:29:33 +0100
    message:
      update ooo-build to something actually supporting m13 completely; add build hack
    modified:
      changelog
      rules
    ------------------------------------------------------------
    revno: 1332.1.8
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Mon 2008-12-15 11:31:55 +0100
    message:
      fake merge
        ------------------------------------------------------------
        revno: 1022.1.207
        committer: Rene Engelhard <rene@debian.org>
        branch nick: debian
        timestamp: Mon 2008-12-15 11:26:45 +0100
        message:
          -15 (update sdbc postgresql driver to 0.7.6)
        modified:
          changelog
=== modified file 'changelog'
--- a/changelog	2008-12-12 22:17:14 +0000
+++ b/changelog	2008-12-16 10:14:49 +0000
@@ -19,13 +19,19 @@
 
  -- Rene Engelhard <rene@debian.org>  Sun, 07 Dec 2008 19:40:24 +0100
 
-openoffice.org (1:3.0.1~ooo300m12-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.1~ooo300m13-0.1pre) experimental; urgency=low
 
-  * new upstream snapshot
+  * new upstream snapshot (OOO300_m13)
+    - fixes usage of flash v9 plugin (closes: #434510)
   * ooo-build
-    - switch to ooo-build-3-0-1 branch (r14699)
+    - switch to ooo-build-3-0-1 branch (r14842)
+  * debian/source.lintian-overrides: override bogus
+    missing-build-dependency-for-dh_-command
+  * debian/rules:
+    - update .so -> -dev merging to the fact that 3.0s SDK does not have
+      the .so symlinks for libuno_* anymore but only for the internal xmlsec.
 
- -- Rene Engelhard <rene@debian.org>  Tue, 02 Dec 2008 23:27:33 +0100
+ -- Rene Engelhard <rene@debian.org>  Fri, 12 Dec 2008 22:35:36 +0100
 
 openoffice.org (1:3.0.0-6) experimental; urgency=low
 

=== modified file 'rules'
--- a/rules	2008-12-14 15:54:14 +0000
+++ b/rules	2008-12-16 10:14:49 +0000
@@ -42,7 +42,9 @@
 OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DIST := $(shell lsb_release -is)
-DISTREL := $(shell lsb_release -cs)
+# hack: lsb_release in sid right now gives "lenny" due to broken base-files
+# upload policy
+DISTREL := sid
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -1660,15 +1662,6 @@
   endif
 endif
 
-# FIXME: For whatever reason since 3.0.0 we don't have .so symlinks anymore.
-# And as libxmlsec*.so went static anymore this fails now. Comment out
-# temporarily...
-#	# move .so to -dev
-#	cd debian/tmp/pkg; \
-#		mkdir -p -m755 openoffice.org-dev/$(OODIR)/program; \
-#		mv openoffice.org-common/$(OODIR)/program/*.so \
-#			openoffice.org-dev/$(OODIR)/program
-
 ifeq "$(ENABLE_MONO)" "y"
 	cd debian/tmp/pkg; \
 	mkdir -p openoffice.org-core/$(OOBRANDDIR)/ure/lib; \

=== added file 'source.lintian-overrides'
--- a/source.lintian-overrides	1970-01-01 00:00:00 +0000
+++ b/source.lintian-overrides	2008-12-04 17:03:32 +0000
@@ -0,0 +1,1 @@
+openoffice.org source: missing-build-dependency-for-dh_-command dh_clideps=cli-common-dev


Reply to: