r9978 - in /packages/experimental/gossip/debian: changelog control
gossip-telepathy.install rules
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun Apr 15 19:13:26 UTC 2007
Author: sjoerd
Date: Sun Apr 15 19:13:25 2007
New Revision: 9978
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9978
Log:
* New upstream release
* Drop gossip-telepathy. Gossip can now support both it's native jabber
backend and telpeathy at the same time.
Removed:
packages/experimental/gossip/debian/gossip-telepathy.install
Modified:
packages/experimental/gossip/debian/changelog
packages/experimental/gossip/debian/control
packages/experimental/gossip/debian/rules
Modified: packages/experimental/gossip/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gossip/debian/changelog?rev=9978&op=diff
==============================================================================
--- packages/experimental/gossip/debian/changelog (original)
+++ packages/experimental/gossip/debian/changelog Sun Apr 15 19:13:25 2007
@@ -1,3 +1,11 @@
+gossip (0.24-1) experimental; urgency=low
+
+ * New upstream release
+ * Drop gossip-telepathy. Gossip can now support both it's native jabber
+ backend and telpeathy at the same time.
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 15 Apr 2007 21:11:55 +0200
+
gossip (0.23-3) experimental; urgency=low
* Build-depend on libtelepathy2 >= 0.0.51-3. Previous versions had broken
Modified: packages/experimental/gossip/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gossip/debian/control?rev=9978&op=diff
==============================================================================
--- packages/experimental/gossip/debian/control (original)
+++ packages/experimental/gossip/debian/control Sun Apr 15 19:13:25 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Ross Burton <ross at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs, gnome-pkg-tools, libxml-parser-perl, scrollkeeper, libloudmouth1-dev (>= 1.0-1), libgtk2.0-dev (>= 2.10.0), libgnomeui-dev (>= 2.16.0-2), libglib2.0-dev (>= 2.12.0), libglade2-dev (>= 2.0.0), libgconf2-dev (>= 1.2.0), libgnomevfs2-0 (>= 2.8.4-2), libpanel-applet2-dev (>= 2.10.0), libxslt1-dev (>= 0.8), libxt-dev, libxss-dev (>= 6.8.2), gnome-doc-utils (>= 0.3.2), iso-codes, libaspell-dev, libnotify-dev (>= 0.4.3-2), libnotify-dev-gtk2.10, libdbus-glib-1-dev (>= 0.60), libgcrypt11-dev | libgcrypt-dev, libxml2-dev (>= 2.6.16), libtelepathy-dev (>= 0.0.51-3)
+Build-Depends: debhelper (>= 4.1.0), cdbs, gnome-pkg-tools, libxml-parser-perl, scrollkeeper, libloudmouth1-dev (>= 1.0-1), libgtk2.0-dev (>= 2.10.0), libglib2.0-dev (>= 2.12.0), libglade2-dev (>= 2.0.0), libgconf2-dev (>= 1.2.0), libgnomevfs2-0 (>= 2.8.4-2), libpanel-applet2-dev (>= 2.10.0), libxslt1-dev (>= 0.8), libxt-dev, libxss-dev (>= 6.8.2), gnome-doc-utils (>= 0.3.2), iso-codes, libaspell-dev, libnotify-dev (>= 0.4.3-2), libnotify-dev-gtk2.10, libdbus-glib-1-dev (>= 0.60), libgcrypt11-dev | libgcrypt-dev, libxml2-dev (>= 2.6.16), libtelepathy-dev (>= 0.0.51-3)
Standards-Version: 3.7.2
Package: gossip-common
@@ -23,17 +23,3 @@
Gossip is an Instant Messaging client for the Jabber protocol using GNOME
technologies. It aims to make IM as easy as possible, while giving users a
friendly way of keeping in touch with their friends.
-
-Package: gossip-telepathy
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gossip-common
-Recommends: iso-codes
-Conflicts: gossip
-Provides: gossip
-Recommends: telepathy-gabble
-Description: friendly Jabber client for GNOME
- Gossip is an Instant Messaging client for the Jabber protocol using GNOME
- technologies. It aims to make IM as easy as possible, while giving users a
- friendly way of keeping in touch with their friends.
- .
- This package uses the telepathy backend
Modified: packages/experimental/gossip/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gossip/debian/rules?rev=9978&op=diff
==============================================================================
--- packages/experimental/gossip/debian/rules (original)
+++ packages/experimental/gossip/debian/rules Sun Apr 15 19:13:25 2007
@@ -1,92 +1,10 @@
#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
+
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-FLAVOURS := default telepathy
-
-CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-CONFIGURE_DEFAULT_FLAGS := --enable-dbus --enable-libnotify --enable-aspell --disable-scrollkeeper
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-
-build-%/configure-stamp:: debian/stamp-patched
- dh_testdir
- mkdir -p build-$*
- cd build-$* && \
- $(CONFIGURE_SCRIPT_ENV) ../configure \
- --host=$(DEB_BUILD_HOST_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- -mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- $(CONFIGURE_DEFAULT_FLAGS) \
- $(shell [ "$*" = "telepathy" ] && echo "--enable-telepathy")
- touch $@
-
-build-%/build-stamp: build-%/configure-stamp
- dh_testdir
- $(MAKE) -C build-$*
- touch $@
-
-build: $(FLAVOURS:%=build-%/build-stamp)
-
-debian/tmp-%: build-%/build-stamp
- $(MAKE) -C build-$* DESTDIR=$(CURDIR)/debian/tmp-$* install
-
-install-%: debian/tmp-%
- dh_testdir
- dh_testroot
- dh_installdirs -s -p $(subst -default,,gossip-$*)
- dh_install -v --sourcedir=debian/tmp-$* -p $(subst -default,,gossip-$*)
-
-install-common: debian/tmp-default
- dh_testdir
- dh_testroot
- dh_installdirs -s -p gossip-common
- dh_install -v --sourcedir=debian/tmp-default -p gossip-common
-
-binary: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_installmenu
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-clean:: reverse-patches
- dh_testdir
- dh_testroot
- rm -rf debian/gossip
- for x in $(FLAVOURS); do \
- rm -rf debian/tmp-$$x ; \
- rm -rf build-$$x ; \
- done
- dh_clean
-
-install: $(FLAVOURS:%=install-%) install-common
-
-binary-arch: binary
-
-binary-indep: build install
-
-.PHONY: build clean binary binary-arch binary-indep install
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-dbus --enable-libnotify --enable-aspell --disable-scrollkeeper --enable-telepathy
More information about the pkg-gnome-commits
mailing list