[Python-apps-commits] r1958 - in packages/pyicqt/trunk/debian (13 files)
nijel at users.alioth.debian.org
nijel at users.alioth.debian.org
Mon Nov 10 10:10:38 UTC 2008
Date: Monday, November 10, 2008 @ 10:10:37
Author: nijel
Revision: 1958
* New upstream unstable version.
* Switch to quilt instead of dpatch.
Added:
packages/pyicqt/trunk/debian/patches/adapt-default-config-options.patch
(from rev 1956, packages/pyicqt/trunk/debian/patches/02_adapt-default-config-options.dpatch)
packages/pyicqt/trunk/debian/patches/failure-report.patch
(from rev 1956, packages/pyicqt/trunk/debian/patches/05_failure-report.dpatch)
packages/pyicqt/trunk/debian/patches/header-dont-use-env.patch
(from rev 1956, packages/pyicqt/trunk/debian/patches/01_header-dont-use-env.dpatch)
packages/pyicqt/trunk/debian/patches/remove_pid.patch
(from rev 1956, packages/pyicqt/trunk/debian/patches/06_remove_pid.dpatch)
packages/pyicqt/trunk/debian/patches/series
(from rev 1956, packages/pyicqt/trunk/debian/patches/00list)
Modified:
packages/pyicqt/trunk/debian/changelog
packages/pyicqt/trunk/debian/control
packages/pyicqt/trunk/debian/rules
Deleted:
packages/pyicqt/trunk/debian/patches/00list
packages/pyicqt/trunk/debian/patches/01_header-dont-use-env.dpatch
packages/pyicqt/trunk/debian/patches/02_adapt-default-config-options.dpatch
packages/pyicqt/trunk/debian/patches/05_failure-report.dpatch
packages/pyicqt/trunk/debian/patches/06_remove_pid.dpatch
Modified: packages/pyicqt/trunk/debian/changelog
===================================================================
--- packages/pyicqt/trunk/debian/changelog 2008-11-10 10:00:54 UTC (rev 1957)
+++ packages/pyicqt/trunk/debian/changelog 2008-11-10 10:10:37 UTC (rev 1958)
@@ -1,14 +1,15 @@
pyicqt (0.8.1b3-1) experimental; urgency=low
- [ Michal ÄŒihaÅ™ ]
- * New upstream unstable version.
-
[ Sandro Tosi ]
* debian/control
- switch Vcs-Browser field to viewsvn
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Mon, 10 Nov 2008 10:59:04 +0100
+ [ Michal ÄŒihaÅ™ ]
+ * New upstream unstable version.
+ * Switch to quilt instead of dpatch.
+ -- Michal ÄŒihaÅ™ <nijel at debian.org> Mon, 10 Nov 2008 11:10:18 +0100
+
pyicqt (0.8.1b2-1) experimental; urgency=low
* New upstream unstable version.
Modified: packages/pyicqt/trunk/debian/control
===================================================================
--- packages/pyicqt/trunk/debian/control 2008-11-10 10:00:54 UTC (rev 1957)
+++ packages/pyicqt/trunk/debian/control 2008-11-10 10:10:37 UTC (rev 1958)
@@ -3,7 +3,7 @@
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), dpatch
+Build-Depends: debhelper (>= 7), quilt (>= 0.40)
Build-Depends-Indep: python-dev, python-central (>= 0.6.7)
XS-Python-Version: current
Standards-Version: 3.8.0
Deleted: packages/pyicqt/trunk/debian/patches/00list
===================================================================
--- packages/pyicqt/trunk/debian/patches/00list 2008-11-10 10:00:54 UTC (rev 1957)
+++ packages/pyicqt/trunk/debian/patches/00list 2008-11-10 10:10:37 UTC (rev 1958)
@@ -1,4 +0,0 @@
-01_header-dont-use-env
-02_adapt-default-config-options
-05_failure-report
-06_remove_pid
Deleted: packages/pyicqt/trunk/debian/patches/01_header-dont-use-env.dpatch
===================================================================
--- packages/pyicqt/trunk/debian/patches/01_header-dont-use-env.dpatch 2008-11-10 10:00:54 UTC (rev 1957)
+++ packages/pyicqt/trunk/debian/patches/01_header-dont-use-env.dpatch 2008-11-10 10:10:37 UTC (rev 1958)
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_header-dont-use-env.patch.dpatch by <patrick_ at freenet.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Do not use /usr/bin/env to start this script.
-
-diff -Nur pyicq-t-0.8a/PyICQt.py pyicq-t-0.8a.new/PyICQt.py
---- pyicq-t-0.8a/PyICQt.py 2007-06-04 03:10:36.000000000 +0200
-+++ pyicq-t-0.8a.new/PyICQt.py 2007-06-08 23:33:59.000000000 +0200
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- # Make 'cwd'/src in the PYTHONPATH
- import sys, os, os.path
- PATH = os.path.abspath(os.path.dirname(sys.argv[0]))
Deleted: packages/pyicqt/trunk/debian/patches/02_adapt-default-config-options.dpatch
===================================================================
--- packages/pyicqt/trunk/debian/patches/02_adapt-default-config-options.dpatch 2008-11-10 10:00:54 UTC (rev 1957)
+++ packages/pyicqt/trunk/debian/patches/02_adapt-default-config-options.dpatch 2008-11-10 10:10:37 UTC (rev 1958)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_adapt-default-config-options.patch.dpatch by <patrick_ at freenet.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Addapt default config options to match Debian package.
-
-diff -Nur pyicq-t-0.8a/config_example.xml pyicq-t-0.8a.new/config_example.xml
---- pyicq-t-0.8a/config_example.xml 2007-06-04 03:10:36.000000000 +0200
-+++ pyicq-t-0.8a.new/config_example.xml 2007-06-08 22:49:12.000000000 +0200
-@@ -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>
-
-@@ -139,7 +131,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/> -->
Deleted: packages/pyicqt/trunk/debian/patches/05_failure-report.dpatch
===================================================================
--- packages/pyicqt/trunk/debian/patches/05_failure-report.dpatch 2008-11-10 10:00:54 UTC (rev 1957)
+++ packages/pyicqt/trunk/debian/patches/05_failure-report.dpatch 2008-11-10 10:10:37 UTC (rev 1958)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_failure-report.dpatch by Derrick Hudson <dman at dman13.dyndns.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Show error on startup.
-
- at DPATCH@
-Index: PyICQt.py
-===================================================================
---- a/PyICQt.py (revision 249)
-+++ /bPyICQt.py (working copy)
-@@ -11,4 +11,8 @@
- import profile
- profile.run('main.main()', main.profilelog)
- else:
-- main.main()
-+ try:
-+ main.main()
-+ except:
-+ import traceback
-+ traceback.print_trace()
Deleted: packages/pyicqt/trunk/debian/patches/06_remove_pid.dpatch
===================================================================
--- packages/pyicqt/trunk/debian/patches/06_remove_pid.dpatch 2008-11-10 10:00:54 UTC (rev 1957)
+++ packages/pyicqt/trunk/debian/patches/06_remove_pid.dpatch 2008-11-10 10:10:37 UTC (rev 1958)
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_remove_pid.dpatch by Michal ÄŒihaÅ™ <nijel at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Reimplement removePID, it seems to be missing in current twisted.
-
- at DPATCH@
-diff -urNad pyicqt-0.8b~/src/main.py pyicqt-0.8b/src/main.py
---- pyicqt-0.8b~/src/main.py 2008-01-06 13:14:51.000000000 +0100
-+++ pyicqt-0.8b/src/main.py 2008-07-06 23:18:24.000000000 +0200
-@@ -430,11 +430,23 @@
- pf.write("%s\n" % pid)
- pf.close()
-
-+ def removePID(self):
-+ try:
-+ os.unlink(config.pid)
-+ except OSError, e:
-+ if e.errno == errno.EACCES or e.errno == errno.EPERM:
-+ print "Warning: No permission to delete pid file"
-+ else:
-+ print "Failed to unlink PID file:"
-+ print e
-+ except:
-+ print "Failed to unlink PID file"
-+
- def shuttingDown(self):
- self.transportSvc.removeMe()
- def cb(ignored=None):
- if config.pid:
-- twistd.removePID(config.pid)
-+ self.removePID()
- d = Deferred()
- d.addCallback(cb)
- reactor.callLater(3.0, d.callback, None)
Copied: packages/pyicqt/trunk/debian/patches/adapt-default-config-options.patch (from rev 1956, packages/pyicqt/trunk/debian/patches/02_adapt-default-config-options.dpatch)
===================================================================
--- packages/pyicqt/trunk/debian/patches/adapt-default-config-options.patch (rev 0)
+++ packages/pyicqt/trunk/debian/patches/adapt-default-config-options.patch 2008-11-10 10:10:37 UTC (rev 1958)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_adapt-default-config-options.patch.dpatch by <patrick_ at freenet.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Addapt default config options to match Debian package.
+
+--- 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/> -->
Property changes on: packages/pyicqt/trunk/debian/patches/adapt-default-config-options.patch
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Copied: packages/pyicqt/trunk/debian/patches/failure-report.patch (from rev 1956, packages/pyicqt/trunk/debian/patches/05_failure-report.dpatch)
===================================================================
--- packages/pyicqt/trunk/debian/patches/failure-report.patch (rev 0)
+++ packages/pyicqt/trunk/debian/patches/failure-report.patch 2008-11-10 10:10:37 UTC (rev 1958)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_failure-report.dpatch by Derrick Hudson <dman at dman13.dyndns.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Show error on startup.
+
+ at DPATCH@
+--- a/PyICQt.py
++++ b/PyICQt.py
+@@ -11,4 +11,8 @@
+ import profile
+ profile.run('main.main()', main.profilelog)
+ else:
+- main.main()
++ try:
++ main.main()
++ except:
++ import traceback
++ traceback.print_trace()
Property changes on: packages/pyicqt/trunk/debian/patches/failure-report.patch
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Copied: packages/pyicqt/trunk/debian/patches/header-dont-use-env.patch (from rev 1956, packages/pyicqt/trunk/debian/patches/01_header-dont-use-env.dpatch)
===================================================================
--- packages/pyicqt/trunk/debian/patches/header-dont-use-env.patch (rev 0)
+++ packages/pyicqt/trunk/debian/patches/header-dont-use-env.patch 2008-11-10 10:10:37 UTC (rev 1958)
@@ -0,0 +1,15 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_header-dont-use-env.patch.dpatch by <patrick_ at freenet.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not use /usr/bin/env to start this script.
+
+diff -Nur pyicq-t-0.8a/PyICQt.py pyicq-t-0.8a.new/PyICQt.py
+--- pyicq-t-0.8a/PyICQt.py 2007-06-04 03:10:36.000000000 +0200
++++ pyicq-t-0.8a.new/PyICQt.py 2007-06-08 23:33:59.000000000 +0200
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-
+ # Make 'cwd'/src in the PYTHONPATH
+ import sys, os, os.path
+ PATH = os.path.abspath(os.path.dirname(sys.argv[0]))
Property changes on: packages/pyicqt/trunk/debian/patches/header-dont-use-env.patch
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Copied: packages/pyicqt/trunk/debian/patches/remove_pid.patch (from rev 1956, packages/pyicqt/trunk/debian/patches/06_remove_pid.dpatch)
===================================================================
--- packages/pyicqt/trunk/debian/patches/remove_pid.patch (rev 0)
+++ packages/pyicqt/trunk/debian/patches/remove_pid.patch 2008-11-10 10:10:37 UTC (rev 1958)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_remove_pid.dpatch by Michal ÄŒihaÅ™ <nijel at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Reimplement removePID, it seems to be missing in current twisted.
+
+ at DPATCH@
+--- a/src/main.py
++++ b/src/main.py
+@@ -448,12 +448,24 @@
+ pf.write("%s\n" % pid)
+ pf.close()
+
++ def removePID(self):
++ try:
++ os.unlink(config.pid)
++ except OSError, e:
++ if e.errno == errno.EACCES or e.errno == errno.EPERM:
++ print "Warning: No permission to delete pid file"
++ else:
++ print "Failed to unlink PID file:"
++ print e
++ except:
++ print "Failed to unlink PID file"
++
+ def shuttingDown(self):
+ self.transportSvc.sendMessagesOnShutdown()
+ self.transportSvc.removeMe()
+ def cb(ignored=None):
+ if config.pid:
+- twistd.removePID(config.pid)
++ self.removePID()
+ d = Deferred()
+ d.addCallback(cb)
+ reactor.callLater(3.0, d.callback, None)
Property changes on: packages/pyicqt/trunk/debian/patches/remove_pid.patch
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Copied: packages/pyicqt/trunk/debian/patches/series (from rev 1956, packages/pyicqt/trunk/debian/patches/00list)
===================================================================
--- packages/pyicqt/trunk/debian/patches/series (rev 0)
+++ packages/pyicqt/trunk/debian/patches/series 2008-11-10 10:10:37 UTC (rev 1958)
@@ -0,0 +1,4 @@
+header-dont-use-env.patch
+adapt-default-config-options.patch
+failure-report.patch
+remove_pid.patch
Property changes on: packages/pyicqt/trunk/debian/patches/series
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: packages/pyicqt/trunk/debian/rules
===================================================================
--- packages/pyicqt/trunk/debian/rules 2008-11-10 10:00:54 UTC (rev 1957)
+++ packages/pyicqt/trunk/debian/rules 2008-11-10 10:10:37 UTC (rev 1958)
@@ -2,11 +2,11 @@
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
build: build-stamp
-build-stamp: patch-stamp
+build-stamp: $(QUILT_STAMPFN)
dh build
cp config_example.xml pyicqt.conf.xml
chmod -x PyICQt.py
More information about the Python-apps-commits
mailing list