[Python-apps-commits] r8654 - in packages/pyicqt/tags (15 files)
nijel at users.alioth.debian.org
nijel at users.alioth.debian.org
Wed May 9 11:54:34 UTC 2012
Date: Wednesday, May 9, 2012 @ 11:54:33
Author: nijel
Revision: 8654
[svn-buildpackage] Tagging pyicqt 0.8.1.5-5
Added:
packages/pyicqt/tags/0.8.1.5-5/
packages/pyicqt/tags/0.8.1.5-5/debian/changelog
(from rev 8653, packages/pyicqt/trunk/debian/changelog)
packages/pyicqt/tags/0.8.1.5-5/debian/control
(from rev 8649, packages/pyicqt/trunk/debian/control)
packages/pyicqt/tags/0.8.1.5-5/debian/patches/adapt-default-config-options.patch
(from rev 8642, packages/pyicqt/trunk/debian/patches/adapt-default-config-options.patch)
packages/pyicqt/tags/0.8.1.5-5/debian/patches/no_error.patch
(from rev 8643, packages/pyicqt/trunk/debian/patches/no_error.patch)
packages/pyicqt/tags/0.8.1.5-5/debian/patches/series
(from rev 8642, packages/pyicqt/trunk/debian/patches/series)
packages/pyicqt/tags/0.8.1.5-5/debian/pyicqt.init
(from rev 8651, packages/pyicqt/trunk/debian/pyicqt.init)
packages/pyicqt/tags/0.8.1.5-5/debian/rules
(from rev 8652, packages/pyicqt/trunk/debian/rules)
Deleted:
packages/pyicqt/tags/0.8.1.5-5/debian/changelog
packages/pyicqt/tags/0.8.1.5-5/debian/control
packages/pyicqt/tags/0.8.1.5-5/debian/patches/adapt-default-config-options.patch
packages/pyicqt/tags/0.8.1.5-5/debian/patches/series
packages/pyicqt/tags/0.8.1.5-5/debian/pycompat
packages/pyicqt/tags/0.8.1.5-5/debian/pyicqt.init
packages/pyicqt/tags/0.8.1.5-5/debian/rules
Deleted: packages/pyicqt/tags/0.8.1.5-5/debian/changelog
===================================================================
--- packages/pyicqt/trunk/debian/changelog 2012-05-09 03:59:31 UTC (rev 8641)
+++ packages/pyicqt/tags/0.8.1.5-5/debian/changelog 2012-05-09 11:54:33 UTC (rev 8654)
@@ -1,197 +0,0 @@
-pyicqt (0.8.1.5-4) unstable; urgency=low
-
- * Fix watch file to work after recent changes on code.google.com.
- * Fix permissions of /var/lib/pyicqt (Closes: #600083).
- * Bump standards to 3.9.1.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Tue, 26 Oct 2010 15:40:57 +0200
-
-pyicqt (0.8.1.5-3) unstable; urgency=low
-
- * Init script should depend on $remote_fs.
- * We don't need python-dev for building.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Sat, 02 Jan 2010 12:58:32 +0100
-
-pyicqt (0.8.1.5-2) unstable; urgency=low
-
- * Adjust provided service name in init script.
- * Fix naming of init script in source package.
- * Convert to 3.0 (quilt) source format.
- * Add DEP-3 compliant headers to patches.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Mon, 23 Nov 2009 13:09:55 +0100
-
-pyicqt (0.8.1.5-1) unstable; urgency=low
-
- * New upstream version.
- - Should fix some memory leaks.
- * Add missing README.source.
- * Update to standards 3.8.3.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Mon, 24 Aug 2009 22:04:40 +0200
-
-pyicqt (0.8.1.4-1) unstable; urgency=low
-
- * New upstream version.
- * Update to standards 3.8.2.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Tue, 11 Aug 2009 23:04:56 +0200
-
-pyicqt (0.8.1.3-2) unstable; urgency=low
-
- * Do not ship /var/run/pyicqt in package.
- * Update to standards 3.8.1.
- * Switch to python-support.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Thu, 07 May 2009 14:41:41 +0200
-
-pyicqt (0.8.1.3-1) unstable; urgency=low
-
- * New upstream version.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Fri, 20 Feb 2009 13:54:27 +0100
-
-pyicqt (0.8.1.2-2) unstable; urgency=low
-
- * Upload to unstable.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Sun, 15 Feb 2009 13:54:32 +0100
-
-pyicqt (0.8.1.2-1) experimental; urgency=low
-
- * New upstream version (fixes recent connection problems for some users,
- especially in Russia).
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Fri, 23 Jan 2009 11:26:34 +0100
-
-pyicqt (0.8.1.1-1) experimental; urgency=low
-
- * New upstream version.
- * RemovePID patch si not needed anymore, fixed upstream different way.
- * Remove failure-report patch, it only brought problems (-D shows all errors
- in log, exceptions and errors should be there anyway).
- * Do not install python modules executable.
- * Update debian/copyright to match current upstream authors.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Fri, 16 Jan 2009 09:04:51 +0100
-
-pyicqt (0.8.1final-1) experimental; urgency=low
-
- * New upstream version (appended final to version to workaround changed
- versioning scheme without introducing epoch, which I think would be
- overhead for such minor change).
- * Still upload to experimental to avoid possible problems when fix for Lenny
- has to be uploaded.
- * Fix watch file to match new upstream name (pyicq-t -> pyicqt).
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Sun, 14 Dec 2008 14:22:51 +0100
-
-pyicqt (0.8.1b3-1) experimental; urgency=low
-
- [ Sandro Tosi ]
- * debian/control
- - switch Vcs-Browser field to viewsvn
-
- [ Michal ÄŒihaÅ™ ]
- * New upstream unstable version.
- * Switch to quilt instead of dpatch.
- * Install munin plugins and suggest munin-node.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Mon, 10 Nov 2008 11:29:38 +0100
-
-pyicqt (0.8.1b2-1) experimental; urgency=low
-
- * New upstream unstable version.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Tue, 07 Oct 2008 13:48:03 +0200
-
-pyicqt (0.8.1b-1) experimental; urgency=low
-
- * New upstream unstable version.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Tue, 16 Sep 2008 22:44:34 +0200
-
-pyicqt (0.8.1a3-1) experimental; urgency=low
-
- * New upstream alpha version.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Sun, 31 Aug 2008 20:06:05 +0200
-
-pyicqt (0.8.1a2-1) experimental; urgency=low
-
- * New upstream alpha version.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Mon, 18 Aug 2008 12:21:58 +0200
-
-pyicqt (0.8.1a-1) experimental; urgency=low
-
- * New upstream alpha version.
- * Add comments to patches.
- * Wrap very long lines in debian/copyright.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Thu, 31 Jul 2008 10:11:06 +0200
-
-pyicqt (0.8b-5) unstable; urgency=low
-
- * Reimplement missing removePID (Closes: #489311).
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Sun, 06 Jul 2008 23:23:02 +0200
-
-pyicqt (0.8b-4) unstable; urgency=low
-
- * Fix names of suggested jabber daemons.
- * Update to standards 3.8.0.
- * Use new dh command to simplify debian/rules.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Sat, 07 Jun 2008 12:37:23 +0200
-
-pyicqt (0.8b-3) unstable; urgency=low
-
- * Use LSB logging functions in init script.
- * Report startup failures.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Mon, 14 Apr 2008 16:00:25 +0200
-
-pyicqt (0.8b-2) unstable; urgency=low
-
- * Delete pyicqt user and group on purge.
- * Fix accidentally mistaken config file name.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Mon, 03 Mar 2008 17:56:22 +0100
-
-pyicqt (0.8b-1) unstable; urgency=low
-
- * New upstream version (Closes: #461633).
- - This version includes charset patches (Closes: #453959).
- * Adding myself as maintainer, PAPT and Patrick as uploaders.
- * Acknowledge my own NMUs:
- - Fix crash with current twisted (Closes: #436935, #441023).
- - Fix missing dependency (Closes: #439778).
- * Fixed watch file (Closes: #456487).
- * Switched package away from CDBS (based on my pyaimt package).
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Thu, 28 Feb 2008 17:42:57 +0100
-
-pyicqt (0.8a-1.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * Fix crash with current twisted (Closes: #436935, #441023).
- * Fix missing dependency (Closes: #439778).
- * I know there could be done more for this package, but this is just a NMU
- to fix most annoying breakages.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Tue, 16 Oct 2007 22:43:52 +0900
-
-pyicqt (0.8a-1) unstable; urgency=low
-
- * Initial release (Closes: #406659)
- * Added postinst, postrm and logrotate scripts. Thanks to Sam Morris
- <sam at robots.org.uk>.
- * Added patches/01_header-dont-use-env.dpatch in order to fulfill
- policy section 10.4.
- * Added patches/02_adapt-default-config-options.dpatch since pid
- handling will be done by the system itself + several extensions e.g.
- avatar and webinterface support need to be disabled by default.
-
- -- Patrick Ringl <patrick_ at freenet.de> Mon, 25 Jun 2007 16:24:52 +0200
Copied: packages/pyicqt/tags/0.8.1.5-5/debian/changelog (from rev 8653, packages/pyicqt/trunk/debian/changelog)
===================================================================
--- packages/pyicqt/tags/0.8.1.5-5/debian/changelog (rev 0)
+++ packages/pyicqt/tags/0.8.1.5-5/debian/changelog 2012-05-09 11:54:33 UTC (rev 8654)
@@ -0,0 +1,208 @@
+pyicqt (0.8.1.5-5) unstable; urgency=low
+
+ * Fixed warning printed on startup (Closes: #611479).
+ * Avoid modification of files during build (Closes: #671542).
+ * Bump standards to 3.9.3.
+ * Use dh_python2.
+ * Implement status command in init script.
+ * Add build-arch/indep targets to debian/rules.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Wed, 09 May 2012 13:52:20 +0200
+
+pyicqt (0.8.1.5-4) unstable; urgency=low
+
+ * Fix watch file to work after recent changes on code.google.com.
+ * Fix permissions of /var/lib/pyicqt (Closes: #600083).
+ * Bump standards to 3.9.1.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Tue, 26 Oct 2010 15:40:57 +0200
+
+pyicqt (0.8.1.5-3) unstable; urgency=low
+
+ * Init script should depend on $remote_fs.
+ * We don't need python-dev for building.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Sat, 02 Jan 2010 12:58:32 +0100
+
+pyicqt (0.8.1.5-2) unstable; urgency=low
+
+ * Adjust provided service name in init script.
+ * Fix naming of init script in source package.
+ * Convert to 3.0 (quilt) source format.
+ * Add DEP-3 compliant headers to patches.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Mon, 23 Nov 2009 13:09:55 +0100
+
+pyicqt (0.8.1.5-1) unstable; urgency=low
+
+ * New upstream version.
+ - Should fix some memory leaks.
+ * Add missing README.source.
+ * Update to standards 3.8.3.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Mon, 24 Aug 2009 22:04:40 +0200
+
+pyicqt (0.8.1.4-1) unstable; urgency=low
+
+ * New upstream version.
+ * Update to standards 3.8.2.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Tue, 11 Aug 2009 23:04:56 +0200
+
+pyicqt (0.8.1.3-2) unstable; urgency=low
+
+ * Do not ship /var/run/pyicqt in package.
+ * Update to standards 3.8.1.
+ * Switch to python-support.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Thu, 07 May 2009 14:41:41 +0200
+
+pyicqt (0.8.1.3-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Fri, 20 Feb 2009 13:54:27 +0100
+
+pyicqt (0.8.1.2-2) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Sun, 15 Feb 2009 13:54:32 +0100
+
+pyicqt (0.8.1.2-1) experimental; urgency=low
+
+ * New upstream version (fixes recent connection problems for some users,
+ especially in Russia).
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Fri, 23 Jan 2009 11:26:34 +0100
+
+pyicqt (0.8.1.1-1) experimental; urgency=low
+
+ * New upstream version.
+ * RemovePID patch si not needed anymore, fixed upstream different way.
+ * Remove failure-report patch, it only brought problems (-D shows all errors
+ in log, exceptions and errors should be there anyway).
+ * Do not install python modules executable.
+ * Update debian/copyright to match current upstream authors.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Fri, 16 Jan 2009 09:04:51 +0100
+
+pyicqt (0.8.1final-1) experimental; urgency=low
+
+ * New upstream version (appended final to version to workaround changed
+ versioning scheme without introducing epoch, which I think would be
+ overhead for such minor change).
+ * Still upload to experimental to avoid possible problems when fix for Lenny
+ has to be uploaded.
+ * Fix watch file to match new upstream name (pyicq-t -> pyicqt).
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Sun, 14 Dec 2008 14:22:51 +0100
+
+pyicqt (0.8.1b3-1) experimental; urgency=low
+
+ [ Sandro Tosi ]
+ * debian/control
+ - switch Vcs-Browser field to viewsvn
+
+ [ Michal ÄŒihaÅ™ ]
+ * New upstream unstable version.
+ * Switch to quilt instead of dpatch.
+ * Install munin plugins and suggest munin-node.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Mon, 10 Nov 2008 11:29:38 +0100
+
+pyicqt (0.8.1b2-1) experimental; urgency=low
+
+ * New upstream unstable version.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Tue, 07 Oct 2008 13:48:03 +0200
+
+pyicqt (0.8.1b-1) experimental; urgency=low
+
+ * New upstream unstable version.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Tue, 16 Sep 2008 22:44:34 +0200
+
+pyicqt (0.8.1a3-1) experimental; urgency=low
+
+ * New upstream alpha version.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Sun, 31 Aug 2008 20:06:05 +0200
+
+pyicqt (0.8.1a2-1) experimental; urgency=low
+
+ * New upstream alpha version.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Mon, 18 Aug 2008 12:21:58 +0200
+
+pyicqt (0.8.1a-1) experimental; urgency=low
+
+ * New upstream alpha version.
+ * Add comments to patches.
+ * Wrap very long lines in debian/copyright.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Thu, 31 Jul 2008 10:11:06 +0200
+
+pyicqt (0.8b-5) unstable; urgency=low
+
+ * Reimplement missing removePID (Closes: #489311).
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Sun, 06 Jul 2008 23:23:02 +0200
+
+pyicqt (0.8b-4) unstable; urgency=low
+
+ * Fix names of suggested jabber daemons.
+ * Update to standards 3.8.0.
+ * Use new dh command to simplify debian/rules.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Sat, 07 Jun 2008 12:37:23 +0200
+
+pyicqt (0.8b-3) unstable; urgency=low
+
+ * Use LSB logging functions in init script.
+ * Report startup failures.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Mon, 14 Apr 2008 16:00:25 +0200
+
+pyicqt (0.8b-2) unstable; urgency=low
+
+ * Delete pyicqt user and group on purge.
+ * Fix accidentally mistaken config file name.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Mon, 03 Mar 2008 17:56:22 +0100
+
+pyicqt (0.8b-1) unstable; urgency=low
+
+ * New upstream version (Closes: #461633).
+ - This version includes charset patches (Closes: #453959).
+ * Adding myself as maintainer, PAPT and Patrick as uploaders.
+ * Acknowledge my own NMUs:
+ - Fix crash with current twisted (Closes: #436935, #441023).
+ - Fix missing dependency (Closes: #439778).
+ * Fixed watch file (Closes: #456487).
+ * Switched package away from CDBS (based on my pyaimt package).
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Thu, 28 Feb 2008 17:42:57 +0100
+
+pyicqt (0.8a-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix crash with current twisted (Closes: #436935, #441023).
+ * Fix missing dependency (Closes: #439778).
+ * I know there could be done more for this package, but this is just a NMU
+ to fix most annoying breakages.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Tue, 16 Oct 2007 22:43:52 +0900
+
+pyicqt (0.8a-1) unstable; urgency=low
+
+ * Initial release (Closes: #406659)
+ * Added postinst, postrm and logrotate scripts. Thanks to Sam Morris
+ <sam at robots.org.uk>.
+ * Added patches/01_header-dont-use-env.dpatch in order to fulfill
+ policy section 10.4.
+ * Added patches/02_adapt-default-config-options.dpatch since pid
+ handling will be done by the system itself + several extensions e.g.
+ avatar and webinterface support need to be disabled by default.
+
+ -- Patrick Ringl <patrick_ at freenet.de> Mon, 25 Jun 2007 16:24:52 +0200
Deleted: packages/pyicqt/tags/0.8.1.5-5/debian/control
===================================================================
--- packages/pyicqt/trunk/debian/control 2012-05-09 03:59:31 UTC (rev 8641)
+++ packages/pyicqt/tags/0.8.1.5-5/debian/control 2012-05-09 11:54:33 UTC (rev 8654)
@@ -1,30 +0,0 @@
-Source: pyicqt
-Section: net
-Priority: extra
-Maintainer: Michal ÄŒihaÅ™ <nijel at debian.org>
-Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>, Patrick Ringl <patrick_ at freenet.de>
-Build-Depends: debhelper (>= 7.0.14)
-Build-Depends-Indep: python, python-support (>= 0.5.3)
-Standards-Version: 3.9.1
-Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/pyicqt/trunk
-Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/pyicqt/trunk/
-Homepage: http://code.google.com/p/pyicqt/
-
-Package: pyicqt
-Architecture: all
-Depends: ${python:Depends},
- ${misc:Depends},
- lsb-base (>= 3.0-6),
- python-twisted (>=2.0.0),
- python-twisted-web (>=0.5.0),
- python-twisted-words (>= 0.1.0),
- python-crypto,
- python-openssl,
- adduser
-Suggests: ejabberd | jabber | jabberd2, munin-node
-Recommends: python-nevow (>= 0.4.1), python-mysqldb (>= 1.0.0), python-imaging
-XB-Python-Version: ${python:Versions}
-Description: ICQ transport for Jabber
- PyICQt provides a gateway which allows Jabber users to communicate with their
- contacts on the ICQ Messenger network. It can connect to any Jabber server
- that supports the Connect component mechanism.
Copied: packages/pyicqt/tags/0.8.1.5-5/debian/control (from rev 8649, packages/pyicqt/trunk/debian/control)
===================================================================
--- packages/pyicqt/tags/0.8.1.5-5/debian/control (rev 0)
+++ packages/pyicqt/tags/0.8.1.5-5/debian/control 2012-05-09 11:54:33 UTC (rev 8654)
@@ -0,0 +1,29 @@
+Source: pyicqt
+Section: net
+Priority: extra
+Maintainer: Michal ÄŒihaÅ™ <nijel at debian.org>
+Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>, Patrick Ringl <patrick_ at freenet.de>
+Build-Depends: debhelper (>= 7.0.14)
+Build-Depends-Indep: python (>= 2.6.6-3~)
+Standards-Version: 3.9.3
+Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/pyicqt/trunk
+Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/pyicqt/trunk/
+Homepage: http://code.google.com/p/pyicqt/
+
+Package: pyicqt
+Architecture: all
+Depends: ${python:Depends},
+ ${misc:Depends},
+ lsb-base (>= 3.0-6),
+ python-twisted (>=2.0.0),
+ python-twisted-web (>=0.5.0),
+ python-twisted-words (>= 0.1.0),
+ python-crypto,
+ python-openssl,
+ adduser
+Suggests: ejabberd | jabber | jabberd2, munin-node
+Recommends: python-nevow (>= 0.4.1), python-mysqldb (>= 1.0.0), python-imaging
+Description: ICQ transport for Jabber
+ PyICQt provides a gateway which allows Jabber users to communicate with their
+ contacts on the ICQ Messenger network. It can connect to any Jabber server
+ that supports the Connect component mechanism.
Deleted: packages/pyicqt/tags/0.8.1.5-5/debian/patches/adapt-default-config-options.patch
===================================================================
--- packages/pyicqt/trunk/debian/patches/adapt-default-config-options.patch 2012-05-09 03:59:31 UTC (rev 8641)
+++ packages/pyicqt/tags/0.8.1.5-5/debian/patches/adapt-default-config-options.patch 2012-05-09 11:54:33 UTC (rev 8654)
@@ -1,31 +0,0 @@
-Subject: Addapt default config options to match Debian package needs.
- - PID and spool are default to correct place, it's better for user not to touch these.
- - Avatars are disabled by default, because we do not depend on PIL.
-From: Michal ÄŒihaÅ™ <nijel at debian.org>
-
---- a/config_example.xml
-+++ b/config_example.xml
-@@ -5,14 +5,6 @@
- <!-- The component JID of the transport. Unless you're doing clustering, leave this alone -->
- <!-- <compjid>icq1</compjid> -->
-
-- <!-- The location of the spool directory.. if relative, relative to -->
-- <!-- this directory. Do not include the jid of the transport. -->
-- <spooldir>.</spooldir>
--
-- <!-- The location of the PID file.. if relative, relative to this dir. -->
-- <!-- Comment out if you do not want a pid file -->
-- <pid>PyICQt.pid</pid>
--
- <!-- The IP address of the main Jabberd server -->
- <mainServer>127.0.0.1</mainServer>
-
-@@ -160,7 +152,7 @@
-
- <!-- Disable all avatar functionality. Might be necessary if you -->
- <!-- do not have PIL installed. -->
-- <!-- <disableAvatars/> -->
-+ <disableAvatars/>
-
- <!-- Enable web presence indicator. This can increase ICQ spam. -->
- <!-- <enableWebPresence/> -->
Copied: packages/pyicqt/tags/0.8.1.5-5/debian/patches/adapt-default-config-options.patch (from rev 8642, packages/pyicqt/trunk/debian/patches/adapt-default-config-options.patch)
===================================================================
--- packages/pyicqt/tags/0.8.1.5-5/debian/patches/adapt-default-config-options.patch (rev 0)
+++ packages/pyicqt/tags/0.8.1.5-5/debian/patches/adapt-default-config-options.patch 2012-05-09 11:54:33 UTC (rev 8654)
@@ -0,0 +1,31 @@
+Subject: Addapt default config options to match Debian package needs.
+ - PID and spool are default to correct place, it's better for user not to touch these.
+ - Avatars are disabled by default, because we do not depend on PIL.
+From: Michal ÄŒihaÅ™ <nijel at debian.org>
+
+--- a/config_example.xml
++++ b/config_example.xml
+@@ -5,14 +5,6 @@
+ <!-- The component JID of the transport. Unless you're doing clustering, leave this alone -->
+ <!-- <compjid>icq1</compjid> -->
+
+- <!-- The location of the spool directory.. if relative, relative to -->
+- <!-- this directory. Do not include the jid of the transport. -->
+- <spooldir>.</spooldir>
+-
+- <!-- The location of the PID file.. if relative, relative to this dir. -->
+- <!-- Comment out if you do not want a pid file -->
+- <pid>PyICQt.pid</pid>
+-
+ <!-- The IP address of the main Jabberd server -->
+ <mainServer>127.0.0.1</mainServer>
+
+@@ -168,7 +160,7 @@
+
+ <!-- Disable all avatar functionality. Might be necessary if you -->
+ <!-- do not have PIL installed. -->
+- <!-- <disableAvatars/> -->
++ <disableAvatars/>
+
+ <!-- Enable web presence indicator. This can increase ICQ spam. -->
+ <!-- <enableWebPresence/> -->
Copied: packages/pyicqt/tags/0.8.1.5-5/debian/patches/no_error.patch (from rev 8643, packages/pyicqt/trunk/debian/patches/no_error.patch)
===================================================================
--- packages/pyicqt/tags/0.8.1.5-5/debian/patches/no_error.patch (rev 0)
+++ packages/pyicqt/tags/0.8.1.5-5/debian/patches/no_error.patch 2012-05-09 11:54:33 UTC (rev 8654)
@@ -0,0 +1,14 @@
+From: Stephan Thamm <thammi at chaossource.net>
+Subject: Fixes tuple out of range error
+diff -Naur pyicqt-0.8.1.5.orig/src/debug.py pyicqt-0.8.1.5/src/debug.py
+--- pyicqt-0.8.1.5.orig/src/debug.py 2009-08-24 14:37:59.000000000 +0200
++++ pyicqt-0.8.1.5/src/debug.py 2012-05-02 08:38:45.652740630 +0200
+@@ -15,7 +15,7 @@
+
+ def observer2(eventDict):
+ edm = eventDict['message']
+- if isinstance(edm, tuple): # LogEvent can be in tuple
++ if isinstance(edm, tuple) and len(edm): # LogEvent can be in tuple
+ edm = edm[0]
+ if isinstance(edm, LogEvent):
+ if edm.category == INFO and config.debugLevel < 3:
Deleted: packages/pyicqt/tags/0.8.1.5-5/debian/patches/series
===================================================================
--- packages/pyicqt/trunk/debian/patches/series 2012-05-09 03:59:31 UTC (rev 8641)
+++ packages/pyicqt/tags/0.8.1.5-5/debian/patches/series 2012-05-09 11:54:33 UTC (rev 8654)
@@ -1,2 +0,0 @@
-header-dont-use-env.patch
-adapt-default-config-options.patch
Copied: packages/pyicqt/tags/0.8.1.5-5/debian/patches/series (from rev 8642, packages/pyicqt/trunk/debian/patches/series)
===================================================================
--- packages/pyicqt/tags/0.8.1.5-5/debian/patches/series (rev 0)
+++ packages/pyicqt/tags/0.8.1.5-5/debian/patches/series 2012-05-09 11:54:33 UTC (rev 8654)
@@ -0,0 +1,3 @@
+header-dont-use-env.patch
+adapt-default-config-options.patch
+no_error.patch
Deleted: packages/pyicqt/tags/0.8.1.5-5/debian/pycompat
===================================================================
--- packages/pyicqt/trunk/debian/pycompat 2012-05-09 03:59:31 UTC (rev 8641)
+++ packages/pyicqt/tags/0.8.1.5-5/debian/pycompat 2012-05-09 11:54:33 UTC (rev 8654)
@@ -1 +0,0 @@
-2
Deleted: packages/pyicqt/tags/0.8.1.5-5/debian/pyicqt.init
===================================================================
--- packages/pyicqt/trunk/debian/pyicqt.init 2012-05-09 03:59:31 UTC (rev 8641)
+++ packages/pyicqt/tags/0.8.1.5-5/debian/pyicqt.init 2012-05-09 11:54:33 UTC (rev 8654)
@@ -1,68 +0,0 @@
-#! /bin/bash
-### BEGIN INIT INFO
-# Provides: pyicqt
-# Required-Start: $syslog $remote_fs
-# Required-Stop: $syslog $remote_fs
-# Should-Start: $local_fs
-# Should-Stop: $local_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: starts ICQ transport for Jabber
-# Description: starts PyICQt which provides a gateway that allows Jabber users to communicate with their
-# contacts on the ICQ Messenger network. It can connect to any Jabber server
-# that supports the Connect component mechanism.
-### END INIT INFO
-
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-. /lib/lsb/init-functions
-
-NAME=pyicqt
-DESC="ICQ transport for Jabber"
-
-PIDDIR=/var/run/pyicqt
-PIDFILE=$PIDDIR/$NAME.pid
-USER=pyicqt
-GROUP=pyicqt
-
-SSD_OPTS="--pidfile=$PIDFILE --name=python --user=$USER"
-
-DAEMON=/usr/bin/python
-OPTIONS="/usr/share/pyicqt/PyICQt.py --config=/etc/pyicqt.conf.xml --background -o pid=$PIDFILE -o spooldir=/var/lib/pyicqt -d --log=/var/log/pyicqt/pyicqt.log"
-
-test -f $DAEMON || exit 0
-
-if test ! -e $PIDDIR; then
- mkdir $PIDDIR
- chown $USER:$GROUP $PIDDIR
-fi
-
-case "$1" in
-start)
- log_daemon_msg "Starting $DESC" "$NAME"
- start-stop-daemon --start $SSD_OPTS --startas "$DAEMON" --chuid "$USER" -- $OPTIONS
- log_end_msg $?
- ;;
-stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- start-stop-daemon --stop $SSD_OPTS --retry 10
- log_end_msg $?
- ;;
-reload|force-reload)
- log_daemon_msg "Reloading $DESC" "$NAME"
- start-stop-daemon --stop $SSD_OPTS --signal HUP
- log_end_msg $?
- ;;
-restart)
- $0 stop
- $0 start
- ;;
-*)
- echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
-
-# vim: filetype=sh
Copied: packages/pyicqt/tags/0.8.1.5-5/debian/pyicqt.init (from rev 8651, packages/pyicqt/trunk/debian/pyicqt.init)
===================================================================
--- packages/pyicqt/tags/0.8.1.5-5/debian/pyicqt.init (rev 0)
+++ packages/pyicqt/tags/0.8.1.5-5/debian/pyicqt.init 2012-05-09 11:54:33 UTC (rev 8654)
@@ -0,0 +1,71 @@
+#! /bin/bash
+### BEGIN INIT INFO
+# Provides: pyicqt
+# Required-Start: $syslog $remote_fs
+# Required-Stop: $syslog $remote_fs
+# Should-Start: $local_fs
+# Should-Stop: $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: starts ICQ transport for Jabber
+# Description: starts PyICQt which provides a gateway that allows Jabber users to communicate with their
+# contacts on the ICQ Messenger network. It can connect to any Jabber server
+# that supports the Connect component mechanism.
+### END INIT INFO
+
+export PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+. /lib/lsb/init-functions
+
+NAME=pyicqt
+DESC="ICQ transport for Jabber"
+
+PIDDIR=/var/run/pyicqt
+PIDFILE=$PIDDIR/$NAME.pid
+USER=pyicqt
+GROUP=pyicqt
+
+SSD_OPTS="--pidfile=$PIDFILE --name=python --user=$USER"
+
+DAEMON=/usr/bin/python
+OPTIONS="/usr/share/pyicqt/PyICQt.py --config=/etc/pyicqt.conf.xml --background -o pid=$PIDFILE -o spooldir=/var/lib/pyicqt -d --log=/var/log/pyicqt/pyicqt.log"
+
+test -f $DAEMON || exit 0
+
+if test ! -e $PIDDIR; then
+ mkdir $PIDDIR
+ chown $USER:$GROUP $PIDDIR
+fi
+
+case "$1" in
+start)
+ log_daemon_msg "Starting $DESC" "$NAME"
+ start-stop-daemon --start $SSD_OPTS --startas "$DAEMON" --chuid "$USER" -- $OPTIONS
+ log_end_msg $?
+ ;;
+stop)
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ start-stop-daemon --stop $SSD_OPTS --retry 10
+ log_end_msg $?
+ ;;
+reload|force-reload)
+ log_daemon_msg "Reloading $DESC" "$NAME"
+ start-stop-daemon --stop $SSD_OPTS --signal HUP
+ log_end_msg $?
+ ;;
+restart)
+ $0 stop
+ $0 start
+ ;;
+status)
+ status_of_proc -p $PIDFILE "$DAEMON" "$NAME" && exit 0 || exit $?
+ ;;
+*)
+ echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
+
+# vim: filetype=sh
Deleted: packages/pyicqt/tags/0.8.1.5-5/debian/rules
===================================================================
--- packages/pyicqt/trunk/debian/rules 2012-05-09 03:59:31 UTC (rev 8641)
+++ packages/pyicqt/tags/0.8.1.5-5/debian/rules 2012-05-09 11:54:33 UTC (rev 8654)
@@ -1,27 +0,0 @@
-#!/usr/bin/make -f
-
-#export DH_VERBOSE=1
-
-build: build-stamp
-
-build-stamp:
- chmod -x src/chardet_utf/*
- dh build
- cp config_example.xml pyicqt.conf.xml
- chmod -x PyICQt.py
- touch $@
-
-clean:
- dh clean
-
-install: build
- dh install
-
-binary-indep: build install
- dh binary-indep
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install
Copied: packages/pyicqt/tags/0.8.1.5-5/debian/rules (from rev 8652, packages/pyicqt/trunk/debian/rules)
===================================================================
--- packages/pyicqt/tags/0.8.1.5-5/debian/rules (rev 0)
+++ packages/pyicqt/tags/0.8.1.5-5/debian/rules 2012-05-09 11:54:33 UTC (rev 8654)
@@ -0,0 +1,30 @@
+#!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+
+build-stamp:
+ chmod -x src/chardet_utf/*
+ dh build --with python2
+ chmod -x PyICQt.py
+ cp config_example.xml pyicqt.conf.xml
+ touch $@
+
+clean:
+ rm -f pyicqt.conf.xml
+ dh clean --with python2
+
+install: build
+ dh install --with python2
+
+binary-indep: build install
+ dh binary-indep --with python2
+
+binary-arch: build install
+
+binary: binary-indep binary-arch
+
+.PHONY: build clean binary-indep binary-arch binary install
More information about the Python-apps-commits
mailing list