[Pkg-telepathy-commits] [SCM] telepathy-qt4 packaging branch, debian, updated. debian/0.7.1-1-10-gb6d4f8b

Laurent Bigonville bigon at debian.org
Thu May 31 14:27:40 UTC 2012 

The following commit has been merged in the debian branch:
commit 8d03351be21a5e77468ee284dd0936d092f153f7
Author: Laurent Bigonville <bigon at debian.org>
Date:   Mon May 21 16:08:17 2012 +0200

    New upstream release. (Closes: #647835)
    
    * New upstream release. (Closes: #647835)
      - Build against farstream instead of farsight (Closes: #672107)
      - Upstream source package renamed to telepathy-qt
      - Bump soname of both libraries
      - Bump build-dependencies

diff --git a/debian/changelog b/debian/changelog
index 40aefe1..8ceb3d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-telepathy-qt4 (0.8.0-1) unstable; urgency=low
+telepathy-qt (0.9.1-1) UNRELEASED; urgency=low
 
   * New upstream release. (Closes: #647835)
+    - Build against farstream instead of farsight (Closes: #672107)
+    - Upstream source package renamed to telepathy-qt
+    - Bump soname of both libraries
+    - Bump build-dependencies
 
- -- George Kiagiadakis <kiagiadakis.george at gmail.com>  Wed, 30 Nov 2011 22:33:49 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 21 May 2012 16:06:55 +0200
 
 telepathy-qt4 (0.7.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6dca1db..881ffb1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: telepathy-qt4
+Source: telepathy-qt
 Section: libs
 Priority: optional
 Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth.debian.org>
@@ -15,8 +15,9 @@ Build-Depends: cdbs,
                libgstreamer0.10-dev,
                libgstreamer-plugins-base0.10-dev,
                libqt4-dev (>= 4.6.0),
-               libtelepathy-farsight-dev (>= 0.0.4),
-               libtelepathy-glib-dev (>= 0.15.1),
+               libfarstream-0.1-dev (>= 0.1.0),
+               libtelepathy-farstream-dev (>= 0.2.2),
+               libtelepathy-glib-dev (>= 0.17.5),
                pkg-config (>= 0.21),
                python (>= 2.6),
                python-dbus,
@@ -30,7 +31,7 @@ Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-qt4.git
 Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-qt4.git
 Homepage: http://telepathy.freedesktop.org/wiki/
 
-Package: libtelepathy-qt4-1
+Package: libtelepathy-qt4-2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Telepathy framework - Qt 4 library
@@ -42,14 +43,14 @@ Description: Telepathy framework - Qt 4 library
  differences between protocols to provide a unified interface for
  applications.
 
-Package: libtelepathy-qt4-farsight1
+Package: libtelepathy-qt4-farstream2
 Architecture: any
-Depends: libtelepathy-qt4-1 (= ${binary:Version}),
+Depends: libtelepathy-qt4-2 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Description: Telepathy/Farsight integration - Qt 4 library
- telepathy-qt4-farsight provides telepathy-qt4 integration with
- telepathy-farsight, which implements media streaming using GStreamer and
+ telepathy-qt4-farstream provides telepathy-qt4 integration with
+ telepathy-farstream, which implements media streaming using GStreamer and
  Farsight.
  .
  Telepathy is a D-Bus framework for unifying real time communication,
@@ -61,9 +62,9 @@ Package: libtelepathy-qt4-dev
 Architecture: any
 Section: libdevel
 Depends: libqt4-dev (>= 4.6.0),
-         libtelepathy-qt4-1 (= ${binary:Version}),
-         libtelepathy-qt4-farsight1 (= ${binary:Version}),
-         libtelepathy-farsight-dev,
+         libtelepathy-qt4-2 (= ${binary:Version}),
+         libtelepathy-qt4-farstream2 (= ${binary:Version}),
+         libtelepathy-farstream-dev,
          pkg-config (>= 0.21),
          ${shlibs:Depends},
          ${misc:Depends}
@@ -81,9 +82,9 @@ Package: libtelepathy-qt4-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: libtelepathy-qt4-1 (= ${binary:Version}),
+Depends: libtelepathy-qt4-2 (= ${binary:Version}),
          ${misc:Depends}
-Suggests: libtelepathy-qt4-farsight1 (= ${binary:Version})
+Suggests: libtelepathy-qt4-farstream2 (= ${binary:Version})
 Description: Qt 4 Telepathy library (debug symbols)
  This package contains support for debugging programs that use telepathy-qt4,
  a Qt-based library for Telepathy components.
diff --git a/debian/copyright b/debian/copyright
index f40b890..363264d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=442
-Upstream-Name: Telepathy-Qt4
+Upstream-Name: Telepathy-Qt
 Upstream-Maintainer:
     mailto:telepathy at lists.freedesktop.org
     irc://irc.freenode.net/telepathy
diff --git a/debian/libtelepathy-qt4-1.install b/debian/libtelepathy-qt4-1.install
deleted file mode 100644
index 5dab8c4..0000000
--- a/debian/libtelepathy-qt4-1.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libtelepathy-qt4.so.1*
diff --git a/debian/libtelepathy-qt4-2.install b/debian/libtelepathy-qt4-2.install
new file mode 100644
index 0000000..5fd039e
--- /dev/null
+++ b/debian/libtelepathy-qt4-2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libtelepathy-qt4.so.2*
diff --git a/debian/libtelepathy-qt4-dbg.links b/debian/libtelepathy-qt4-dbg.links
index bb16d36..de7efe2 100644
--- a/debian/libtelepathy-qt4-dbg.links
+++ b/debian/libtelepathy-qt4-dbg.links
@@ -1 +1 @@
-usr/share/doc/libtelepathy-qt4-1 usr/share/doc/libtelepathy-qt4-dbg
+usr/share/doc/libtelepathy-qt4-2 usr/share/doc/libtelepathy-qt4-dbg
diff --git a/debian/libtelepathy-qt4-dev.install b/debian/libtelepathy-qt4-dev.install
index 44210d9..8ec6064 100644
--- a/debian/libtelepathy-qt4-dev.install
+++ b/debian/libtelepathy-qt4-dev.install
@@ -1,3 +1,3 @@
 debian/tmp/usr/lib/*.so
-debian/tmp/usr/include/telepathy-1.0
+debian/tmp/usr/include/telepathy-qt4
 debian/tmp/usr/lib/pkgconfig/*.pc
diff --git a/debian/libtelepathy-qt4-dev.links b/debian/libtelepathy-qt4-dev.links
index ef13123..114e8a3 100644
--- a/debian/libtelepathy-qt4-dev.links
+++ b/debian/libtelepathy-qt4-dev.links
@@ -1 +1 @@
-usr/share/doc/libtelepathy-qt4-1 usr/share/doc/libtelepathy-qt4-dev
+usr/share/doc/libtelepathy-qt4-2 usr/share/doc/libtelepathy-qt4-dev
diff --git a/debian/libtelepathy-qt4-farsight1.install b/debian/libtelepathy-qt4-farsight1.install
deleted file mode 100644
index 0f6695e..0000000
--- a/debian/libtelepathy-qt4-farsight1.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libtelepathy-qt4-farsight.so.1*
diff --git a/debian/libtelepathy-qt4-farsight1.links b/debian/libtelepathy-qt4-farsight1.links
deleted file mode 100644
index c205c73..0000000
--- a/debian/libtelepathy-qt4-farsight1.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/libtelepathy-qt4-1 usr/share/doc/libtelepathy-qt4-farsight1
diff --git a/debian/libtelepathy-qt4-farstream2.install b/debian/libtelepathy-qt4-farstream2.install
new file mode 100644
index 0000000..7dd26bc
--- /dev/null
+++ b/debian/libtelepathy-qt4-farstream2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libtelepathy-qt4-farstream.so.2*
diff --git a/debian/libtelepathy-qt4-farstream2.links b/debian/libtelepathy-qt4-farstream2.links
new file mode 100644
index 0000000..f3f1c3d
--- /dev/null
+++ b/debian/libtelepathy-qt4-farstream2.links
@@ -0,0 +1 @@
+usr/share/doc/libtelepathy-qt4-2 usr/share/doc/libtelepathy-qt4-farstream2
diff --git a/debian/rules b/debian/rules
index e099bda..46a67f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,8 +30,8 @@ include $(CURDIR)/debian/update-patches.mk
 
 # we're going to symlink many of the doc directories together
 DEB_INSTALL_DOCS_libtelepathy-qt4-dbg := --no-act
-DEB_INSTALL_DOCS_libtelepathy-qt4-farsight1 := --no-act
+DEB_INSTALL_DOCS_libtelepathy-qt4-farstream2 := --no-act
 DEB_INSTALL_DOCS_libtelepathy-qt4-dev := --no-act
 DEB_INSTALL_CHANGELOGS_libtelepathy-qt4-dbg := --no-act
-DEB_INSTALL_CHANGELOGS_libtelepathy-qt4-farsight1 := --no-act
+DEB_INSTALL_CHANGELOGS_libtelepathy-qt4-farstream2 := --no-act
 DEB_INSTALL_CHANGELOGS_libtelepathy-qt4-dev := --no-act

-- 
telepathy-qt4 packaging

More information about the Pkg-telepathy-commits mailing list