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

./packages/openofficeorg/2.4.1/unstable r1148: we need a versioned dir, and cli_cppuhelper.dll needs cli-uno-bridge...



------------------------------------------------------------
revno: 1148
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-07-07 01:30:53 +0200
message:
  we need a versioned dir, and cli_cppuhelper.dll needs cli-uno-bridge...
modified:
  changelog
  control
  control.mono.in
  libuno-cli-basetypes1.0-cil.installcligac
  libuno-cli-cppuhelper1.0-cil.installcligac
  libuno-cli-types1.1-cil.installcligac
  libuno-cli-ure1.0-cil.installcligac
  rules
=== modified file 'changelog'
--- a/changelog	2008-07-06 21:09:34 +0000
+++ b/changelog	2008-07-06 23:30:53 +0000
@@ -16,7 +16,7 @@
     to register mailmerge.py as it otherwise doesn't seem to work
     (closes: #488875)
 
- -- Rene Engelhard <rene@debian.org>  Sun, 06 Jul 2008 23:08:20 +0200
+ -- Rene Engelhard <rene@debian.org>  Sun, 06 Jul 2008 23:28:58 +0200
 
 openoffice.org (1:2.4.1-4) unstable; urgency=medium
 

=== modified file 'control'
--- a/control	2008-07-06 21:17:18 +0000
+++ b/control	2008-07-06 23:30:53 +0000
@@ -3069,7 +3069,7 @@
 
 Package: libuno-cli-cppuhelper1.0-cil
 Architecture: all
-Depends: ${cli:Depends}
+Depends: ${cli:Depends}, cli-uno-bridge (= ${binary:Version})
 Description: CLI-UNO Bridge - bootstrapping library
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.

=== modified file 'control.mono.in'
--- a/control.mono.in	2008-07-06 21:03:44 +0000
+++ b/control.mono.in	2008-07-06 23:30:53 +0000
@@ -39,7 +39,7 @@
 
 Package: libuno-cli-cppuhelper1.0-cil
 Architecture: all
-Depends: ${cli:Depends}
+Depends: ${cli:Depends}, cli-uno-bridge (= ${binary:Version})
 Description: CLI-UNO Bridge - bootstrapping library
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.

=== modified file 'libuno-cli-basetypes1.0-cil.installcligac'
--- a/libuno-cli-basetypes1.0-cil.installcligac	2008-07-06 21:03:44 +0000
+++ b/libuno-cli-basetypes1.0-cil.installcligac	2008-07-06 23:30:53 +0000
@@ -1,1 +1,1 @@
-/usr/lib/cli/uno/cli_basetypes.dll
+/usr/lib/cli/uno-1.0/cli_basetypes.dll

=== modified file 'libuno-cli-cppuhelper1.0-cil.installcligac'
--- a/libuno-cli-cppuhelper1.0-cil.installcligac	2008-07-06 21:03:44 +0000
+++ b/libuno-cli-cppuhelper1.0-cil.installcligac	2008-07-06 23:30:53 +0000
@@ -1,1 +1,1 @@
-/usr/lib/cli/uno/cli_cppuhelper.dll
+/usr/lib/cli/uno-1.0/cli_cppuhelper.dll

=== modified file 'libuno-cli-types1.1-cil.installcligac'
--- a/libuno-cli-types1.1-cil.installcligac	2008-07-06 21:03:44 +0000
+++ b/libuno-cli-types1.1-cil.installcligac	2008-07-06 23:30:53 +0000
@@ -1,1 +1,1 @@
-/usr/lib/cli/uno/cli_types.dll
+/usr/lib/cli/uno-1.1/cli_types.dll

=== modified file 'libuno-cli-ure1.0-cil.installcligac'
--- a/libuno-cli-ure1.0-cil.installcligac	2008-07-06 21:03:44 +0000
+++ b/libuno-cli-ure1.0-cil.installcligac	2008-07-06 23:30:53 +0000
@@ -1,1 +1,1 @@
-/usr/lib/cli/uno/cli_ure.dll
+/usr/lib/cli/uno-1.0/cli_ure.dll

=== modified file 'rules'
--- a/rules	2008-07-06 21:09:34 +0000
+++ b/rules	2008-07-06 23:30:53 +0000
@@ -2748,7 +2748,7 @@
 		libuno-cli-cppuhelper1.0-cil libuno-cli-ure1.0-cil; do \
 		rm -rf debian/$$i && mkdir -p -m755 debian/$$i/usr/lib/cli/uno; \
 		mv $(PKGDIR)-common/$(OODIR)/program/`echo $$i | sed -e "s/libuno-//" | sed -e "s/-cil$$//" | sed -e "s/-/_/" | perl -pi -e 's/\d.\d//'`.dll* \
-			debian/$$i/usr/lib/cli/uno; \
+			debian/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`; \
 	done
 endif
 


Reply to: