diff --git a/debian/control.hardy b/debian/control.hardy
index 62a95771912ac053345e9e54bb6442e9ac14e3e0..90f804ee565f8c2defb1ccb5d00dc705cbcf89f0 100644
--- a/debian/control.hardy
+++ b/debian/control.hardy
@@ -2,7 +2,7 @@ Source: sflphone
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome
Priority: optional
-Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev
+Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libebook1.2-dev, uuid-dev
Standards-Version: 3.7.3
Package: sflphone
diff --git a/debian/control.intrepid b/debian/control.intrepid
index 737fc36b64c051d0cbee4f8b4dff548f014d2234..01028dbf98d8f5e624de3c5c09ff09e6d63c8710 100644
--- a/debian/control.intrepid
+++ b/debian/control.intrepid
@@ -2,7 +2,7 @@ Source: sflphone
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome
Priority: optional
-Build-Depends: debhelper (>= 5), autoconf, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev, uuid-dev
+Build-Depends: debhelper (>= 5), autoconf, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libebook1.2-dev
Standards-Version: 3.8.0
Package: sflphone
diff --git a/debian/control.jaunty b/debian/control.jaunty
index b88584932302734a1bd1de6494b94d9040584f73..acef6123156e0d76a1b8ed828697ce7510ba5ef4 100644
--- a/debian/control.jaunty
+++ b/debian/control.jaunty
@@ -2,7 +2,7 @@ Source: sflphone
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome
Priority: optional
-Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev, uuid-dev
+Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libebook1.2-dev
Standards-Version: 3.7.3
Package: sflphone
diff --git a/debian/copyright b/debian/copyright
index b2b1db618faada9f059816c127e00d081dbf17bf..fbde2314bef1fb7ee643083e6d27c397213c5ead 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
This package was debianized by Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> on
-Wed, 26 Nov 2008 09:47:53 -0500.
+Fri, 3 Apr 2009 09:47:53 -0500.
It was downloaded from the git repository of SFLphone: git://sflphone.org/git/sflphone.git
diff --git a/debian/preinst b/debian/preinst
new file mode 100644
index 0000000000000000000000000000000000000000..62e6bac01fd509baaafd1febc19e6d0eff567a97
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,18 @@
+#!/bin/sh
+# postrm script for sflphone
+#
+# see: dh_installdeb(1)
+
+set -e
+
+package=sflphone
+
+case "$1" in
+ install|upgrade)
+ # Clear the old dbus-c++ and iax2 if presents
+ rm -rf /usr/lib/libdbus-c++*
+ rm -rf /usr/lib/libiax2*
+ ;;
+esac
+
+exit 0
diff --git a/debian/rules b/debian/rules
index c67463555b7fb6a22722ba263014dc2e120a600a..b63ec5df4e39528f47620e6712d240808f8c2a4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,10 +20,7 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- cd libs/dbus-c++; ./autogen.sh; ./configure
- cd libs/libiax2; ./gen.sh; ./configure
- cd libs/pjproject-1.0.1; ./configure
- ./autogen.sh --prefix=/usr --with-debug
+ ./autogen.sh --prefix=/usr
cd sflphone-gtk; ./autogen.sh --prefix=/usr
touch configure-stamp
@@ -34,13 +31,10 @@ build: build-arch build-indep
build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
- # Add here commands to compile the arch part of the package.
+ # Add here commands to compile the arch part of the package.
$(MAKE)
cd sflphone-gtk; make
- cd libs/pjproject-1.0.1; $(MAKE) dep; $(MAKE)
touch $@
- cd libs/dbus-c++; $(MAKE)
- cd libs/libiax2; $(MAKE)
build-indep: build-indep-stamp
build-indep-stamp: configure-stamp
@@ -80,9 +74,6 @@ install-arch:
# debian/tmp.
$(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
cd sflphone-gtk; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
- cd libs/pjproject-1.0.1; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
- cd libs/dbus-c++; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
- cd libs/libiax2; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
rm -rf $(CURDIR)/debian/$(package)/usr/include
dh_install -s
# Must not depend on anything. This is to be called by
diff --git a/debian/update.sh b/debian/update.sh
deleted file mode 100755
index 33c00891cb2f6afdad0a63c5446c97fd5c5b198b..0000000000000000000000000000000000000000
--- a/debian/update.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-# @author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
-# Update the existing debian package wit the updated installation script
-# Use it if you modify the installation scripts sflphone.preinst, sflphone.postrm or sflphone.prerm
-
-# you need the text base files: package and arch. They have just one line with respectively the name of the package and the architecture
-
-base_file="package arch"
-
-for i in $base_file
-do
- if [ ! -f $i ]
- then
- echo " Could not find the file $i "
- exit 0
- fi
-done
-
-package=`(cat package)`
-arch=`(cat arch)`
-
-if [ ! -d $package ]
-then
- exit 0
-fi
-
-# Update installation scripts
-cp sflphone.preinst $package/DEBIAN/preinst
-cp sflphone.postrm $package/DEBIAN/postrm
-cp sflphone.prerm $package/DEBIAN/prerm
-
-# Rebuild the debian package
-dpkg --build $package ${package}_${arch}.deb 2> /dev/null
-
-echo "Done!"
diff --git a/debian/upload.sh b/debian/upload.sh
deleted file mode 100755
index 197740fe8e4d73863b6215c1cfac9053b3e3f63d..0000000000000000000000000000000000000000
--- a/debian/upload.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-!#/bin/sh
-
-scp $1 root@gpl.savoirfairelinux.net:/var/www/vhosts/sflphone.org/htdocs/debian/dists/unstable/universe/binary-i386