From 7c16c3b37f703032a0d8e4693a9dea12bb0b8752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Quentin?=
<jquentin@jquentin-laptop-kub2.(none)>
Date: Wed, 6 May 2009 17:57:36 -0400
Subject: [PATCH] [#1412] make debian package building work
---
sflphone-client-kde/AUTHORS | 3 +++
sflphone-client-kde/CMakeLists.txt | 6 +++---
sflphone-client-kde/ChangeLog | 0
sflphone-client-kde/NEWS | 0
sflphone-client-kde/debian/changelog | 2 +-
sflphone-client-kde/debian/control.intrepid | 3 +--
sflphone-client-kde/debian/control.jaunty | 3 +--
sflphone-client-kde/debian/postrm | 1 -
sflphone-client-kde/debian/rules | 15 +++++++--------
9 files changed, 16 insertions(+), 17 deletions(-)
create mode 100644 sflphone-client-kde/AUTHORS
create mode 100644 sflphone-client-kde/ChangeLog
create mode 100644 sflphone-client-kde/NEWS
delete mode 100644 sflphone-client-kde/debian/postrm
diff --git a/sflphone-client-kde/AUTHORS b/sflphone-client-kde/AUTHORS
new file mode 100644
index 0000000000..2ced1d4b48
--- /dev/null
+++ b/sflphone-client-kde/AUTHORS
@@ -0,0 +1,3 @@
+Current authors:
+
+Jérémy Quentin <jeremy dot quentin at savoirfairelinux dot com>
diff --git a/sflphone-client-kde/CMakeLists.txt b/sflphone-client-kde/CMakeLists.txt
index 419ba3d1b2..e882ea808b 100644
--- a/sflphone-client-kde/CMakeLists.txt
+++ b/sflphone-client-kde/CMakeLists.txt
@@ -75,7 +75,7 @@ SET_SOURCE_FILES_PROPERTIES(
${configurationmanager_xml}
PROPERTIES
CLASSNAME ConfigurationManagerInterface
- INCLUDE "../metatypes.h")
+ INCLUDE "metatypes.h")
QT4_ADD_DBUS_INTERFACE(
sflphone_client_kde_SRCS
@@ -90,7 +90,7 @@ SET_SOURCE_FILES_PROPERTIES(
${callmanager_xml}
PROPERTIES
CLASSNAME CallManagerInterface
- INCLUDE "../metatypes.h")
+ INCLUDE "metatypes.h")
QT4_ADD_DBUS_INTERFACE(
sflphone_client_kde_SRCS
@@ -105,7 +105,7 @@ SET_SOURCE_FILES_PROPERTIES(
${instance_xml}
PROPERTIES
CLASSNAME InstanceInterface
- INCLUDE "../metatypes.h")
+ INCLUDE "metatypes.h")
QT4_ADD_DBUS_INTERFACE(
sflphone_client_kde_SRCS
diff --git a/sflphone-client-kde/ChangeLog b/sflphone-client-kde/ChangeLog
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sflphone-client-kde/NEWS b/sflphone-client-kde/NEWS
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sflphone-client-kde/debian/changelog b/sflphone-client-kde/debian/changelog
index 0f1819ef17..c1edbb33a8 100644
--- a/sflphone-client-kde/debian/changelog
+++ b/sflphone-client-kde/debian/changelog
@@ -1,4 +1,4 @@
-sflphone-client-kde (0.9.5-0ubuntu1~1.gbpf07060) SYSTEM; urgency=low
+sflphone-client-kde (0.9.6-0ubuntu1~1.gbpf07060) SYSTEM; urgency=low
** SNAPSHOT build @f07060721d61850d67b89f24f0415d7237281886 **
diff --git a/sflphone-client-kde/debian/control.intrepid b/sflphone-client-kde/debian/control.intrepid
index 6ec3eedfde..d844e823f3 100644
--- a/sflphone-client-kde/debian/control.intrepid
+++ b/sflphone-client-kde/debian/control.intrepid
@@ -2,14 +2,13 @@ Source: sflphone-client-kde
Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
Section: kde
Priority: optional
-Build-Depends: cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2)
+Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2)
Standards-Version: 3.7.3
Package: sflphone-client-kde
Priority: optional
Architecture: any
Depends: sflphone-common (>=0.9.5), libcommoncpp2-1.6-0, kdepimlibs5 (>=4.1.4), libqt4-dbus (>=4.4.3), libqt4-svg (>=4.4.3), libqtgui4 (>=4.4.3)
-
Replaces: sflphone
Conflicts: sflphone
Homepage: http://www.sflphone.org
diff --git a/sflphone-client-kde/debian/control.jaunty b/sflphone-client-kde/debian/control.jaunty
index 6ec3eedfde..d844e823f3 100644
--- a/sflphone-client-kde/debian/control.jaunty
+++ b/sflphone-client-kde/debian/control.jaunty
@@ -2,14 +2,13 @@ Source: sflphone-client-kde
Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
Section: kde
Priority: optional
-Build-Depends: cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2)
+Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2)
Standards-Version: 3.7.3
Package: sflphone-client-kde
Priority: optional
Architecture: any
Depends: sflphone-common (>=0.9.5), libcommoncpp2-1.6-0, kdepimlibs5 (>=4.1.4), libqt4-dbus (>=4.4.3), libqt4-svg (>=4.4.3), libqtgui4 (>=4.4.3)
-
Replaces: sflphone
Conflicts: sflphone
Homepage: http://www.sflphone.org
diff --git a/sflphone-client-kde/debian/postrm b/sflphone-client-kde/debian/postrm
deleted file mode 100644
index 8b13789179..0000000000
--- a/sflphone-client-kde/debian/postrm
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/sflphone-client-kde/debian/rules b/sflphone-client-kde/debian/rules
index 203f2c063e..d2384782b6 100755
--- a/sflphone-client-kde/debian/rules
+++ b/sflphone-client-kde/debian/rules
@@ -14,15 +14,13 @@ package=sflphone-client-kde
CXX = g++-4.0
# CFLAGS = -Wall -g
-DEB_INSTALL_MANPAGES_sflphone_client_kde = sflphone.1 sflphone-client-kde.1
+# DEB_INSTALL_PAGES_sflphone_client_kde = sflphone.1 sflphone-client-kde.1
configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- mkdir build
- cd build
- cmake ..
+ cmake . -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/$(package)/usr
touch configure-stamp
@@ -33,7 +31,7 @@ build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
# Add here commands to compile the arch part of the package.
- $(MAKE)
+ $(MAKE)
touch $@
build-indep: build-indep-stamp
@@ -48,7 +46,7 @@ clean:
dh_testroot
rm -f build-arch-stamp build-indep-stamp configure-stamp
# Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
@@ -73,7 +71,7 @@ install-arch:
dh_installdirs -s
# Add here commands to install the arch part of the package into
# debian/tmp.
- $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
+ $(MAKE) install
rm -rf $(CURDIR)/debian/$(package)/usr/include
dh_install -s
# Must not depend on anything. This is to be called by
@@ -81,6 +79,7 @@ install-arch:
# in another 'make' thread.
binary-common:
+ pwd
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
@@ -96,7 +95,7 @@ binary-common:
# dh_installinit
# dh_installcron
# dh_installinfo
- dh_installman
+# dh_installman
dh_link
dh_strip
dh_compress
--
GitLab