From 377a84bc09f7301f8559f401a095349a795abd01 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Wed, 16 Nov 2011 13:53:37 -0500
Subject: [PATCH] * #7491: merged control files, added dh_shlibdeps macro to
plugins/rules, added 12.04 (precise) to distributions
---
tools/build-system/launch-build-machine-2.sh | 1 -
.../debian/{control.natty => control} | 0
.../debian/control.lucid | 20 -------------
.../debian/control.maverick | 20 -------------
.../debian/control.oneiric | 20 -------------
.../debian/{control.oneiric => control} | 0
.../sflphone-common/debian/control.lucid | 28 -------------------
.../sflphone-common/debian/control.maverick | 28 -------------------
.../sflphone-common/debian/control.natty | 28 -------------------
.../debian/{control.lucid => control} | 0
.../sflphone-plugins/debian/control.maverick | 20 -------------
.../sflphone-plugins/debian/control.natty | 20 -------------
.../sflphone-plugins/debian/control.oneiric | 20 -------------
.../launchpad/sflphone-plugins/debian/rules | 2 +-
tools/build-system/make-telify-package.sh | 2 +-
tools/build-system/setenv.sh | 2 +-
16 files changed, 3 insertions(+), 208 deletions(-)
rename tools/build-system/launchpad/sflphone-client-gnome/debian/{control.natty => control} (100%)
delete mode 100644 tools/build-system/launchpad/sflphone-client-gnome/debian/control.lucid
delete mode 100644 tools/build-system/launchpad/sflphone-client-gnome/debian/control.maverick
delete mode 100644 tools/build-system/launchpad/sflphone-client-gnome/debian/control.oneiric
rename tools/build-system/launchpad/sflphone-common/debian/{control.oneiric => control} (100%)
delete mode 100644 tools/build-system/launchpad/sflphone-common/debian/control.lucid
delete mode 100644 tools/build-system/launchpad/sflphone-common/debian/control.maverick
delete mode 100644 tools/build-system/launchpad/sflphone-common/debian/control.natty
rename tools/build-system/launchpad/sflphone-plugins/debian/{control.lucid => control} (100%)
delete mode 100644 tools/build-system/launchpad/sflphone-plugins/debian/control.maverick
delete mode 100644 tools/build-system/launchpad/sflphone-plugins/debian/control.natty
delete mode 100644 tools/build-system/launchpad/sflphone-plugins/debian/control.oneiric
diff --git a/tools/build-system/launch-build-machine-2.sh b/tools/build-system/launch-build-machine-2.sh
index 85d0dd9e47..5644777442 100755
--- a/tools/build-system/launch-build-machine-2.sh
+++ b/tools/build-system/launch-build-machine-2.sh
@@ -228,7 +228,6 @@ END
LOCAL_VERSION="${SOFTWARE_VERSION}~ppa${VERSION_INDEX}~${LAUNCHPAD_DISTRIBUTION}"
- cp ${DEBIAN_DIR}/control.${LAUNCHPAD_DISTRIBUTION} ${DEBIAN_DIR}/control
cp ${DEBIAN_DIR}/changelog.generic ${DEBIAN_DIR}/changelog
sed -i "s/SYSTEM/${LAUNCHPAD_DISTRIBUTION}/g" ${DEBIAN_DIR}/changelog
diff --git a/tools/build-system/launchpad/sflphone-client-gnome/debian/control.natty b/tools/build-system/launchpad/sflphone-client-gnome/debian/control
similarity index 100%
rename from tools/build-system/launchpad/sflphone-client-gnome/debian/control.natty
rename to tools/build-system/launchpad/sflphone-client-gnome/debian/control
diff --git a/tools/build-system/launchpad/sflphone-client-gnome/debian/control.lucid b/tools/build-system/launchpad/sflphone-client-gnome/debian/control.lucid
deleted file mode 100644
index 5fe9cdbbe9..0000000000
--- a/tools/build-system/launchpad/sflphone-client-gnome/debian/control.lucid
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: sflphone-client-gnome
-Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper, libgcc1, autoconf, automake, libtool, libgtk2.0-dev, libdbus-glib-1-dev, libnotify-dev, check, liblog4c-dev, libgnomeui-dev, gnome-doc-utils, rarian-compat, libwebkit-dev
-Standards-Version: 3.7.3
-
-Package: sflphone-client-gnome
-Priority: optional
-Architecture: any
-Depends: sflphone-common (=${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: GNOME client for SFLphone
- Provide a GNOME client for SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/tools/build-system/launchpad/sflphone-client-gnome/debian/control.maverick b/tools/build-system/launchpad/sflphone-client-gnome/debian/control.maverick
deleted file mode 100644
index 5fe9cdbbe9..0000000000
--- a/tools/build-system/launchpad/sflphone-client-gnome/debian/control.maverick
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: sflphone-client-gnome
-Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper, libgcc1, autoconf, automake, libtool, libgtk2.0-dev, libdbus-glib-1-dev, libnotify-dev, check, liblog4c-dev, libgnomeui-dev, gnome-doc-utils, rarian-compat, libwebkit-dev
-Standards-Version: 3.7.3
-
-Package: sflphone-client-gnome
-Priority: optional
-Architecture: any
-Depends: sflphone-common (=${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: GNOME client for SFLphone
- Provide a GNOME client for SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/tools/build-system/launchpad/sflphone-client-gnome/debian/control.oneiric b/tools/build-system/launchpad/sflphone-client-gnome/debian/control.oneiric
deleted file mode 100644
index 5c80b0d5a7..0000000000
--- a/tools/build-system/launchpad/sflphone-client-gnome/debian/control.oneiric
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: sflphone-client-gnome
-Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper, libgcc1, autoconf, automake, libtool, libgtk2.0-dev, libdbus-glib-1-dev, libnotify-dev, libebook1.2-dev, check, liblog4c-dev, libgnomeui-dev, gnome-doc-utils, rarian-compat, libwebkitgtk-dev
-Standards-Version: 3.7.3
-
-Package: sflphone-client-gnome
-Priority: optional
-Architecture: any
-Depends: sflphone-common (=${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: GNOME client for SFLphone
- Provide a GNOME client for SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/tools/build-system/launchpad/sflphone-common/debian/control.oneiric b/tools/build-system/launchpad/sflphone-common/debian/control
similarity index 100%
rename from tools/build-system/launchpad/sflphone-common/debian/control.oneiric
rename to tools/build-system/launchpad/sflphone-common/debian/control
diff --git a/tools/build-system/launchpad/sflphone-common/debian/control.lucid b/tools/build-system/launchpad/sflphone-common/debian/control.lucid
deleted file mode 100644
index d10d910ae6..0000000000
--- a/tools/build-system/launchpad/sflphone-common/debian/control.lucid
+++ /dev/null
@@ -1,28 +0,0 @@
-Source: sflphone-common
-Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper (>= 7.0.50), libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev, libzrtpcpp-dev, libssl-dev, libpcre3-dev, libyaml-dev, libcelt-dev, libdbus-c++-dev
-Standards-Version: 3.7.3
-
-Package: sflphone-common
-Priority: optional
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone - Core
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
-
-Package: sflphone-common-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends:
- sflphone-common (= ${binary:Version}),
- ${misc:Depends}
-Description: debugging symbols for sflphone-common
diff --git a/tools/build-system/launchpad/sflphone-common/debian/control.maverick b/tools/build-system/launchpad/sflphone-common/debian/control.maverick
deleted file mode 100644
index d10d910ae6..0000000000
--- a/tools/build-system/launchpad/sflphone-common/debian/control.maverick
+++ /dev/null
@@ -1,28 +0,0 @@
-Source: sflphone-common
-Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper (>= 7.0.50), libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev, libzrtpcpp-dev, libssl-dev, libpcre3-dev, libyaml-dev, libcelt-dev, libdbus-c++-dev
-Standards-Version: 3.7.3
-
-Package: sflphone-common
-Priority: optional
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone - Core
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
-
-Package: sflphone-common-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends:
- sflphone-common (= ${binary:Version}),
- ${misc:Depends}
-Description: debugging symbols for sflphone-common
diff --git a/tools/build-system/launchpad/sflphone-common/debian/control.natty b/tools/build-system/launchpad/sflphone-common/debian/control.natty
deleted file mode 100644
index 076466fba7..0000000000
--- a/tools/build-system/launchpad/sflphone-common/debian/control.natty
+++ /dev/null
@@ -1,28 +0,0 @@
-Source: sflphone-common
-Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper (>= 7.0.50), libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev, libzrtpcpp-dev, libssl-dev, libpcre3-dev, libyaml-dev, libcelt-dev, libdbus-c++-dev
-Standards-Version: 3.7.3
-
-Package: sflphone-common
-Priority: optional
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone - Core
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
-
-Package: sflphone-common-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends:
- sflphone-common (= ${binary:Version}),
- ${misc:Depends}
-Description: debugging symbols for sflphone-common
diff --git a/tools/build-system/launchpad/sflphone-plugins/debian/control.lucid b/tools/build-system/launchpad/sflphone-plugins/debian/control
similarity index 100%
rename from tools/build-system/launchpad/sflphone-plugins/debian/control.lucid
rename to tools/build-system/launchpad/sflphone-plugins/debian/control
diff --git a/tools/build-system/launchpad/sflphone-plugins/debian/control.maverick b/tools/build-system/launchpad/sflphone-plugins/debian/control.maverick
deleted file mode 100644
index e3c5d089d1..0000000000
--- a/tools/build-system/launchpad/sflphone-plugins/debian/control.maverick
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: sflphone-plugins
-Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper, libgcc1, autoconf, automake, libtool, libgtk2.0-dev, libebook1.2-dev, libedataserver1.2-dev
-Standards-Version: 3.7.3
-
-Package: sflphone-plugins
-Priority: optional
-Architecture: any
-Depends: sflphone-client-gnome (=${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: Evolution addressbook plugin for SFLphone
- Integrate evolution addressbook functionality to SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/tools/build-system/launchpad/sflphone-plugins/debian/control.natty b/tools/build-system/launchpad/sflphone-plugins/debian/control.natty
deleted file mode 100644
index e3c5d089d1..0000000000
--- a/tools/build-system/launchpad/sflphone-plugins/debian/control.natty
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: sflphone-plugins
-Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper, libgcc1, autoconf, automake, libtool, libgtk2.0-dev, libebook1.2-dev, libedataserver1.2-dev
-Standards-Version: 3.7.3
-
-Package: sflphone-plugins
-Priority: optional
-Architecture: any
-Depends: sflphone-client-gnome (=${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: Evolution addressbook plugin for SFLphone
- Integrate evolution addressbook functionality to SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/tools/build-system/launchpad/sflphone-plugins/debian/control.oneiric b/tools/build-system/launchpad/sflphone-plugins/debian/control.oneiric
deleted file mode 100644
index e3c5d089d1..0000000000
--- a/tools/build-system/launchpad/sflphone-plugins/debian/control.oneiric
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: sflphone-plugins
-Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper, libgcc1, autoconf, automake, libtool, libgtk2.0-dev, libebook1.2-dev, libedataserver1.2-dev
-Standards-Version: 3.7.3
-
-Package: sflphone-plugins
-Priority: optional
-Architecture: any
-Depends: sflphone-client-gnome (=${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: Evolution addressbook plugin for SFLphone
- Integrate evolution addressbook functionality to SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/tools/build-system/launchpad/sflphone-plugins/debian/rules b/tools/build-system/launchpad/sflphone-plugins/debian/rules
index b3eb5eb357..d18a6e0a77 100755
--- a/tools/build-system/launchpad/sflphone-plugins/debian/rules
+++ b/tools/build-system/launchpad/sflphone-plugins/debian/rules
@@ -100,7 +100,7 @@ binary-common:
# dh_perl
dh_makeshlibs
dh_installdeb
-# dh_shlibdeps
+ dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
diff --git a/tools/build-system/make-telify-package.sh b/tools/build-system/make-telify-package.sh
index be3be86bd2..4f2300786e 100644
--- a/tools/build-system/make-telify-package.sh
+++ b/tools/build-system/make-telify-package.sh
@@ -28,7 +28,7 @@ for LAUNCHPAD_DISTRIBUTION in ${LAUNCHPAD_DISTRIBUTIONS[*]}
do
LOCAL_VERSION="${SOFTWARE_VERSION}~ppa${VERSION_INDEX}~${LAUNCHPAD_DISTRIBUTION}"
- cp ${DEBIAN_DIR}/control.${LAUNCHPAD_DISTRIBUTION} ${DEBIAN_DIR}/control
+ cp ${DEBIAN_DIR}/control ${DEBIAN_DIR}/control
cp ${DEBIAN_DIR}/changelog.generic ${DEBIAN_DIR}/changelog
sed -i "s/SYSTEM/${LAUNCHPAD_DISTRIBUTION}/g" ${DEBIAN_DIR}/changelog
diff --git a/tools/build-system/setenv.sh b/tools/build-system/setenv.sh
index 97d13f8cd1..2779bfe1f6 100644
--- a/tools/build-system/setenv.sh
+++ b/tools/build-system/setenv.sh
@@ -22,6 +22,6 @@ export REFERENCE_REPOSITORY="${ROOT_DIR}/sflphone-source-repository"
export WORKING_DIR="${ROOT_DIR}/sflphone-build-repository/tools/build-system"
export LAUNCHPAD_DIR="${WORKING_DIR}/launchpad"
-LAUNCHPAD_DISTRIBUTIONS=( "lucid" "maverick" "natty" "oneiric")
+LAUNCHPAD_DISTRIBUTIONS=( "lucid" "maverick" "natty" "oneiric" "precise")
export LAUNCHPAD_DISTRIBUTIONS
--
GitLab