CVS:oo-deb/debian changelog,1.338.2.25.2.12,1.338.2.25.2.13 rules,1.214.2.14.2.15,1.214.2.14.2.16

[Rene Engelhard <rene@gluck.debian.org>]

Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv25990

Modified Files:
      Tag: OPENOFFICE_ORG680
	changelog rules 
Log Message:
install libstc++.so.6 and libgcc_s.so.1 into $OOODIR/program manually as a temporary workaround for ooo-build shortcoming and to try to be installable in unstable

Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.338.2.25.2.12
retrieving revision 1.338.2.25.2.13
diff -u -d -r1.338.2.25.2.12 -r1.338.2.25.2.13
--- changelog	13 Mar 2005 19:29:18 -0000	1.338.2.25.2.12
+++ changelog	13 Mar 2005 20:34:54 -0000	1.338.2.25.2.13
@@ -10,8 +10,10 @@
   * build-depend on libneon24-dev instead of libneon23-dev [RE]
   * version libnss-dev builddep (>= 1.7.5-1) [RE]
   * compress manpages... [RE]
+  * install libstdc++.so.6 and libgcc_s.so.1 into $OODIR/program
+    in a try to be installable in unstable [RE]
 
- -- Rene Engelhard <rene@debian.org>  Sun, 13 Mar 2005 17:39:31 +0100
+ -- Rene Engelhard <rene@debian.org>  Sun, 13 Mar 2005 21:29:55 +0100
 
 openoffice.org2 (1.9.76-0pre) experimental; urgency=low
 

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.14.2.15
retrieving revision 1.214.2.14.2.16
diff -u -d -r1.214.2.14.2.15 -r1.214.2.14.2.16
--- rules	13 Mar 2005 19:25:17 -0000	1.214.2.14.2.15
+++ rules	13 Mar 2005 20:34:54 -0000	1.214.2.14.2.16
@@ -346,6 +346,12 @@
 		find $(PKGDIR)-$$i -type f -name "*.1" | xargs gzip -9; \
 	done
 
+	# ooo-build has --with-stdlibs at the end of configure, so
+	# specifiying --without-stdlibs doesn't help. supply them manually
+	# here, we want to be installable on unstable
+	cp /usr/lib/libstdc++.so.6 $(PKGDIR)-core/$(OODIR)/program
+	cp /lib/libgcc_s.so.1  $(PKGDIR)-core/$(OODIR)/program
+
 	touch $@