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

./packages/openofficeorg/3.1/experimental r1343: xmlsec went static



------------------------------------------------------------
revno: 1343
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2008-12-08 23:27:35 +0100
message:
  xmlsec went static
removed:
  shlibs.override.xmlsec
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2008-12-08 22:04:16 +0000
+++ b/changelog	2008-12-08 22:27:35 +0000
@@ -6,6 +6,7 @@
   * ooo-build:
     - back on trunk (r14768)
   * debian/shlibs.override.icu: update for new icu
+  * debian/shlibs.override.xmlsec: remove, xmlsec went static
   * debian/*: various 3.0->3.1s
   * debian/rules:
     - bump minimal ICU version for sid to >= 4.0.0 to make sure

=== modified file 'rules'
--- a/rules	2008-12-08 22:07:31 +0000
+++ b/rules	2008-12-08 22:27:35 +0000
@@ -1683,11 +1683,14 @@
   endif
 endif
 
-	# 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
+# 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; \
@@ -3070,9 +3073,6 @@
 	dh_makeshlibs -puno-libs3 -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 -n -pure -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
-endif
 ifeq "$(USE_SYSTEM_ICU)" "n"
 	cat debian/shlibs.override.icu >> debian/shlibs.local
 endif

=== removed file 'shlibs.override.xmlsec'
--- a/shlibs.override.xmlsec	2005-11-21 18:26:50 +0000
+++ b/shlibs.override.xmlsec	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-libxmlsec1	1
-libxmlsec1-nss	1


Reply to: