[Pkg-telepathy-commits] ./packages/experimental/telepathy-butterfly r30: New upstream release
Laurent Bigonville
bigon at bigon.be
Sat Jan 12 03:54:13 UTC 2008
------------------------------------------------------------
revno: 30
committer: Laurent Bigonville <bigon at bigon.be>
branch nick: telepathy-butterfly
timestamp: Sat 2008-01-12 04:54:13 +0100
message:
New upstream release
tp-butterfly now use waf
removed:
patches/setup-scripts.diff
modified:
changelog
control
rules
-------------- next part --------------
=== removed file 'patches/setup-scripts.diff'
--- a/patches/setup-scripts.diff 2007-12-30 15:55:07 +0000
+++ b/patches/setup-scripts.diff 1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-diff -Nru telepathy-butterfly-0.1.4+bzr20071230.orig/data/org.freedesktop.Telepathy.ConnectionManager.butterfly.service telepathy-butterfly-0.1.4+bzr20071230/data/org.freedesktop.Telepathy.ConnectionManager.butterfly.service
---- telepathy-butterfly-0.1.4+bzr20071230.orig/data/org.freedesktop.Telepathy.ConnectionManager.butterfly.service 1970-01-01 01:00:00.000000000 +0100
-+++ telepathy-butterfly-0.1.4+bzr20071230/data/org.freedesktop.Telepathy.ConnectionManager.butterfly.service 2007-12-30 15:41:21.000000000 +0000
-@@ -0,0 +1,3 @@
-+[D-BUS Service]
-+Name=org.freedesktop.Telepathy.ConnectionManager.butterfly
-+Exec=/usr/bin/telepathy-butterfly
-diff -Nru telepathy-butterfly-0.1.4+bzr20071230.orig/PKG-INFO telepathy-butterfly-0.1.4+bzr20071230/PKG-INFO
---- telepathy-butterfly-0.1.4+bzr20071230.orig/PKG-INFO 1970-01-01 01:00:00.000000000 +0100
-+++ telepathy-butterfly-0.1.4+bzr20071230/PKG-INFO 2007-12-30 15:41:21.000000000 +0000
-@@ -0,0 +1,20 @@
-+Metadata-Version: 1.0
-+Name: telepathy-butterfly
-+Version: 0.1.4
-+Summary: Telepathy MSN connection manager
-+Home-page: http://telepathy.freedesktop.org/wiki/TelepathyButterfly
-+Author: Ali Sabil
-+Author-email: ali.sabil at gmail.com
-+License: GNU GPL
-+Description: UNKNOWN
-+Platform: POSIX
-+Classifier: Development Status :: 4 - Beta
-+Classifier: Environment :: No Input/Output (Daemon)
-+Classifier: Intended Audience :: End Users/DesktopIntended Audience :: Developers
-+Classifier: Intended Audience :: Telecommunications Industry
-+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
-+Classifier: Operating System :: POSIX
-+Classifier: Operating System :: MacOS :: MacOS X
-+Classifier: Programming Language :: Python
-+Classifier: Topic :: Communications :: Chat
-+Classifier: Topic :: Internet
-diff -Nru telepathy-butterfly-0.1.4+bzr20071230.orig/setup.py telepathy-butterfly-0.1.4+bzr20071230/setup.py
---- telepathy-butterfly-0.1.4+bzr20071230.orig/setup.py 1970-01-01 01:00:00.000000000 +0100
-+++ telepathy-butterfly-0.1.4+bzr20071230/setup.py 2007-12-30 15:41:21.000000000 +0000
-@@ -0,0 +1,62 @@
-+from distutils.core import setup
-+import distutils.util
-+import distutils.file_util
-+import sys
-+import commands
-+
-+# Metadata
-+NAME="telepathy-butterfly"
-+VERSION="0.1.4"
-+DESCRIPTION="Telepathy MSN connection manager"
-+AUTHOR="Ali Sabil"
-+AUTHOR_EMAIL="ali.sabil at gmail.com"
-+URL="http://telepathy.freedesktop.org/wiki/TelepathyButterfly",
-+LICENSE="GNU GPL",
-+
-+# compatibility with python < 2.2.3
-+if sys.version < '2.2.3':
-+ from distutils.dist import DistributionMetadata
-+ DistributionMetadata.classifiers = None
-+ DistributionMetadata.download_url = None
-+
-+# rebuild data/org.freedesktop.Telepathy.ConnectionManager.butterfly.service
-+service_file = ('[D-BUS Service]',
-+ 'Name=org.freedesktop.Telepathy.ConnectionManager.butterfly',
-+ 'Exec=%s/bin/telepathy-butterfly' % sys.prefix)
-+def rebuild_service_file():
-+ distutils.file_util.write_file('data/org.freedesktop.Telepathy.ConnectionManager.butterfly.service', service_file)
-+distutils.util.execute(rebuild_service_file,())
-+
-+
-+dbus_service_dir = commands.getoutput('pkg-config --variable=session_bus_services_dir dbus-1')
-+if dbus_service_dir == '':
-+ dbus_service_dir = 'share/dbus-1/services'
-+telepathy_manager_dir = 'share/telepathy/managers'
-+# Setup
-+setup(name=NAME,
-+ version=VERSION,
-+ description=DESCRIPTION,
-+ author=AUTHOR,
-+ author_email=AUTHOR_EMAIL,
-+ url=URL,
-+ license=LICENSE,
-+ platforms=['POSIX'],
-+ packages=['telepathy_butterfly', 'telepathy_butterfly.handler'],
-+ scripts=['telepathy-butterfly'],
-+ data_files=[
-+ (dbus_service_dir, ['data/org.freedesktop.Telepathy.ConnectionManager.butterfly.service']),
-+ (telepathy_manager_dir, ['data/butterfly.manager'])
-+ ],
-+ classifiers=[
-+ 'Development Status :: 4 - Beta',
-+ 'Environment :: No Input/Output (Daemon)',
-+ 'Intended Audience :: End Users/Desktop'
-+ 'Intended Audience :: Developers',
-+ 'Intended Audience :: Telecommunications Industry',
-+ 'License :: OSI Approved :: GNU General Public License (GPL)',
-+ 'Operating System :: POSIX',
-+ 'Operating System :: MacOS :: MacOS X',
-+ 'Programming Language :: Python',
-+ 'Topic :: Communications :: Chat',
-+ 'Topic :: Internet'
-+ ])
=== modified file 'changelog'
--- a/changelog 2007-12-30 17:35:38 +0000
+++ b/changelog 2008-01-12 03:54:13 +0000
@@ -1,4 +1,4 @@
-telepathy-butterfly (0.1.4+bzr20071230-1) UNRELEASED; urgency=low
+telepathy-butterfly (0.3.0-1) UNRELEASED; urgency=low
[ Jonny Lamb ]
* New upstream bzr snapshot.
@@ -12,6 +12,7 @@
* Updated dependency on python-telepathy.
[ Laurent Bigonville ]
+ * New upstream release (0.3.0)
* Add watch file
* debian/control:
- Add myself as an Uploaders
@@ -19,6 +20,7 @@
- Bump python-msn version
* debian/rules: remove binary-install rule, not needed anymore
* Remove pycompat file, not needed anymore
+ * Drop debian/patches/setup-scripts.diff: Upstream now uses waf
-- Laurent Bigonville <bigon at bigon.be> Sun, 30 Dec 2007 17:59:40 +0100
=== modified file 'control'
--- a/control 2007-12-30 17:02:33 +0000
+++ b/control 2008-01-12 03:54:13 +0000
@@ -12,7 +12,7 @@
Package: telepathy-butterfly
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-dbus, python-gobject, python-telepathy (>= 0.14.0+darcs20071230), python-ctypes, python-msn (>= 0.3)
+Depends: ${misc:Depends}, ${python:Depends}, python-dbus, python-gobject, python-telepathy (>= 0.14.0), python-ctypes, python-msn (>= 0.3.0)
XB-Python-Version: ${python:Versions}
Provides: telepathy-connection-manager
Description: MSN connection manager for telepathy
=== modified file 'rules'
--- a/rules 2007-12-30 17:02:33 +0000
+++ b/rules 2008-01-12 03:54:13 +0000
@@ -1,12 +1,23 @@
#!/usr/bin/make -f
-
-DEB_AUTO_CLEANUP_RCS := yes
-DEB_PYTHON_SYSTEM := pycentral
+# -*- makefile -*-
+include /usr/share/cdbs/1/rules/buildcore.mk
+include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
+
+DEB_MAKE_INVOKE = WAF_HOME=$(CURDIR)/debian/waftmp NOCOLOR=1 ./waf -v
+DEB_MAKE_INSTALL_TARGET = install --destdir=$(DEB_DESTDIR)
+DEB_MAKE_CLEAN_TARGET = distclean
+
+common-configure-indep::
+ WAF_HOME=$(CURDIR)/debian/waftmp NOCOLOR=1 ./waf configure --prefix=/usr --libexecdir=/usr/lib/telepathy
+
+clean::
+ rm -rf $(CURDIR)/debian/waftmp
+
# List any files which are not installed
include /usr/share/cdbs/1/rules/utils.mk
-common-binary-post-install-arch:: list-missing
+common-binary-post-install-indep:: list-missing
+ dh_pycentral
More information about the Pkg-telepathy-commits
mailing list