[Pkg-telepathy-commits] [SCM] UNNAMED PROJECT branch, debian, updated. 1bdb4c89c31f856f1c77615d6cbb78e52dda50f0
Simon McVittie
smcv at debian.org
Fri Jan 2 22:02:14 UTC 2009
The following commit has been merged in the debian branch:
commit 9b7762fd1c69d47c2ae7d4efb7264e88d65bfcdd
Merge: da292295613787f67626f0a9bfac38e82aaf0877 27816c717a28d30574c7902107a65df58e1578d8
Author: Simon McVittie <smcv at debian.org>
Date: Fri Jan 2 21:33:44 2009 +0000
Merge branch 'debian-lenny' into debian
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 6dd4080,eed72b3..46d048e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,79 -1,8 +1,85 @@@
-empathy (0.23.3-4) UNRELEASED; urgency=low
++empathy (2.25.3-2) UNRELEASED; urgency=low
+
+ * Switch packaging to git
+
- -- Simon McVittie <smcv at debian.org> Fri, 02 Jan 2009 21:30:44 +0000
++ -- Simon McVittie <smcv at debian.org> Fri, 02 Jan 2009 21:33:26 +0000
++
+empathy (2.25.3-1) experimental; urgency=low
+
+ * New upstream release
+ - Bump libempathy-gtk soname
+ - Fix symbols files
+ * debian/control:
+ - Bump libgtk2.0-dev build-dependency
+ - Drop libgnomeui-dev build-dep
+ * Drop debian/patches/64bit-build-fix.patch: fixed upstream
+
+ -- Laurent Bigonville <bigon at debian.org> Sat, 20 Dec 2008 21:45:15 +0100
+
+empathy (2.25.2-2) experimental; urgency=low
+
+ * debian/patches/64bit-build-fix.patch:
+ - Fix build on 64 bit platforms
+
+ -- Sjoerd Simons <sjoerd at debian.org> Thu, 04 Dec 2008 00:46:53 +0000
+
+empathy (2.25.2-1) experimental; urgency=low
+
+ * New upstream release.
+ - Bump libtelepathy-glib-dev build-dep and add libgnomeui-dev
+ - Bump soname of libempathy
+
+ -- Laurent Bigonville <bigon at debian.org> Mon, 01 Dec 2008 21:35:56 +0100
+
+empathy (2.24.1-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Laurent Bigonville <bigon at debian.org> Mon, 20 Oct 2008 21:12:27 +0200
+
+empathy (2.24.0-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Laurent Bigonville <bigon at debian.org> Mon, 22 Sep 2008 21:37:47 +0200
+
+empathy (2.23.92-1) experimental; urgency=low
+
+ * New upstream release
+ - Adjust libempathy-gtk15.symbols
+ * Use my debian.org address in Uploaders
+
+ -- Laurent Bigonville <bigon at debian.org> Tue, 09 Sep 2008 19:03:12 +0200
+
+empathy (2.23.90-2) experimental; urgency=low
+
+ * debian/libempathy14.symbols: Fix version of an exported symbol
+ * Use rarian-compat and librarian-dev instead of scrollkeeper as build-dep
+ * Bump build-deps and remove libtelepathy-dev (not needed anymore)
+ * Remove --enable-voip flags (voip enabled by default), rename
+ --enable-aspell to --enable-spell
+ * Add explicit build-depends against libglib2.0-dev
+ * Install gnome help and omf files in empathy package
+
+ -- Laurent Bigonville <bigon at bigon.be> Mon, 25 Aug 2008 08:04:11 +0200
+
+empathy (2.23.90-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Dafydd Harries <daf at debian.org> Sun, 24 Aug 2008 22:03:36 +0100
+
+empathy (0.23.4-1) experimental; urgency=low
+
+ [ Laurent Bigonville ]
+ * Bump Standards-Version to 3.8.0 (no further changes)
+
+ [ Sjoerd Simons ]
+ * New upstream release
+ * Bumped soname of libempathy-gtk again and update symbols file
+ * Add a version depend on telepathy-glib-dev matching the configure.ac
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sat, 02 Aug 2008 22:08:58 +0100
empathy (0.23.3-3) unstable; urgency=low
diff --combined debian/control
index 7d3eec0,b151805..dc588c1
--- a/debian/control
+++ b/debian/control
@@@ -9,25 -9,24 +9,26 @@@ Uploaders: Sjoerd Simons <sjoerd at debian
Laurent Bigonville <bigon at debian.org>
Build-Depends: cdbs,
debhelper (>= 5),
- scrollkeeper,
- libgtk2.0-dev (>= 2.12.0),
+ rarian-compat,
+ librarian-dev,
+ libglib2.0-dev (>= 2.16.0),
+ libgtk2.0-dev (>= 2.14.0),
libglade2-dev (>= 2.0.0),
libpanel-applet2-dev (>= 2.10.0),
libgconf2-dev (>= 1.2.0),
- libtelepathy-dev (>= 0.3.1),
- libmissioncontrol-client-dev (>= 4.53),
+ libtelepathy-glib-dev (>= 0.7.15),
+ libmissioncontrol-client-dev (>= 4.61),
intltool,
- libaspell-dev,
+ libenchant-dev (>= 1.2.0),
iso-codes,
libebook1.2-dev,
python-gtk2-dev,
python-support (>= 0.3),
xsltproc,
gnome-doc-utils (>= 0.3.2)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
- Vcs-Bzr: http://bzr.debian.org/pkg-telepathy/packages/unstable/empathy/
+ Vcs-Git: git://git.debian.org/git/pkg-telepathy/empathy.git
+ Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/empathy.git
XS-Dm-Upload-Allowed: yes
Package: empathy
@@@ -69,7 -68,7 +70,7 @@@ Description: High-level library and use
This packet contains common files for libempathy
-Package: libempathy14
+Package: libempathy17
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@@ -112,7 -111,7 +113,7 @@@ Depends: ${shlibs:Depends}
libglib2.0-dev,
libxml2-dev,
libtelepathy-dev,
- libempathy14 (= ${binary:Version})
+ libempathy17 (= ${binary:Version})
Description: High-level library and user-interface for Telepathy
Empathy consists of a rich set of reusable instant messaging widgets, and a
GNOME client using those widgets. It uses Telepathy and Nokia's Mission
@@@ -156,7 -155,7 +157,7 @@@ Description: High-level library and use
.
This package contains common files for libempathy-gtk
-Package: libempathy-gtk14
+Package: libempathy-gtk17
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@@ -178,7 -177,7 +179,7 @@@ Section: libdeve
Depends: ${shlibs:Depends},
${misc:Depends},
libempathy-dev,
- libempathy-gtk14 (= ${binary:Version}),
+ libempathy-gtk17 (= ${binary:Version}),
libgtk2.0-dev (>= 2.10.0),
libglade2-dev (>= 2.0.0)
Description: High-level library and user-interface for Telepathy
--
UNNAMED PROJECT
More information about the Pkg-telepathy-commits
mailing list