[Pkg-telepathy-commits] [SCM] libtelepathy packaging branch, debian, updated. 7971edb0617cc80294b3f2f5fb4cdbd65068caa6

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 7971edb0617cc80294b3f2f5fb4cdbd65068caa6
Merge: 60c7b1a6277d2ccb188cb60ddb59ad908174d497 7e783b0d9f411ac9d3b349b7718117b8eabc3e56
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Feb 24 15:28:56 2009 +0000

    Merge origin/debian into 0.3.3-1
    
    Conflicts:
    
    	debian/control

diff --combined debian/changelog
index b9035d2,d83b7c5..f34f4e8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,16 +1,23 @@@
 -libtelepathy (0.3.2-2) UNRELEASED; urgency=low
 +libtelepathy (0.3.3-2) UNRELEASED; urgency=low
  
    * Use my and Laurent's debian.org addresses in Uploaders
    * Move packaging to git
+   * Add gbp.conf and `debian/rules update-patches` target for maintainers
+   * Standards-Version: 3.8.0 (add README.source)
+   * Change package descriptions to indicate that libtelepathy is deprecated
+     (we're only keeping it because mission-control 4 needs it)
+   * Depend on ${misc:Depends} (lintian)
+   * Remove redundant Section: libs (lintian)
  
   -- Simon McVittie <smcv at debian.org>  Sun, 27 Apr 2008 13:24:31 +0100
  
 +libtelepathy (0.3.3-1) unstable; urgency=low
 +
 +  * New upstream bugfix release. No new API/ABI.
 +  * Altered dpkg Description to point users to telepathy-glib for new projects
 +
 + -- Simon McVittie <smcv at ianadd.pseudorandom.co.uk>  Mon, 11 Feb 2008 19:12:30 +0000
 +
  libtelepathy (0.3.2-1) unstable; urgency=low
  
    [ Laurent Bigonville ]
diff --combined debian/control
index 15ad9ce,593b91b..2fba7bf
--- a/debian/control
+++ b/debian/control
@@@ -16,7 -16,7 +16,7 @@@ Build-Depends: cdbs
                 libdbus-1-dev (>= 0.93),
                 python,
                 xsltproc
- Standards-Version: 3.7.3
+ Standards-Version: 3.8.0
  Vcs-Git: git://git.debian.org/git/pkg-telepathy/libtelepathy.git
  Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/libtelepathy.git
  Homepage: http://telepathy.freedesktop.org/wiki/
@@@ -24,20 -24,17 +24,19 @@@ XS-Dm-Upload-Allowed: ye
  
  Package: libtelepathy2
  Architecture: any
- Section: libs
  Depends: ${shlibs:Depends},
           ${misc:Depends}
 -Description: deprecated GLib library for the Telepathy framework
 +Description: Telepathy framework - old GLib library
   Telepathy is a D-Bus framework for unifying real time communication,
   including instant messaging, voice calls and video calls. It abstracts
   differences between protocols to provide a unified interface for
   applications.
   .
   This package contains libtelepathy, a GLib-based library for Telepathy
 - components. libtelepathy is deprecated, and new code should use telepathy-glib
 - (see libtelepathy-glib-dev) instead.
 + client components.
 + .
 + Upstream development has moved to the newer library telepathy-glib -
 + new projects should use that instead.
  
  Package: libtelepathy-dev
  Architecture: any
@@@ -46,32 -43,28 +45,33 @@@ Depends: libtelepathy2 (= ${binary:Vers
           libtelepathy-glib-dev (>= 0.7.1),
           libglib2.0-dev (>= 2.10),
           libdbus-glib-1-dev (>= 0.73),
-          libdbus-1-dev (>= 0.93)
+          libdbus-1-dev (>= 0.93),
+          ${misc:Depends}
 -Description: deprecated GLib library headers for the Telepathy framework
 +Description: Telepathy framework - old GLib library headers
   Telepathy is a D-Bus framework for unifying real time communication,
   including instant messaging, voice calls and video calls. It abstracts
   differences between protocols to provide a unified interface for
   applications.
   .
   This package contains development files for libtelepathy, a GLib-based
 - library for Telepathy components. libtelepathy is deprecated, and new code
 - should use telepathy-glib (see libtelepathy-glib-dev) instead.
 + library for Telepathy client components.
 + .
 + Upstream development has moved to the newer library telepathy-glib -
 + new projects should use that instead.
  
  Package: libtelepathy-dbg
  Architecture: any
  Section: libdevel
  Priority: extra
- Depends: libtelepathy2 (= ${binary:Version})
+ Depends: libtelepathy2 (= ${binary:Version}), ${misc:Depends}
 -Description: libtelepathy debug symbols
 +Description: Telepathy framework - old GLib library debug symbols
   Telepathy is a D-Bus framework for unifying real time communication,
   including instant messaging, voice calls and video calls. It abstracts
   differences between protocols to provide a unified interface for
   applications.
   .
 - This package contains the debug symbols for libtelepathy, a deprecated
 - GLib-based library for Telepathy components.
 + This package contains the debug symbols for libtelepathy, a GLib-based
 + library for Telepathy components.
 + .
 + Upstream development has moved to the newer library telepathy-glib -
 + new projects should use that instead.

-- 
libtelepathy packaging