diff --git a/configure.ac b/configure.ac
index 1d084fe235a7965de7236aa0da96a4924f13604e..2f5f661b9a575bd18cbaa21eb2b37c57f281d6dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,8 +51,7 @@ AC_CONFIG_FILES([po/Makefile \
AC_CONFIG_FILES([doc/Makefile \
doc/doxygen/Makefile])
-AC_CONFIG_FILES([platform/debian/changelog \
- platform/rpm/sflphone.spec \
+AC_CONFIG_FILES([platform/rpm/sflphone.spec \
platform/fedora/sflphone.spec \
platform/fedora/sflphone-fc6.spec])
diff --git a/platform/debian/Release b/debian/Release
similarity index 100%
rename from platform/debian/Release
rename to debian/Release
diff --git a/platform/debian/TODO b/debian/TODO
similarity index 100%
rename from platform/debian/TODO
rename to debian/TODO
diff --git a/platform/debian/arch b/debian/arch
similarity index 100%
rename from platform/debian/arch
rename to debian/arch
diff --git a/platform/debian/autopackage.sh b/debian/autopackage.sh
similarity index 100%
rename from platform/debian/autopackage.sh
rename to debian/autopackage.sh
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000000000000000000000000000000000000..cb680da4d4d5612b76e1555f33474e95784690a2
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,37 @@
+sflphone (0.9) unstable; urgency=low
+
+ * Clean dependencies ( removal of libboost )
+ * Several GTK improvement and updates
+ * account window
+ * configuration window
+ * Migrate from GtkCheckMenuItem to GtkImageMenuItem
+ * ALSA standard I/O transfers: MMAP instead of R/W
+ * Fix speex audio quality
+ * IAX2 protocol
+ * Fix hold/unhold situation
+ * Add on hold music
+ * SIP protocol
+ * Ringtone on incoming call
+ * Fix transfer situation
+ * Add desktop notification ( libnotify )
+ * Improve the system tray icon behaviour
+ * Improve registration error handling
+ * Register/unregister from the account window takes effect without starting
+ back SFLphone
+ * Compilation warnings removal
+ * Call history
+ * Add an account configuration wizard
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 30 Apr 2008 16:58:25 -0500
+
+sflphone (0.8.2) unstable; urgency=low
+
+ * Internationalization of the GTK GUI
+ * English / French
+ * STUN support
+ * Slight modifications of the graphical interface ( tooltips, dialpad, ...)
+
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 21 Mar 2008 11:37:53 -0500
+
+
diff --git a/platform/debian/changelog.Debian b/debian/changelog.Debian
similarity index 100%
rename from platform/debian/changelog.Debian
rename to debian/changelog.Debian
diff --git a/platform/debian/changelog.Debian.gz b/debian/changelog.Debian.gz
similarity index 100%
rename from platform/debian/changelog.Debian.gz
rename to debian/changelog.Debian.gz
diff --git a/platform/debian/changelog.in b/debian/changelog.in
similarity index 100%
rename from platform/debian/changelog.in
rename to debian/changelog.in
diff --git a/platform/debian/compat b/debian/compat
similarity index 100%
rename from platform/debian/compat
rename to debian/compat
diff --git a/platform/debian/control b/debian/control
similarity index 91%
rename from platform/debian/control
rename to debian/control
index 8dfddbad15ce1ccfefd989f67416d6ba37f5c8cb..24b6821c15f5656563d8231c6d897b258f72c8d3 100644
--- a/platform/debian/control
+++ b/debian/control
@@ -1,12 +1,16 @@
-Package: sflphone
-Version: 0.8.2-3
+Source: sflphone
+Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome
Priority: optional
+Standards-Version: 0.8.2-3
+
+Package: sflphone
Architecture: i386
+Section: gnome
+Priority: optional
Essential: no
Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , gnome-common , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) , libosip2-3, libexosip2-5, libcommoncpp2-1.5.3-0 , libccrtp1-1.5-1 , libiax0 , libgtkglext1
Homepage: http://www.sflphone.org
-Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Description: SFLphone - Answer the call
SFLphone is meant to be a robust enterprise-class desktop phone. It is design with a hundred-calls-a-day receptionist in mind. It can work for you, too.
.
diff --git a/platform/debian/copyright b/debian/copyright
similarity index 100%
rename from platform/debian/copyright
rename to debian/copyright
diff --git a/platform/debian/dirs b/debian/dirs
similarity index 100%
rename from platform/debian/dirs
rename to debian/dirs
diff --git a/platform/debian/docs b/debian/docs
similarity index 100%
rename from platform/debian/docs
rename to debian/docs
diff --git a/platform/debian/package b/debian/package
similarity index 100%
rename from platform/debian/package
rename to debian/package
diff --git a/platform/debian/rules b/debian/rules
similarity index 94%
rename from platform/debian/rules
rename to debian/rules
index 1db45d437cad274c9aa11af91f68afcc29a02cda..efde01dd03e95702fef9e90f0c6e0c0cfd5ed9bf 100755
--- a/platform/debian/rules
+++ b/debian/rules
@@ -16,6 +16,8 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
+package=sflphone
+
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -33,8 +35,11 @@ endif
config.status: configure
dh_testdir
# Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" CXX="$(CXX)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
+ autoreconf --install
+ CFLAGS="$(CFLAGS)" CXX="$(CXX)" ./configure --prefix=/usr --with-debug
+ cd sflphone-gtk
+ gnome-autogen.sh --prefix=/usr
+
#Architecture
build: build-arch build-indep
diff --git a/platform/debian/sflphone.postrm b/debian/sflphone.postrm
similarity index 100%
rename from platform/debian/sflphone.postrm
rename to debian/sflphone.postrm
diff --git a/platform/debian/sflphone.preinst b/debian/sflphone.preinst
similarity index 100%
rename from platform/debian/sflphone.preinst
rename to debian/sflphone.preinst
diff --git a/platform/debian/sflphone.prerm b/debian/sflphone.prerm
similarity index 100%
rename from platform/debian/sflphone.prerm
rename to debian/sflphone.prerm
diff --git a/platform/debian/sflphoned-doc.docs b/debian/sflphoned-doc.docs
similarity index 100%
rename from platform/debian/sflphoned-doc.docs
rename to debian/sflphoned-doc.docs
diff --git a/platform/debian/sflphoned-doc.install b/debian/sflphoned-doc.install
similarity index 100%
rename from platform/debian/sflphoned-doc.install
rename to debian/sflphoned-doc.install
diff --git a/platform/debian/update.sh b/debian/update.sh
similarity index 100%
rename from platform/debian/update.sh
rename to debian/update.sh
diff --git a/platform/debian/upload.sh b/debian/upload.sh
similarity index 100%
rename from platform/debian/upload.sh
rename to debian/upload.sh
diff --git a/platform/debian/files b/platform/debian/files
deleted file mode 100644
index 1680c5532bf096dde001cd54ec088e176d5292d0..0000000000000000000000000000000000000000
--- a/platform/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-sflphoned_0.8-2_i386.deb