[Pkg-voip-commits] [sflphone] 01/01: [svn-buildpackage] Tagging sflphone 1.1.0-2
tzafrir at debian.org
tzafrir at debian.org
Mon Sep 22 22:24:46 UTC 2014
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to annotated tag debian/1.1.0-2
in repository sflphone.
commit 81734303729bf2e662f9244bff189b8a50756cfe
Author: Mark Purcell <msp at debian.org>
Date: Sat May 26 22:46:12 2012 +0000
[svn-buildpackage] Tagging sflphone 1.1.0-2
git-svn-id: svn://anonscm.alioth.debian.org/svn/pkg-voip/sflphone/tags/1.1.0-2@9727 5e74be4b-f5d6-0310-a852-e9e23c5afa6a
---
debian/changelog | 18 ++++++++++++++++++
debian/control | 9 +++++----
debian/patches/03_binutils-gold.patch | 22 ++++++++++++----------
debian/patches/gcc47-fixes.patch | 26 ++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/watch | 2 +-
6 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 22760c7..6c88929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+sflphone (1.1.0-2) unstable; urgency=low
+
+ * Drop unsupported CELT codec (Build-Depends)
+ - Fixes "Spurious build dependency on libcelt-dev" (Closes: #674644)
+
+ -- Mark Purcell <msp at debian.org> Sun, 27 May 2012 08:22:22 +1000
+
+sflphone (1.1.0-1) unstable; urgency=low
+
+ * New upstream release
+ - Fixes "FTBFS with libccrtp-dev/2.0.2 from experimental" (Closes: #663282)
+ * NEW Maintainer: Debian VoIP Team - Thanks Francois for your work.
+ - (Closes: #665789: O: sflphone -- SIP and IAX2 compatible VoIP phone)
+ * Added Build-Depends: libdbus-c++-bin
+ * Add gcc47-fixes.patch
+
+ -- Mark Purcell <msp at debian.org> Sat, 19 May 2012 21:46:37 +1000
+
sflphone (1.0.2-2) unstable; urgency=low
* Orphan this package
diff --git a/debian/control b/debian/control
index f6ee527..7973a27 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,13 @@
Source: sflphone
Section: gnome
Priority: extra
-Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: debhelper (>= 8), autotools-dev, autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libgtk-3-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev (>= 0.7), libasound2-dev, libspeexdsp-dev, libebook1.2-dev, uuid-dev, liblog4c-dev, libcelt-dev, chrpath, libresample1-dev, libzrtpcpp-dev, check, libsrtp0-dev, libssl-dev, libpcre3-dev, gnome-doc-utils, libglib2.0-dev, libgnomeu [...]
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Uploaders: Mark Purcell <msp at debian.org>
+Build-Depends: debhelper (>= 8), autotools-dev, autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libgtk-3-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev (>= 0.7), libasound2-dev, libspeexdsp-dev, libebook1.2-dev, uuid-dev, liblog4c-dev, chrpath, libresample1-dev, libzrtpcpp-dev (>= 2.0.0), check, libsrtp0-dev, libssl-dev, libpcre3-dev, gnome-doc-utils, libglib2.0-dev, libgnomeui- [...]
Standards-Version: 3.9.2
Homepage: http://www.sflphone.org
-Vcs-Git: git://git.debian.org/git/collab-maint/sflphone.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/sflphone.git;a=summary
+Vcs-Svn: svn://svn.debian.org/pkg-voip/sflphone/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/sflphone/trunk/
Package: sflphone-daemon
Architecture: any
diff --git a/debian/patches/03_binutils-gold.patch b/debian/patches/03_binutils-gold.patch
index 7edf851..e949081 100644
--- a/debian/patches/03_binutils-gold.patch
+++ b/debian/patches/03_binutils-gold.patch
@@ -3,14 +3,16 @@ Author: Mahyuddin Susanto <udienz at ubuntu.com>
Forwarded: no
Last-Update: 2012-01-04
---- 1.0.1-4.1/gnome/src/Makefile.am 2011-11-18 16:44:15.000000000 +0000
-+++ 1.0.1-4.1ubuntu1/gnome/src/Makefile.am 2012-01-04 12:23:46.000000000 +0000
-@@ -35,7 +35,7 @@ noinst_HEADERS = actions.h sflnotify.h
- shortcuts.h eel-gconf-extensions.h logger.h imwindow.h unused.h
+Index: sflphone-1.1.0/gnome/src/Makefile.am
+===================================================================
+--- sflphone-1.1.0.orig/gnome/src/Makefile.am 2012-05-18 07:16:25.000000000 +1000
++++ sflphone-1.1.0/gnome/src/Makefile.am 2012-05-19 14:32:01.000000000 +1000
+@@ -41,7 +41,7 @@
+ $(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $(X11_LIBS) \
+ $(GTK_LIBS) $(GLIB_LIBS) $(WEBKIT_LIBS) \
+ $(LD_LIBS) $(GCONF_LIBS) \
+- $(JAVASCRIPT_CORE_GTK_LIBS) $(GTHREAD_LIBS)
++ $(JAVASCRIPT_CORE_GTK_LIBS) $(GTHREAD_LIBS) -lgthread-2.0
- sflphone_client_gnome_LDADD = $(DBUSGLIB_LIBS) $(LIBNOTIFY_LIBS) $(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $(X11_LIBS) \
-- $(GTK_LIBS) $(GLIB_LIBS) $(WEBKIT_LIBS) $(LD_LIBS) $(GCONF_LIBS)
-+ $(GTK_LIBS) $(GLIB_LIBS) $(WEBKIT_LIBS) $(LD_LIBS) $(GCONF_LIBS) -lgthread-2.0
-
- sflphone_client_gnome_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) $(NOTIFY_CFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS) \
- $(GLIB_CFLAGS) $(WEBKIT_CFLAGS) $(GCONF_CFLAGS)
+ sflphone_client_gnome_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) \
+ $(NOTIFY_CFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS) \
diff --git a/debian/patches/gcc47-fixes.patch b/debian/patches/gcc47-fixes.patch
new file mode 100644
index 0000000..70740eb
--- /dev/null
+++ b/debian/patches/gcc47-fixes.patch
@@ -0,0 +1,26 @@
+Index: sflphone-1.1.0/daemon/libs/iax2/iax-client.h
+===================================================================
+--- sflphone-1.1.0.orig/daemon/libs/iax2/iax-client.h 2012-05-18 07:16:25.000000000 +1000
++++ sflphone-1.1.0/daemon/libs/iax2/iax-client.h 2012-05-19 21:24:15.000000000 +1000
+@@ -11,6 +11,8 @@
+ * the GNU Lesser General Public License (LGPL)
+ */
+
++#include <sys/socket.h>
++
+ #ifndef _ASTERISK_IAX_CLIENT_H
+ #define _ASTERISK_IAX_CLIENT_H
+
+Index: sflphone-1.1.0/daemon/src/fileutils.cpp
+===================================================================
+--- sflphone-1.1.0.orig/daemon/src/fileutils.cpp 2012-05-18 07:16:25.000000000 +1000
++++ sflphone-1.1.0/daemon/src/fileutils.cpp 2012-05-19 21:24:59.000000000 +1000
+@@ -28,6 +28,8 @@
+ * as that of the covered work.
+ */
+
++#include <sys/types.h>
++#include <unistd.h>
+ #include <libgen.h>
+ #include <dirent.h>
+ #include <sys/stat.h>
diff --git a/debian/patches/series b/debian/patches/series
index cc02bc9..054d9cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+gcc47-fixes.patch
02_target_s390.patch
03_binutils-gold.patch
04_target_s4.patch
diff --git a/debian/watch b/debian/watch
index 1cbd4fa..354ba64 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://www.sflphone.org/download/source-code https://projects.savoirfairelinux.com/attachments/download/[0-9]+/sflphone-([0-9.]+)\.tar\.gz
+http://www.sflphone.org/download/source-code https://projects.savoirfairelinux.com/attachments/download/[0-9]+/sflphone-([0-9.]+)\.tar\.gz debian svn-upgrade
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/sflphone.git
More information about the Pkg-voip-commits
mailing list