[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/2.29.1-1-7-g62b8a67
Laurent Bigonville
bigon at bigon.be
Sat Nov 14 18:42:08 UTC 2009
The following commit has been merged in the debian branch:
commit c55f38375bfdc5ca021a50454d8999b5e9b926b5
Merge: 581ec4bebb8ffe633bb6f0c853e1e28fee129e34 913e537afc706e718629d5640a85434f465b4a50
Author: Laurent Bigonville <bigon at bigon.be>
Date: Sat Nov 14 19:41:26 2009 +0100
Merge branch 'debian-squeeze' into debian
Conflicts:
debian/control
diff --combined debian/changelog
index 11a06df,41cd197..f1ea207
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,15 +1,29 @@@
+ empathy (2.28.1.1-3) unstable; urgency=low
+
+ * Also do not try to build with geoclue support on non-linux arch
+
+ -- Laurent Bigonville <bigon at debian.org> Sat, 14 Nov 2009 19:25:08 +0100
+
empathy (2.28.1.1-2) unstable; urgency=low
* Do not try to build with networkmanager support on non-linux arch
-- Laurent Bigonville <bigon at debian.org> Wed, 11 Nov 2009 22:56:43 +0100
+empathy (2.29.1-1) experimental; urgency=low
+
+ * New upstream release
+ - Drop megaphone applet
+ - Drop libempathy, libempathy-gtk and python-empathy packages
+ - Rename empathy-doc to empathy-common (Closes: #547904)
+ * debian/control:
+ - Fix typo
+ - packet -> package
+ - Add Recommends on yelp for empathy-common (Closes: #553524)
+ * Move GConf schema to empathy package
+
+ -- Laurent Bigonville <bigon at debian.org> Wed, 04 Nov 2009 18:27:30 +0100
+
empathy (2.28.1.1-1) unstable; urgency=low
* New upstream bugfix release
diff --combined debian/control
index e651537,870b0f2..14ae2dc
--- a/debian/control
+++ b/debian/control
@@@ -12,14 -12,17 +12,14 @@@ Build-Depends: cdbs
debhelper (>= 7),
rarian-compat,
librarian-dev,
- libglib2.0-dev (>= 2.16.0),
+ libglib2.0-dev (>= 2.22.0),
libgtk2.0-dev (>= 2.16.0),
- libpanel-applet2-dev (>= 2.10.0),
libgconf2-dev (>= 1.2.0),
libtelepathy-glib-dev (>= 0.7.35),
intltool,
libenchant-dev (>= 1.2.0),
iso-codes,
libebook1.2-dev,
- python-gtk2-dev,
- python-support (>= 0.3),
xsltproc,
gnome-doc-utils (>= 0.17.3),
libcanberra-gtk-dev (>= 0.4),
@@@ -32,8 -35,8 +32,8 @@@
libgstreamer-plugins-base0.10-dev,
libnm-glib-dev (>= 0.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libnm-util-dev (>= 0.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libwebkit-dev (>= 1.1.7),
+ libwebkit-dev (>= 1.1.15),
- libgeoclue-dev (>= 0.11),
+ libgeoclue-dev (>= 0.11) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libchamplain-0.4-dev (>= 0.4),
libchamplain-gtk-0.4-dev (>= 0.4),
libclutter-gtk-0.10-dev (>= 0.10),
@@@ -48,28 -51,20 +48,28 @@@ Package: empath
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
+ empathy-common (= ${source:Version}),
+ telepathy-mission-control-5,
+ gnome-icon-theme,
- geoclue,
++ geoclue [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
dbus-x11
Recommends: telepathy-gabble,
telepathy-salut,
gvfs-backends,
- geoclue-hostip,
- geoclue-localnet,
- geoclue-yahoo,
- geoclue-manual
- empathy-doc (= ${source:Version}),
++ geoclue-hostip [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
++ geoclue-localnet [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
++ geoclue-yahoo [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
++ geoclue-manual [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
Suggests: telepathy-haze,
telepathy-butterfly
+Replaces: libempathy-gtk-common
Description: High-level library and user-interface for Telepathy
Instant messaging program supporting text, voice, video, file transfers
and inter-application communication over many different protocols,
including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
Gadu-Gadu, Groupwise, ICQ and QQ.
.
- This packet contains the empathy IM application and account manager.
+ This package contains the empathy IM application and account manager.
Package: empathy-dbg
Architecture: any
@@@ -82,21 -77,202 +82,21 @@@ Description: High-level library and use
including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
Gadu-Gadu, Groupwise, ICQ and QQ.
.
- This packet contains debug symbols fro the empathy IM application and
+ This package contains debug symbols for the empathy IM application and
account manager.
-Package: empathy-doc
+Package: empathy-common
Architecture: all
-Section: doc
Depends: ${misc:Depends}
-Replaces: empathy (<< 2.27.92)
-Description: High-level library and user-interface for Telepathy (empathy documentation)
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
- Gadu-Gadu, Groupwise, ICQ and QQ.
- .
- This packet contains the GNOME documentation for empathy IM application
-
-Package: libempathy-common
-Architecture: all
-Section: misc
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: High-level library and user-interface for Telepathy (library common files)
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
- Gadu-Gadu, Groupwise, ICQ and QQ.
- .
- This packet contains common files for libempathy
-
-Package: libempathy30
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libempathy-common (= ${source:Version}),
- telepathy-mission-control-5
-Conflicts: libempathy14, libempathy23
-Replaces: libempathy14, libempathy23
-Description: High-level library and user-interface for Telepathy (low-level library)
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
- Gadu-Gadu, Groupwise, ICQ and QQ.
- .
- This packages contains the low-level empathy library
-
-Package: libempathy30-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: ${misc:Depends}, libempathy30 (= ${binary:Version})
-Description: High-level library and user-interface for Telepathy (low-level debug symbols)
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
- Gadu-Gadu, Groupwise, ICQ and QQ.
- .
- This packages contains the low-level empathy library debug symbols
-
-Package: libempathy-doc
-Architecture: all
-Section: doc
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: High-level library and user-interface for Telepathy (library documentation)
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
- Gadu-Gadu, Groupwise, ICQ and QQ.
- .
- This package contains documentation for libempathy
-
-Package: libempathy-dev
-Architecture: any
-Section: libdevel
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libglib2.0-dev,
- libxml2-dev,
- libtelepathy-glib-dev (>= 0.7.34),
- libempathy30 (= ${binary:Version})
-Description: High-level library and user-interface for Telepathy (library dev files)
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
- Gadu-Gadu, Groupwise, ICQ and QQ.
- .
- This package contains development files for libempathy
-
-Package: libempathy-gtk-doc
-Architecture: all
-Section: doc
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: libempathy-gtk14, libempathy-gtk19
-Replaces: libempathy-gtk14, libempathy-gtk19
-Description: High-level library and user-interface for Telepathy (GTK documentation)
+Recommends: yelp
+Replaces: empathy (<< 2.27.92), empathy-doc, libempathy-common, libempathy-gtk-common
+Conflicts: empathy-doc, libempathy-common, libempathy-gtk-common
+Provides: empathy-doc, libempathy-common, libempathy-gtk-common
+Description: High-level library and user-interface for Telepathy (empathy common files)
Instant messaging program supporting text, voice, video, file transfers
and inter-application communication over many different protocols,
including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
Gadu-Gadu, Groupwise, ICQ and QQ.
.
- This package contains documentation for libempathy-gtk
-
-Package: libempathy-gtk-common
-Architecture: all
-Section: misc
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- gnome-icon-theme
-Description: High-level library and user-interface for Telepathy (GTK common files)
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
- Gadu-Gadu, Groupwise, ICQ and QQ.
- .
- This package contains common files for libempathy-gtk
-
-Package: libempathy-gtk28
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libempathy-gtk-common (= ${source:Version}),
- geoclue [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
-Recommends: geoclue-hostip [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- geoclue-localnet [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- geoclue-yahoo [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- geoclue-manual [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
-Description: High-level library and user-interface for Telepathy (GTK library)
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
- Gadu-Gadu, Groupwise, ICQ and QQ.
- .
- This package contains a library of widgets for use in IM applications.
-
-Package: libempathy-gtk28-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: ${misc:Depends}, libempathy-gtk28 (= ${binary:Version})
-Description: High-level library and user-interface for Telepathy (GTK debug symbols)
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
- Gadu-Gadu, Groupwise, ICQ and QQ.
- .
- This package contains the debug symbols for a library of widgets for use in IM
- applications.
-
-Package: libempathy-gtk-dev
-Architecture: any
-Section: libdevel
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libempathy-dev,
- libempathy-gtk28 (= ${binary:Version}),
- libgtk2.0-dev (>= 2.16.0),
- libcanberra-gtk-dev,
- libgstreamer0.10-dev
-Description: High-level library and user-interface for Telepathy (GTK dev files)
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
- Gadu-Gadu, Groupwise, ICQ and QQ.
- .
- This package contains development files for libempathy-gtk
-
-Package: python-empathy
-Architecture: any
-Section: python
-Provides: ${python:Provides}
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${python:Depends}
-XB-Python-Version: ${python:Versions}
-Description: High-level library and user-interface for Telepathy (python bindings)
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
- Gadu-Gadu, Groupwise, ICQ and QQ.
- .
- This package contains Python bindings for libempathy and libempathy-gtk
-
-Package: empathy-megaphone-applet
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: High-level library and user-interface for Telepathy (megaphone applet)
- Instant messaging program supporting text, voice, video, file transfers
- and inter-application communication over many different protocols,
- including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
- Gadu-Gadu, Groupwise, ICQ and QQ.
- .
- This packet contains the megaphone applet
- .
- The megaphone applet let you start a conversiation with a contact
- and see his status directly from the gnome-panel.
+ This package contains the architecture independent files for empathy
+ IM application
diff --combined debian/rules
index aeb163b,d56fecd..e91259a
--- a/debian/rules
+++ b/debian/rules
@@@ -16,19 -16,24 +16,18 @@@ common-binary-post-install-arch:: list-
DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \
--enable-python \
- --enable-megaphone \
--disable-tests \
--enable-webkit \
--enable-map
DEB_DBG_PACKAGE_empathy = empathy-dbg
-DEB_DBG_PACKAGE_libempathy30 = libempathy30-dbg
-DEB_DBG_PACKAGE_libempathy-gtk28 = libempathy-gtk28-dbg
-
-binary-install/python-empathy::
- dh_pysupport -p$(cdbs_curpkg)
DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
ifeq ($(DEB_BUILD_ARCH_OS),linux)
- DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=nm
+ DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=nm --enable-location=yes
else
- DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=no
+ DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=no --enable-location=no
endif
include $(CURDIR)/debian/update-patches.mk
--
Empathy packaging
More information about the Pkg-telepathy-commits
mailing list