------------------------------------------------------------
revno: 1160
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-07-07 03:24:27 +0200
message:
move public uno libs into uno-libs3
modified:
changelog
control
control.ure.in
rules
------------------------------------------------------------
revno: 1142.1.1
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: uno-libs
timestamp: Thu 2008-07-03 10:25:30 +0200
message:
move UNO libs to uno-libs3
modified:
control.ure.in
rules
------------------------------------------------------------
revno: 1142.1.2
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: uno-libs
timestamp: Thu 2008-07-03 11:26:32 +0200
message:
change uno-libs3-dbg version also to ures version
modified:
rules
------------------------------------------------------------
revno: 1142.1.3
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: uno-libs
timestamp: Thu 2008-07-03 16:18:14 +0200
message:
changelog entry
modified:
changelog
------------------------------------------------------------
revno: 1142.1.4
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: uno-libs
timestamp: Fri 2008-07-04 05:26:40 +0200
message:
fix symlink
modified:
rules
------------------------------------------------------------
revno: 1142.1.5
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: uno-libs
timestamp: Fri 2008-07-04 05:38:10 +0200
message:
typo
modified:
control.ure.in
------------------------------------------------------------
revno: 1142.1.6
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: uno-libs
timestamp: Fri 2008-07-04 10:49:36 +0200
message:
Replaces:
modified:
control.ure.in
------------------------------------------------------------
revno: 1142.1.7
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: uno-libs
timestamp: Fri 2008-07-04 11:21:58 +0200
message:
fix descriptions
modified:
control.ure.in
------------------------------------------------------------
revno: 1022.1.128
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-07-07 03:09:12 +0200
message:
update changelog
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2008-07-07 00:49:43 +0000
+++ b/changelog 2008-07-07 01:24:27 +0000
@@ -61,6 +61,8 @@
- s/cupsys/cups/
- remove xutils build-dep, nas was using xmkmf and it's long gone here
* debian/openoffice.org-presentation-minmizer*: update for new ID
+ * debian/rules, debian/control.ure.in: package the public UNO libs
+ into a specific uno-libs3 package
-- Rene Engelhard <[EMAIL PROTECTED]> Mon, 07 Jul 2008 00:51:39 +0200
@@ -72,7 +74,7 @@
* debian/rules, debian/control.mono.in, debian/*.installcligac: split
cli_*dll in various subpackages to make the packages CLI policy compliant.
Rename libuno-cil to cli-uno-bridge. Move the files in libuno*-cil to
- /usr/lib/cli/uno
+ /usr/lib/cli/uno-1.x
* debian/rules, debian/control.in:
- split emailmerge out into an own package. Don't make -writer depend on
python-uno anymore so that -writer (and openoffice.org) still can be
=== modified file 'control'
--- a/control 2008-07-07 00:49:43 +0000
+++ b/control 2008-07-07 01:24:27 +0000
@@ -510,10 +510,54 @@
This package contains the help of OpenOffice.org in
English_american.
+Package: uno-libs3
+Section: libs
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
+Depends: ${shlibs:Depends}
+Replaces: ure
+Description: UNO public shared libraries
+ The Uno Runtime Environment (URE) is the well-known UNO component model
+ of OpenOffice.org, packaged up as an individual product.
+ .
+ It offers you a flexible, low-overhead component model that is most ideal
+ for (but not limited to) combining in one application components written in
+ different computer languages, and developed by different parties. You can use
+ it to create any kind of application, in whatever application domain you can
+ imagine.
+ .
+ This package contains the public libraries:
+ - libuno_sal: System Abstraction Layer (C Interface)
+ - libuno_salhelpergcc3: additional C++ functionality for sal
+ - libuno_cppu: C++ UNO bridge (C Interface)
+ - libuno_cppuhelpergcc3: additionl C++ functionality for cppu
+ - libuno_purpenvhelpergcc3: "purpose environments" helper
+
+Package: uno-libs3-dbg
+Section: libs
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
+Depends: uno-libs3 (= ${ure:Version})
+Replaces: ure-dbg
+Description: UNO public shared libraries -- debug symbols
+ The Uno Runtime Environment (URE) is the well-known UNO component model
+ of OpenOffice.org, packaged up as an individual product.
+ .
+ It offers you a flexible, low-overhead component model that is most ideal
+ for (but not limited to) combining in one application components written in
+ different computer languages, and developed by different parties. You can use
+ it to create any kind of application, in whatever application domain you can
+ imagine.
+ .
+ This package contains the (detached) debug symbols for the public libraries:
+ - libuno_sal: System Abstraction Layer (C Interface)
+ - libuno_salhelpergcc3: additional C++ functionality for sal
+ - libuno_cppu: C++ UNO bridge (C Interface)
+ - libuno_cppuhelpergcc3: additionl C++ functionality for cppu
+ - libuno_purpenvhelpergcc3: "purpose environments" helper
+
Package: ure
Section: libs
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
-Depends: ${shlibs:Depends}
+Depends: uno-libs3 (= ${ure:Version}), ${shlibs:Depends}
Recommends: java2-runtime
Replaces: openoffice.org-java-common (<< 1:3.0.0~dev300m12)
Description: UNO runtime environment
@@ -530,7 +574,7 @@
Section: devel
Priority: extra
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
-Depends: ure (= ${ure:Version})
+Depends: ure (= ${ure:Version}), uno-libs3-dbg (= ${ure:Version})
Description: UNO runtime environment -- debug symbols
The Uno Runtime Environment (URE) is the well-known UNO component model
of OpenOffice.org, packaged up as an individual product.
=== modified file 'control.ure.in'
--- a/control.ure.in 2008-05-19 20:49:56 +0000
+++ b/control.ure.in 2008-07-04 09:21:58 +0000
@@ -1,7 +1,51 @@
+Package: uno-libs3
+Section: libs
+Architecture: %OOO_ARCHS%
+Depends: ${shlibs:Depends}
+Replaces: ure
+Description: UNO public shared libraries
+ The Uno Runtime Environment (URE) is the well-known UNO component model
+ of OpenOffice.org, packaged up as an individual product.
+ .
+ It offers you a flexible, low-overhead component model that is most ideal
+ for (but not limited to) combining in one application components written in
+ different computer languages, and developed by different parties. You can use
+ it to create any kind of application, in whatever application domain you can
+ imagine.
+ .
+ This package contains the public libraries:
+ - libuno_sal: System Abstraction Layer (C Interface)
+ - libuno_salhelpergcc3: additional C++ functionality for sal
+ - libuno_cppu: C++ UNO bridge (C Interface)
+ - libuno_cppuhelpergcc3: additionl C++ functionality for cppu
+ - libuno_purpenvhelpergcc3: "purpose environments" helper
+
+Package: uno-libs3-dbg
+Section: libs
+Architecture: %OOO_ARCHS%
+Depends: uno-libs3 (= ${ure:Version})
+Replaces: ure-dbg
+Description: UNO public shared libraries -- debug symbols
+ The Uno Runtime Environment (URE) is the well-known UNO component model
+ of OpenOffice.org, packaged up as an individual product.
+ .
+ It offers you a flexible, low-overhead component model that is most ideal
+ for (but not limited to) combining in one application components written in
+ different computer languages, and developed by different parties. You can use
+ it to create any kind of application, in whatever application domain you can
+ imagine.
+ .
+ This package contains the (detached) debug symbols for the public libraries:
+ - libuno_sal: System Abstraction Layer (C Interface)
+ - libuno_salhelpergcc3: additional C++ functionality for sal
+ - libuno_cppu: C++ UNO bridge (C Interface)
+ - libuno_cppuhelpergcc3: additionl C++ functionality for cppu
+ - libuno_purpenvhelpergcc3: "purpose environments" helper
+
Package: ure
Section: libs
Architecture: %OOO_ARCHS%
-Depends: ${shlibs:Depends}
+Depends: uno-libs3 (= ${ure:Version}), ${shlibs:Depends}
Recommends: java2-runtime
Replaces: openoffice.org-java-common (<< 1:3.0.0~dev300m12)
Description: UNO runtime environment
@@ -18,7 +62,7 @@
Section: devel
Priority: extra
Architecture: %OOO_ARCHS%
-Depends: ure (= ${ure:Version})
+Depends: ure (= ${ure:Version}), uno-libs3-dbg (= ${ure:Version})
Description: UNO runtime environment -- debug symbols
The Uno Runtime Environment (URE) is the well-known UNO component model
of OpenOffice.org, packaged up as an individual product.
=== modified file 'rules'
--- a/rules 2008-07-07 00:49:43 +0000
+++ b/rules 2008-07-07 01:24:27 +0000
@@ -1904,6 +1904,12 @@
for i in
$(CURDIR)/debian/ure/usr/share/java/$(OODIRNAME)/*.jar; do \
ln -sf `echo $$i | sed -e 's,$(CURDIR)/debian/ure,,'`
`basename $$i`; \
done
+ # and the public libs to uno-libs3
+ mkdir -p debian/uno-libs3/$(OOUREDIR)/lib
+ for i in debian/ure/$(OOUREDIR)/lib/libuno_*so.3; do \
+ mv $$i debian/uno-libs3/$(OOUREDIR)/lib; \
+ ln -sf /$(OOUREDIR)/lib/`basename $$i`
debian/uno-libs3/usr/lib/`basename $$i`; \
+ done
# add MySQL, MaxDB and ssssssostgreSQL JDBC drivers to OOos CLASSPATH
sed -i -e 's|\(UNO_JAVA_JFW_CLASSPATH_URLS=.*\)|\1
file:///usr/share/java/mysql.jar|' \
@@ -2922,8 +2928,9 @@
dh_link -s
dh_fixperms -s
ifeq "$(BUILD_DBG_PACKAGE)" "y"
- dh_strip -s -Nure --dbg-package=openoffice.org$(VER)-dbg
+ dh_strip -s -Nure -Nuno-libs3 --dbg-package=openoffice.org$(VER)-dbg
dh_strip -pure --dbg-package=ure-dbg
+ dh_strip -puno-libs3-dbg --dbg-package=uno-libs3-dbg
# dh_strip --dbg-package= is not idempotent, force copying of the
binaries
# again...
rm -f $(STAMP_DIR)/install-arch
@@ -2938,7 +2945,7 @@
dh_installcligac -s
endif
dh_compress -s -X.py -X.mk -X.sxd
- dh_makeshlibs -pure -n -V"ure (>= $(shell grep -A 1 "PRODUCTNAME URE"
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print
$$2 }')+OOo3.0.0~)"
+ dh_makeshlibs -puno-libs3 -n -V"ure (>= $(shell grep -A 1 "PRODUCTNAME
URE" $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{
print $$2 }')+OOo3.0.0~)"
dh_installdeb -s
ifneq "$(USE_SYSTEM_XMLSEC)" "y"
cat debian/shlibs.override.xmlsec >> debian/shlibs.local
@@ -3001,7 +3008,7 @@
# This switch to dh_shlibdeps reduces the 'libXXX not found' warnings but
# causes ldd crashes sometimes when used with fakeroot:
# -l $(PKGDIR)-core/$(OPENOFFICEDIR)/program
- dh_gencontrol -s $(DEBHELPER_OPTIONS) -Nure -Nure-dbg \
+ dh_gencontrol -s $(DEBHELPER_OPTIONS) -Nure -Nure-dbg -Nuno-libs3
-Nuno-libs3-dbg \
-Nopenoffice.org$(VER)-report-builder \
-Nopenoffice.org$(VER)-presentation-minimizer \
-Nopenoffice.org$(VER)-presenter-screen \
@@ -3049,7 +3056,7 @@
endif
dh_gencontrol -popenoffice.org$(VER)-sdbc-postgresql -- \
-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep
^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk |
cut -d"=" -f2 | xargs | sed -e s/\ /\./g)+OOo`echo $(BINARY_VERSION) | cut -d:
-f2`
- dh_gencontrol -pure -pure-dbg -- \
+ dh_gencontrol -pure -pure-dbg -puno-libs3 -puno-libs3-dbg -- \
-V"ure:Version=$(shell grep -A 1 "PRODUCTNAME URE"
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print
$$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`" \
-v$(shell grep -A 1 "PRODUCTNAME URE"
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print
$$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
dh_md5sums -s
