------------------------------------------------------------
revno: 1344
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Thu 2008-12-18 17:04:14 +0100
message:
  mkdir necessary patch for the upstream "broffice.org" mimetype iconss; merge
modified:
  changelog
  control
  control.in
  rules
    ------------------------------------------------------------
    revno: 1022.1.208
    committer: Rene Engelhard <[email protected]>
    branch nick: unstable
    timestamp: Thu 2008-12-18 16:46:02 +0100
    message:
      openoffice.org-base-core needs to depend on openoffice.org-core....
    modified:
      changelog
      control
      control.in
    ------------------------------------------------------------
    revno: 1022.1.209
    committer: Rene Engelhard <[email protected]>
    branch nick: unstable
    timestamp: Thu 2008-12-18 16:48:40 +0100
    message:
      oops
    modified:
      control
=== modified file 'changelog'
--- a/changelog 2008-12-18 00:04:32 +0000
+++ b/changelog 2008-12-18 16:04:14 +0000
@@ -15,6 +15,8 @@
     - also install /usr/share/mime-info/openoffice.keys for broffice.org
   * debian/README, debian/rules: remove obsolete targets, explain
     make patch.apply
+  * debian/control.in:
+    - openoffice.org-base-core needs to depend on openoffice.org-core....
 
  -- Rene Engelhard <[email protected]>  Wed, 17 Dec 2008 19:11:08 +0100
 

=== modified file 'control'
--- a/control   2008-12-04 14:31:50 +0000
+++ b/control   2008-12-18 16:04:14 +0000
@@ -205,7 +205,7 @@
 
 Package: openoffice.org-base-core
 Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: ${shlibs:Depends}
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}
 Replaces: openoffice.org-base (<< 1:2.3.1)
 Suggests: openoffice.org-base
 Description: OpenOffice.org office suite -- libdba

=== modified file 'control.in'
--- a/control.in        2008-11-17 23:13:59 +0000
+++ b/control.in        2008-12-18 16:04:14 +0000
@@ -414,7 +414,7 @@
 
 Package: openoffice.orgVER-base-core
 Architecture: %OOO_ARCHS%
-Depends: ${shlibs:Depends}
+Depends: openoffice.orgVER-core (= ${Source-Version}), ${shlibs:Depends}
 Replaces: openoffice.org-base (<< 1:2.3.1)
 Suggests: openoffice.orgVER-base
 Description: OpenOffice.org office suite -- libdba

=== modified file 'rules'
--- a/rules     2008-12-18 14:45:49 +0000
+++ b/rules     2008-12-18 16:04:14 +0000
@@ -2606,6 +2606,7 @@
 
        # this is referenced in .keys/.applications
        for i in `find $(PKGDIR)-common/usr/share/icons -name 
"openofficeorg*png"`; do \
+               mkdir -p `dirname $$i | | sed -e 
s,openoffice.org-common,broffice.org,`; \
                ln -s `basename $$i` `echo $$i | sed -e 
s,openoffice.org-common,broffice.org,`; \
        done
  

Reply via email to