summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-30 18:27:46 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-30 18:27:46 (GMT)
commit4153e7f937acfa06b9fb63ebf6552d415fd97e9f (patch)
tree5c01f53b8925dbf928f5c3d38fa22ac2d7fce607 /Swift
parent1bbf5a4f431ce3aab4c851c71438f3d2e468a866 (diff)
parent4a90cf8fd5da66c2466bfcfe1e5152d45457b291 (diff)
downloadswift-4153e7f937acfa06b9fb63ebf6552d415fd97e9f.zip
swift-4153e7f937acfa06b9fb63ebf6552d415fd97e9f.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Only package .so in dev package. Support creating Swiften dylibs on Mac OS X. Fixed Swiften .so softlinks. Conflicts: Swiften/SConscript
Diffstat (limited to 'Swift')
-rw-r--r--Swift/Packaging/Debian/debian/libswiften-dev.install1
-rw-r--r--Swift/Packaging/Debian/debian/libswiften.install2
2 files changed, 1 insertions, 2 deletions
diff --git a/Swift/Packaging/Debian/debian/libswiften-dev.install b/Swift/Packaging/Debian/debian/libswiften-dev.install
index 84e0d21..545c6d9 100644
--- a/Swift/Packaging/Debian/debian/libswiften-dev.install
+++ b/Swift/Packaging/Debian/debian/libswiften-dev.install
@@ -1,4 +1,3 @@
usr/lib/libSwiften.so
-usr/lib/libSwiften.so.?.*
usr/include
usr/bin/swiften-config
diff --git a/Swift/Packaging/Debian/debian/libswiften.install b/Swift/Packaging/Debian/debian/libswiften.install
index 04f6608..2603436 100644
--- a/Swift/Packaging/Debian/debian/libswiften.install
+++ b/Swift/Packaging/Debian/debian/libswiften.install
@@ -1 +1 @@
-usr/lib/libSwiften.so.?
+usr/lib/libSwiften.so.*