Prepare packagin for release

All changes in debian/ directory Lauri hasn't applied.

4 files changed, 24 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index c7be689..36cbc91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,20 @@
-scratchbox2 (1.99.0.30) unstable; urgency=low
-  * fill me up
- -- Lauri Aarnio <lauri.aarnio@iki.fi>  Tue, 09 Dec 2008 11:52:14 +0200
+scratchbox2 (2.0-1) unstable; urgency=low
+
+  * scratchbox 2.0 release!
+
+ -- Riku Voipio <riku.voipio@iki.fi>  Wed, 01 Apr 2009 00:17:49 +0300
+
+scratchbox2 (1.99.0.31-2) unstable; urgency=low
+
+  * split libsb2 to a separate package
+
+ -- Riku Voipio <riku.voipio@iki.fi>  Mon, 23 Feb 2009 15:22:26 +0200
+
+scratchbox2 (1.99.0.31-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Riku Voipio <riku.voipio@iki.fi>  Mon, 23 Feb 2009 14:39:35 +0200
 
 scratchbox2 (1.99.0.27-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8f0389b..f617190 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: scratchbox2
 Maintainer: Riku Voipio <riku.voipio@iki.fi>
 Section: utils
 Priority: extra
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Build-Depends: debhelper (>=5), automake1.10, autoconf, gcc-multilib [amd64], libc6-dev-i386 [amd64], g++-multilib [amd64]
 XS-Vcs-Git: git://anongit.freedesktop.org/git/sbox2
 XS-Vcs-Browser: http://gitweb.freedesktop.org/?p=sbox2.git
@@ -10,7 +10,7 @@ Homepage: http://www.freedesktop.org/wiki/Software/sbox2
 
 Package: scratchbox2
 Architecture: i386 amd64 powerpc ia64
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, libsb2 (= ${binary:Version})
 Recommends: qemu, fakeroot
 Suggests: sbrsh
 Description: Transparent cross compiling environment
diff --git a/debian/rules b/debian/rules
index 885ca2e..59e405a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,8 @@ install: build
 	# make lintian happy
 	rm -f debian/scratchbox2/usr/share/scratchbox2/host_usr
 	ln -sf ../.. debian/scratchbox2/usr/share/scratchbox2/host_usr
-	cp -P debian/scratchbox2/usr/lib/libsb2/* debian/libsb2/usr/lib/libsb2
+	mv debian/scratchbox2/usr/lib/libsb2/* debian/libsb2/usr/lib/libsb2
+	rm -rf debian/scratchbox2/usr/lib/
 
 binary-arch: install
 	dh_testdir -a
@@ -51,7 +52,7 @@ binary-arch: install
 	dh_fixperms -a
 	# FIXME, do in postinst
 	dh_installdeb -a
-	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:debian/scratchbox2/usr/lib/libsb2/ dh_shlibdeps -a
+	dh_shlibdeps -Llibsb2 -l/usr/lib/libsb2 -- --ignore-missing-info
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
diff --git a/debian/scratchbox2.postinst b/debian/scratchbox2.postinst
index a40977c..a62061d 100644
--- a/debian/scratchbox2.postinst
+++ b/debian/scratchbox2.postinst
@@ -1,5 +1,7 @@
 #!/bin/sh
 #
+#DEBHELPER#
+#
 # This scripts checks whether
 # /usr/share/scratchbox2/lua_scripts/pathmaps/maemo is
 # empty directory and if it is, it replaces it with