[Python-apps-commits] r8855 - in packages/emesene/trunk/debian (5 files)
dfiloni-guest at users.alioth.debian.org
dfiloni-guest at users.alioth.debian.org
Sat Jun 9 22:22:41 UTC 2012
Date: Saturday, June 9, 2012 @ 22:22:39
Author: dfiloni-guest
Revision: 8855
New upstream release.
Modified:
packages/emesene/trunk/debian/README.source
packages/emesene/trunk/debian/changelog
packages/emesene/trunk/debian/control
packages/emesene/trunk/debian/copyright
packages/emesene/trunk/debian/rules
Modified: packages/emesene/trunk/debian/README.source
===================================================================
--- packages/emesene/trunk/debian/README.source 2012-06-09 05:52:48 UTC (rev 8854)
+++ packages/emesene/trunk/debian/README.source 2012-06-09 22:22:39 UTC (rev 8855)
@@ -1,3 +1,12 @@
+ * emesene source containts a built-in copy of python-sleekxmppy and python-papyon:
+ python-papyon project looks dead and emesene developers worked on local
+ papyon code so I won't remove it from source.
+ python-sleekxmppy Debian package looks outdated so I won't remove it from
+ source until python-sleekxmppy is updated.
+ * Remove fonts directory to fix font-in-non-font-package lintian info.
+
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sat, 09 Jun 2012 23:22:37 +0200
+
* Tarball generated removing non-free dlls directory from original git
source.
Modified: packages/emesene/trunk/debian/changelog
===================================================================
--- packages/emesene/trunk/debian/changelog 2012-06-09 05:52:48 UTC (rev 8854)
+++ packages/emesene/trunk/debian/changelog 2012-06-09 22:22:39 UTC (rev 8855)
@@ -1,3 +1,16 @@
+emesene (2.12.5+dfsg-1) unstable; urgency=low
+
+ * New upstream release (Closes: #676839, #665463, #666187).
+ * debian/control: remove python-xmpp from Recommends field.
+ * debian/control: add python-gupnp-igd to Recommends field.
+ * debian/control: remove python-farstream from Depends field.
+ * debian/control: add python-dnspython to Depends field.
+ * debian/rules: update get-orig-source to remove
+ emesene/e3/xmpp/SleekXMPP/docs/_static/fonts directory too.
+ * debian/{README.source, copyright}: update files.
+
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sat, 09 Jun 2012 23:22:37 +0200
+
emesene (2.12.3+dfsg-2) unstable; urgency=low
* Removed python-farsight from B-D in favor of
Modified: packages/emesene/trunk/debian/control
===================================================================
--- packages/emesene/trunk/debian/control 2012-06-09 05:52:48 UTC (rev 8854)
+++ packages/emesene/trunk/debian/control 2012-06-09 22:22:39 UTC (rev 8855)
@@ -26,8 +26,8 @@
python-openssl (>= 0.6),
python-crypto,
python-gst0.10,
- python-farstream
-Recommends: python-xmpp
+ python-dnspython
+Recommends: python-gupnp-igd
Suggests: python-gtkspell
Description: instant messaging client
emesene tries to be a simple but feature complete program that allows one to
Modified: packages/emesene/trunk/debian/copyright
===================================================================
--- packages/emesene/trunk/debian/copyright 2012-06-09 05:52:48 UTC (rev 8854)
+++ packages/emesene/trunk/debian/copyright 2012-06-09 22:22:39 UTC (rev 8855)
@@ -43,7 +43,7 @@
environment detection and resource opening support for a selection
of common and standardised desktop environments.
- Copyright © 2005-2009 Paul Boddie <paul at boddie.org.uk>
+ Copyright © 2005-2009, Paul Boddie <paul at boddie.org.uk>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -260,7 +260,7 @@
For emesene/e3/jabber/pyfacebook/*, the following terms apply:
- Copyright (c) 2008, Samuel Cormier-Iijima
+ Copyright © 2008, Samuel Cormier-Iijima
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -288,7 +288,7 @@
For emesene/e3/jabber/Worker.py, the following terms apply:
- Copyright (C) 2009-2010 Emesene
+ Copyright © 2009-2010, Emesene
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -320,9 +320,138 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+For SleekXMPP the following terms apply:
+
+ Copyright © 2010-2012, Nathanael C. Fritz
+ Copyright © 2010-2012, Lance J.T. Stout
+ Copyright © 2011, Dalek
+ Copyright © 2010, Erik Reuterborg Larsson
+ Copyright © 2011, Dann Martens
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For emesene/e3/xmpp/SleekXMPP/sleekxmpp/thirdparty/mini_dateutil.py the
+following terms apply:
+
+ Copyright © 2003-2011, Gustavo Niemeyer <gustavo at niemeyer.net>
+ Copyright © 2008, Red Innovation Ltd., Finland
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the copyright holder nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For emesene/e3/xmpp/SleekXMPP/sleekxmpp/thirdparty/gnupg.py the
+following terms apply:
+
+ Copyright © 2008-2012, Vinay Sajip
+
+ ===================================================================
+ Distribute and use freely; there are no restrictions on further
+ dissemination and usage except those imposed by the laws of your
+ country of residence. This software is provided "as is" without
+ warranty of fitness for use or suitability for any purpose, express
+ or implied. Use at your own risk or not at all.
+ ===================================================================
+
+ Incorporating the code into commercial products is permitted; you do
+ not have to make source available or contribute your changes back
+ (though that would be nice).
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For emesene/e3/xmpp/SleekXMPP/sleekxmpp/thirdparty/suelta/* the following
+terms apply:
+
+ Copyright © 2007-2010, David Alan Cridland
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For emesene/e3/xmpp/SleekXMPP/sleekxmpp/thirdparty/ordereddict.py the following
+terms apply:
+
+ Copyright © 2009 Raymond Hettinger
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
For emesene/themes/conversations/renkoo.AdiumMessageStyle/Contents/Resources/* the following terms apply:
- Copyright (C) Renkoo, Inc.
+ Copyright © Renkoo, Inc.
The images, css and html is dual licensed under the BSD and AFL license.
The source files for the bubbles can be found at http://www.itorrey.com/adiumx/
Modified: packages/emesene/trunk/debian/rules
===================================================================
--- packages/emesene/trunk/debian/rules 2012-06-09 05:52:48 UTC (rev 8854)
+++ packages/emesene/trunk/debian/rules 2012-06-09 22:22:39 UTC (rev 8855)
@@ -13,6 +13,13 @@
rm -f $(CURDIR)/debian/emesene/usr/share/emesene/emesene/e3/papylib/papyon/papyon/util/iso8601/LICENSE
rm -f $(CURDIR)/debian/emesene/usr/share/emesene/emesene/themes/conversations/renkoo.AdiumMessageStyle/Contents/Resources/Renkoo\ LICENSE.txt
+ rm -f $(CURDIR)/debian/emesene/usr/share/emesene/emesene/e3/xmpp/SleekXMPP/LICENSE
+ rm -f $(CURDIR)/debian/emesene/usr/share/emesene/emesene/e3/xmpp/SleekXMPP/docs/license.rst
+ rm -f $(CURDIR)/debian/emesene/usr/share/emesene/emesene/e3/xmpp/SleekXMPP/sleekxmpp/thirdparty/suelta/LICENSE
+
+ # fix executable-not-elf-or-script lintian warning
+ chmod 644 $(CURDIR)/debian/emesene/usr/share/emesene/emesene/e3/xmpp/SleekXMPP/conn_tests/testpubsub.py
+
override_dh_clean:
dh_clean
rm -rf emesene.egg-info
@@ -22,6 +29,7 @@
VER=$(shell dpkg-parsechangelog | sed -rn 's,^Version: ([^+]*).*,\1,p');\
git clone -q https://github.com/emesene/emesene.git orig-source &&\
cd orig-source && git checkout -q v$$VER &&\
- git rm -qrf dlls windows/Clearlooks/lib/gtk-2.0/2.10.0/engines/libclearlooks.dll && git commit -qm 'drop dlls' &&\
+ git rm -qrf dlls windows/Clearlooks/lib/gtk-2.0/2.10.0/engines/libclearlooks.dll emesene/e3/xmpp/SleekXMPP/docs/_static/fonts &&\
+ git commit -qm 'drop dlls' &&\
git archive --format tar --prefix emesene-$$VER/ HEAD | bzip2 -9 > ../emesene_$$DVER.orig.tar.bz2
rm -rf orig-source
More information about the Python-apps-commits
mailing list