[Python-apps-commits] r12941 - in packages/irker/trunk/debian (7 files)

drnlmza-guest at users.alioth.debian.org drnlmza-guest at users.alioth.debian.org
Tue Mar 15 15:53:04 UTC 2016


    Date: Tuesday, March 15, 2016 @ 15:53:03
  Author: drnlmza-guest
Revision: 12941

Update patches

Added:
  packages/irker/trunk/debian/patches/0007-irkerhook-git.patch
Modified:
  packages/irker/trunk/debian/changelog
  packages/irker/trunk/debian/control
  packages/irker/trunk/debian/patches/series
Deleted:
  packages/irker/trunk/debian/patches/0002-abbrev-commit.patch
  packages/irker/trunk/debian/patches/0003-abbrev-gitweb.patch
  packages/irker/trunk/debian/patches/0004-webview.patch

Modified: packages/irker/trunk/debian/changelog
===================================================================
--- packages/irker/trunk/debian/changelog	2016-03-15 12:58:42 UTC (rev 12940)
+++ packages/irker/trunk/debian/changelog	2016-03-15 15:53:03 UTC (rev 12941)
@@ -1,3 +1,19 @@
+irker (2.17+dfsg-1) unstable; urgency=low
+
+  * Update to latest upstream release.
+    - Adds a delay to reconnect attempts (Closes: #749650).
+    - License changed to BSD-2-clause license.
+  * Add manpage for the irkerhook-debian helper.
+  * Add 0007-irkerhook-git.patch to describer irkerhook-git in the
+    irkerhook manpage.
+  * Drop 0002-abbrev-commit.patch, 0003-abbrev-gitweb.patch and
+    0004-webview.patch, as these fixes have been incorporated
+    upstream.
+  * Change VCS-Browser field to use https instead of http.
+  * Bump Standards-Version to 3.9.7 (no changes needed).
+
+ -- Neil Muller <drnlmuller+debian at gmail.com>  Tue, 15 Mar 2016 14:55:22 +0200
+
 irker (2.13+dfsg-1) unstable; urgency=low
 
   * Adopt irker under the Python Applications Packaging Team umbrella

Modified: packages/irker/trunk/debian/control
===================================================================
--- packages/irker/trunk/debian/control	2016-03-15 12:58:42 UTC (rev 12940)
+++ packages/irker/trunk/debian/control	2016-03-15 15:53:03 UTC (rev 12941)
@@ -11,9 +11,9 @@
  systemd,
  xmlto,
  dh-python
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Homepage: http://www.catb.org/esr/irker/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/irker/trunk/
+Vcs-Browser: https://anonscm.debian.org/viewvc/python-apps/packages/irker/trunk/
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/irker/trunk/
 
 Package: irker

Deleted: packages/irker/trunk/debian/patches/0002-abbrev-commit.patch
===================================================================
--- packages/irker/trunk/debian/patches/0002-abbrev-commit.patch	2016-03-15 12:58:42 UTC (rev 12940)
+++ packages/irker/trunk/debian/patches/0002-abbrev-commit.patch	2016-03-15 15:53:03 UTC (rev 12941)
@@ -1,29 +0,0 @@
-Author: Daniel Baumann <mail at daniel-baumann.ch>
-Description:
- Showing commit IDs shortened by default to 7 characters (in line with default
- git --abbrev-commit) rather than the unusual 12.
-
-diff -Naurp irker.orig/irkerhook.py irker/irkerhook.py
---- irker.orig/irkerhook.py
-+++ irker/irkerhook.py
-@@ -262,7 +262,7 @@ class GitExtractor(GenericExtractor):
-         else: # self.revformat == 'describe'
-             commit.rev = do("git describe %s 2>/dev/null" % shellquote(commit.commit))
-         if not commit.rev:
--            commit.rev = commit.commit[:12]
-+            commit.rev = commit.commit[:7]
-         # Extract the meta-information for the commit
-         commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit))
-         commit.files = " ".join(commit.files.strip().split("\n")[1:])
-diff -Naurp irker.orig/irkerhook.xml irker/irkerhook.xml
---- irker.orig/irkerhook.xml
-+++ irker/irkerhook.xml
-@@ -216,7 +216,7 @@ may have the following values:</para>
- </varlistentry>
- <varlistentry>
- <term>short</term>
--<listitem><para>first 12 chars of hex ID</para></listitem>
-+<listitem><para>first 7 chars of hex ID</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>describe</term>

Deleted: packages/irker/trunk/debian/patches/0003-abbrev-gitweb.patch
===================================================================
--- packages/irker/trunk/debian/patches/0003-abbrev-gitweb.patch	2016-03-15 12:58:42 UTC (rev 12940)
+++ packages/irker/trunk/debian/patches/0003-abbrev-gitweb.patch	2016-03-15 15:53:03 UTC (rev 12941)
@@ -1,16 +0,0 @@
-Author: Daniel Baumann <mail at daniel-baumann.ch>
-Description:
- Showing commit IDs shortened by default to 7 characters (in line with default
- git --abbrev-commit) rather than the unusual 12 also for gitweb.
-
-diff -Naurp irker.orig/irkerhook.py irker/irkerhook.py
---- irker.orig/irkerhook.py
-+++ irker/irkerhook.py
-@@ -263,6 +263,7 @@ class GitExtractor(GenericExtractor):
-             commit.rev = do("git describe %s 2>/dev/null" % shellquote(commit.commit))
-         if not commit.rev:
-             commit.rev = commit.commit[:7]
-+            commit.commit = commit.commit[:7]
-         # Extract the meta-information for the commit
-         commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit))
-         commit.files = " ".join(commit.files.strip().split("\n")[1:])

Deleted: packages/irker/trunk/debian/patches/0004-webview.patch
===================================================================
--- packages/irker/trunk/debian/patches/0004-webview.patch	2016-03-15 12:58:42 UTC (rev 12940)
+++ packages/irker/trunk/debian/patches/0004-webview.patch	2016-03-15 15:53:03 UTC (rev 12941)
@@ -1,37 +0,0 @@
-Author: Daniel Baumann <mail at daniel-baumann.ch>
-Description: Disable URL check.
- If a gitweb URL is configured, the irkerhook only sends a notification if
- the URL is reachable.
- .
- If the URL needs authentication, the hook fails. This is undesirable,
- hence we switch off the URL check entirely.
-
-diff -Naurp irker.orig/irkerhook.py irker/irkerhook.py
---- irker.orig/irkerhook.py
-+++ irker/irkerhook.py
-@@ -70,24 +70,7 @@ class Commit:
-         else:
-             urlprefix = urlprefixmap.get(self.urlprefix, self.urlprefix)
-             webview = (urlprefix % self.__dict__) + self.commit
--            try:
--                if urllib.urlopen(webview).getcode() == 404:
--                    raise IOError
--                if self.tinyifier and self.tinyifier.lower() != "none":
--                    try:
--                        # Didn't get a retrieval error or 404 on the web
--                        # view, so try to tinyify a reference to it.
--                        self.url = open(urllib.urlretrieve(self.tinyifier + webview)[0]).read()
--                        try:
--                            self.url = self.url.decode('UTF-8')
--                        except UnicodeError:
--                            pass
--                    except IOError:
--                        self.url = webview
--                else:
--                    self.url = webview
--            except IOError:
--                self.url = ""
-+            self.url = webview
-         res = self.template % self.__dict__
-         return unicode(res, 'UTF-8') if not isinstance(res, unicode) else res
- 

Added: packages/irker/trunk/debian/patches/0007-irkerhook-git.patch
===================================================================
--- packages/irker/trunk/debian/patches/0007-irkerhook-git.patch	                        (rev 0)
+++ packages/irker/trunk/debian/patches/0007-irkerhook-git.patch	2016-03-15 15:53:03 UTC (rev 12941)
@@ -0,0 +1,22 @@
+Description: Add description for the irkerhook-git helper script.
+ The debian packages add a irkerhook-git helper script, which simplifies
+ the most common use case for irkerhook with git. This patch mentions the
+ helper script in the irkerhook manpage.
+Author: Neil Muller <drnlmuller+debian at gmail.com>
+Last-Update: 2016-03-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/irkerhook.xml b/irkerhook.xml
+index 72918cf..9e59586 100644
+--- a/irkerhook.xml
++++ b/irkerhook.xml
+@@ -208,6 +208,9 @@ while read old new refname; do
+ done
+ </programlisting>
+ 
++<para>For convenience, this is implemented by the irkerhook-git
++helper script.</para>
++
+ <para>Preferences may be set in the repo <filename>config</filename>
+ file in an [irker] section. Here is an example of what that can look
+ like:</para>

Modified: packages/irker/trunk/debian/patches/series
===================================================================
--- packages/irker/trunk/debian/patches/series	2016-03-15 12:58:42 UTC (rev 12940)
+++ packages/irker/trunk/debian/patches/series	2016-03-15 15:53:03 UTC (rev 12941)
@@ -1,6 +1,4 @@
 0001-dfsg.patch
-0002-abbrev-commit.patch
-0003-abbrev-gitweb.patch
-0004-webview.patch
 0005-author-name.patch
 0006-alias-service.patch
+0007-irkerhook-git.patch




More information about the Python-apps-commits mailing list