From c88c345b8f4a1d980f4fc0884c332a41a09ff162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 30 Apr 2011 19:40:12 +0200
Subject: Fixed Swiften .so softlinks.


diff --git a/Swift/Packaging/Debian/debian/libswiften-dev.install b/Swift/Packaging/Debian/debian/libswiften-dev.install
index 84e0d21..6b24d69 100644
--- a/Swift/Packaging/Debian/debian/libswiften-dev.install
+++ b/Swift/Packaging/Debian/debian/libswiften-dev.install
@@ -1,4 +1,4 @@
 usr/lib/libSwiften.so
-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..bac017d 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.*.*
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 9b53e32..645f1ce 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -22,15 +22,19 @@ if env["SCONS_STAGE"] == "flags" :
 	if env["PLATFORM"] == "win32" :
 		env["SWIFTEN_LIBRARY"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
 		env["SWIFTEN_LIBRARY_NAME"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
+		env["SWIFTEN_LIBRARY_FILE"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
 	elif env["PLATFORM"] == "darwin" :
 		env["SWIFTEN_LIBRARY"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
 		env["SWIFTEN_LIBRARY_NAME"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
+		env["SWIFTEN_LIBRARY_FILE"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
 	else :
 		env["SWIFTEN_LIBRARY"] = "Swiften"
 		env["SWIFTEN_LIBRARY_NAME"] = "Swiften"
+		env["SWIFTEN_LIBRARY_FILE"] = "Swiften"
 		if ARGUMENTS.get("swiften_dll", False) :
 			env["SWIFTEN_LIBRARY_NAME"] = env.subst("libSwiften.so.$SWIFTEN_VERSION_MAJOR")
-			env["SWIFTEN_LIBRARY_ALIASES"] = ["libSwiften.so", env.subst("libSwiften.so.${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}")]
+			env["SWIFTEN_LIBRARY_FILE"] = env.subst("libSwiften.so.${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}")
+			env["SWIFTEN_LIBRARY_ALIASES"] = ["libSwiften.so", env.subst("libSwiften.so.${SWIFTEN_VERSION_MAJOR}")]
 
 	swiften_env = env.Clone()
 	swiften_env["LIBPATH"] = [Dir(".")]
@@ -203,7 +207,7 @@ if env["SCONS_STAGE"] == "build" :
 	if ARGUMENTS.get("swiften_dll", False) and myenv["PLATFORM"] == "posix" :
 		myenv.Append(LINKFLAGS = ["-Wl,-soname,$SWIFTEN_LIBRARY_NAME"])
 		myenv["SHLIBSUFFIX"] = ""
-	swiften_lib = myenv.SwiftenLibrary(swiften_env["SWIFTEN_LIBRARY_NAME"], sources + swiften_env["SWIFTEN_OBJECTS"])
+	swiften_lib = myenv.SwiftenLibrary(swiften_env["SWIFTEN_LIBRARY_FILE"], sources + swiften_env["SWIFTEN_OBJECTS"])
 	def symlink(env, target, source) :
 		if os.path.exists(str(target[0])) :
 			os.unlink(str(target[0]))
-- 
cgit v0.10.2-6-g49f6


From fc547839ba1f39f65d5d4b005f10c826b8280f77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 30 Apr 2011 20:00:02 +0200
Subject: Support creating Swiften dylibs on Mac OS X.


diff --git a/Swiften/SConscript b/Swiften/SConscript
index 645f1ce..9de71fb 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -18,21 +18,16 @@ if env["SCONS_STAGE"] == "flags" :
 		env["SWIFTEN_VERSION_MAJOR"] = 0
 		env["SWIFTEN_VERSION_MINOR"] = 0
 	env["SWIFTEN_VERSION_PATCH"] = 0
+	env["SWIFTEN_LIBRARY"] = "Swiften"
+	env["SWIFTEN_LIBRARY_FILE"] = "Swiften"
 	env["SWIFTEN_LIBRARY_ALIASES"] = []
-	if env["PLATFORM"] == "win32" :
-		env["SWIFTEN_LIBRARY"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
-		env["SWIFTEN_LIBRARY_NAME"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
-		env["SWIFTEN_LIBRARY_FILE"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
-	elif env["PLATFORM"] == "darwin" :
-		env["SWIFTEN_LIBRARY"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
-		env["SWIFTEN_LIBRARY_NAME"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
-		env["SWIFTEN_LIBRARY_FILE"] = env.subst("Swiften$SWIFTEN_VERSION_MAJOR")
-	else :
-		env["SWIFTEN_LIBRARY"] = "Swiften"
-		env["SWIFTEN_LIBRARY_NAME"] = "Swiften"
-		env["SWIFTEN_LIBRARY_FILE"] = "Swiften"
-		if ARGUMENTS.get("swiften_dll", False) :
-			env["SWIFTEN_LIBRARY_NAME"] = env.subst("libSwiften.so.$SWIFTEN_VERSION_MAJOR")
+	if ARGUMENTS.get("swiften_dll", False) :
+		if env["PLATFORM"] == "win32" :
+			pass
+		elif env["PLATFORM"] == "darwin" :
+			env["SWIFTEN_LIBRARY_FILE"] = env.subst("Swiften.${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}")
+			env["SWIFTEN_LIBRARY_ALIASES"] = ["libSwiften.dylib", env.subst("libSwiften.${SWIFTEN_VERSION_MAJOR}.dylib")]
+		else :
 			env["SWIFTEN_LIBRARY_FILE"] = env.subst("libSwiften.so.${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}")
 			env["SWIFTEN_LIBRARY_ALIASES"] = ["libSwiften.so", env.subst("libSwiften.so.${SWIFTEN_VERSION_MAJOR}")]
 
@@ -204,9 +199,12 @@ if env["SCONS_STAGE"] == "build" :
 		])
 
 	myenv = swiften_env.Clone()
-	if ARGUMENTS.get("swiften_dll", False) and myenv["PLATFORM"] == "posix" :
-		myenv.Append(LINKFLAGS = ["-Wl,-soname,$SWIFTEN_LIBRARY_NAME"])
-		myenv["SHLIBSUFFIX"] = ""
+	if ARGUMENTS.get("swiften_dll", False) :
+		if myenv["PLATFORM"] == "posix" :
+			myenv.Append(LINKFLAGS = ["-Wl,-soname,libSwiften.so.$SWIFTEN_VERSION_MAJOR"])
+			myenv["SHLIBSUFFIX"] = ""
+		elif myenv["PLATFORM"] == "darwin" :
+			myenv.Append(LINKFLAGS = ["-Wl,-install_name,libSwiften.so.$SWIFTEN_VERSION_MAJOR", "-Wl,-compatibility_version,${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}", "-Wl,-current_version,${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}"])
 	swiften_lib = myenv.SwiftenLibrary(swiften_env["SWIFTEN_LIBRARY_FILE"], sources + swiften_env["SWIFTEN_OBJECTS"])
 	def symlink(env, target, source) :
 		if os.path.exists(str(target[0])) :
-- 
cgit v0.10.2-6-g49f6


From 4a90cf8fd5da66c2466bfcfe1e5152d45457b291 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 30 Apr 2011 20:14:46 +0200
Subject: Only package .so in dev package.


diff --git a/Swift/Packaging/Debian/debian/libswiften-dev.install b/Swift/Packaging/Debian/debian/libswiften-dev.install
index 6b24d69..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 bac017d..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.*
-- 
cgit v0.10.2-6-g49f6