r15077 - in packages/trunk/bubbros/debian: . patches
Juhani Numminen
jsonic-guest at moszumanska.debian.org
Sat May 10 16:02:34 UTC 2014
Author: jsonic-guest
Date: 2014-05-10 16:02:34 +0000 (Sat, 10 May 2014)
New Revision: 15077
Modified:
packages/trunk/bubbros/debian/changelog
packages/trunk/bubbros/debian/patches/config_in_homedir.patch
packages/trunk/bubbros/debian/patches/disable_runtime_image_building.patch
packages/trunk/bubbros/debian/patches/manpages.patch
packages/trunk/bubbros/debian/patches/remove_shabangs.patch
packages/trunk/bubbros/debian/patches/replace_sf_logo.patch
Log:
debian/patches/*.patch: Refresh all patches.
Modified: packages/trunk/bubbros/debian/changelog
===================================================================
--- packages/trunk/bubbros/debian/changelog 2014-05-10 13:05:47 UTC (rev 15076)
+++ packages/trunk/bubbros/debian/changelog 2014-05-10 16:02:34 UTC (rev 15077)
@@ -23,7 +23,8 @@
- Don’t install the CVS cruft and Makefiles.
- Don’t generate bubbros.png or clean it.
* Add debian/patches/series.
- * debian/patches/replace_sf_logo.patch: Prevent fetching SF.net logo.
+ * Add debian/patches/replace_sf_logo.patch: Prevent fetching SF.net logo.
+ * debian/patches/*.patch: Refresh all patches.
* debian/bubbros.desktop:
- Add Keywords.
- Remove unhelpful GenericName.
Modified: packages/trunk/bubbros/debian/patches/config_in_homedir.patch
===================================================================
--- packages/trunk/bubbros/debian/patches/config_in_homedir.patch 2014-05-10 13:05:47 UTC (rev 15076)
+++ packages/trunk/bubbros/debian/patches/config_in_homedir.patch 2014-05-10 16:02:34 UTC (rev 15077)
@@ -8,10 +8,9 @@
# using it.
-diff -Nur bubbros-1.6/display/pclient.py bubbros-1.6.new/display/pclient.py
---- bubbros-1.6/display/pclient.py 2007-09-08 17:03:41.000000000 +0200
-+++ bubbros-1.6.new/display/pclient.py 2007-12-03 17:48:29.000000000 +0100
-@@ -162,8 +162,8 @@
+--- a/display/pclient.py
++++ b/display/pclient.py
+@@ -161,8 +161,8 @@
if mode[-1].has_key('cfgfile'):
self.trackcfgfile = mode[-1]['cfgfile']
else:
@@ -22,9 +21,8 @@
self.udpsock = None
self.udpsock_low = None
self.udpsock2 = None
-diff -Nur bubbros-1.6/http2/httppages.py bubbros-1.6.new/http2/httppages.py
---- bubbros-1.6/http2/httppages.py 2007-09-08 17:03:41.000000000 +0200
-+++ bubbros-1.6.new/http2/httppages.py 2007-12-03 17:50:38.000000000 +0100
+--- a/http2/httppages.py
++++ b/http2/httppages.py
@@ -38,7 +38,7 @@
Modified: packages/trunk/bubbros/debian/patches/disable_runtime_image_building.patch
===================================================================
--- packages/trunk/bubbros/debian/patches/disable_runtime_image_building.patch 2014-05-10 13:05:47 UTC (rev 15076)
+++ packages/trunk/bubbros/debian/patches/disable_runtime_image_building.patch 2014-05-10 16:02:34 UTC (rev 15077)
@@ -5,10 +5,9 @@
#
# It avoids that images are generated again during runtime.
-diff -Nur bubbros-1.6/bubbob/images.py bubbros-1.6.new/bubbob/images.py
---- bubbros-1.6/bubbob/images.py 2007-09-08 17:03:41.000000000 +0200
-+++ bubbros-1.6.new/bubbob/images.py 2007-12-03 17:54:22.000000000 +0100
-@@ -454,7 +454,6 @@
+--- a/bubbob/images.py
++++ b/bubbob/images.py
+@@ -456,7 +456,6 @@
# check and maybe regenerate the colored image files
file = os.path.join('images', 'buildcolors.py')
g = {'__name__': '__auto__', '__file__': file}
@@ -16,12 +15,9 @@
# replace the entries 'filename_%d.ppm' by a family of entries,
# one for each color
sprmap = {}
-
-
-diff -Nur bubbros-1.6/http2/httppages.py bubbros-1.6.new/http2/httppages.py
---- bubbros-1.6/http2/httppages.py 2007-12-03 17:53:00.000000000 +0100
-+++ bubbros-1.6.new/http2/httppages.py 2007-12-03 17:54:04.000000000 +0100
-@@ -333,7 +333,6 @@
+--- a/http2/httppages.py
++++ b/http2/httppages.py
+@@ -337,7 +337,6 @@
'buildcolors.py')
if os.path.exists(file):
g = {'__name__': '__auto__', '__file__': file}
Modified: packages/trunk/bubbros/debian/patches/manpages.patch
===================================================================
--- packages/trunk/bubbros/debian/patches/manpages.patch 2014-05-10 13:05:47 UTC (rev 15076)
+++ packages/trunk/bubbros/debian/patches/manpages.patch 2014-05-10 16:02:34 UTC (rev 15077)
@@ -6,9 +6,8 @@
# to the installation that this package performs (renamed
# binaries, etc.)
-diff -Nur bubbros-1.6/doc/bb.py.1 bubbros-1.6.new/doc/bb.py.1
---- bubbros-1.6/doc/bb.py.1 2007-09-08 17:03:41.000000000 +0200
-+++ bubbros-1.6.new/doc/bb.py.1 2007-12-07 17:52:39.000000000 +0100
+--- a/doc/bb.py.1
++++ b/doc/bb.py.1
@@ -1,29 +1,21 @@
-.\" $Id: bb.py.1,v 1.3 2005/04/17 17:19:32 opqdonut Exp $
+.\" $Id: bubbros-server.1,v 1.3 2005/04/17 17:19:32 opqdonut Exp $
@@ -54,9 +53,8 @@
-.BR python (1)
+.BR bubbros (6)
+.BR bubbros-client (6)
-diff -Nur bubbros-1.6/doc/BubBob.py.1 bubbros-1.6.new/doc/BubBob.py.1
---- bubbros-1.6/doc/BubBob.py.1 2007-09-08 17:03:41.000000000 +0200
-+++ bubbros-1.6.new/doc/BubBob.py.1 2007-12-07 17:52:43.000000000 +0100
+--- a/doc/BubBob.py.1
++++ b/doc/BubBob.py.1
@@ -4,20 +4,18 @@
.\" groff -man -Tascii BubBob.py.1
.\"
@@ -93,9 +91,8 @@
-
+.BR bubbros-server (6)
+.BR bubbros-client (6)
-diff -Nur bubbros-1.6/doc/Client.py.1 bubbros-1.6.new/doc/Client.py.1
---- bubbros-1.6/doc/Client.py.1 2007-09-08 17:03:41.000000000 +0200
-+++ bubbros-1.6.new/doc/Client.py.1 2007-12-07 17:52:35.000000000 +0100
+--- a/doc/Client.py.1
++++ b/doc/Client.py.1
@@ -4,24 +4,20 @@
.\" groff -man -Tascii Client.py.1
.\"
Modified: packages/trunk/bubbros/debian/patches/remove_shabangs.patch
===================================================================
--- packages/trunk/bubbros/debian/patches/remove_shabangs.patch 2014-05-10 13:05:47 UTC (rev 15076)
+++ packages/trunk/bubbros/debian/patches/remove_shabangs.patch 2014-05-10 16:02:34 UTC (rev 15077)
@@ -4,57 +4,50 @@
#
# Removes shabangs from all non-executable Python files
-diff -Nur bubbros-1.6/bubbob/bb.py bubbros-1.6.new/bubbob/bb.py
---- bubbros-1.6/bubbob/bb.py 2007-09-08 17:03:41.000000000 +0200
-+++ bubbros-1.6.new/bubbob/bb.py 2007-12-16 12:41:51.000000000 +0100
+--- a/bubbob/bb.py
++++ b/bubbob/bb.py
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
from __future__ import generators
-diff -Nur bubbros-1.6/bubbob/doc/bonus-doc.py bubbros-1.6.new/bubbob/doc/bonus-doc.py
---- bubbros-1.6/bubbob/doc/bonus-doc.py 2007-09-08 17:03:41.000000000 +0200
-+++ bubbros-1.6.new/bubbob/doc/bonus-doc.py 2007-12-16 12:41:51.000000000 +0100
+--- a/bubbob/doc/bonus-doc.py
++++ b/bubbob/doc/bonus-doc.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
import os, sys, string, struct
os.chdir(os.pardir)
-diff -Nur bubbros-1.6/bubbob/images/buildcolors.py bubbros-1.6.new/bubbob/images/buildcolors.py
---- bubbros-1.6/bubbob/images/buildcolors.py 2007-09-08 17:03:41.000000000 +0200
-+++ bubbros-1.6.new/bubbob/images/buildcolors.py 2007-12-16 12:43:17.000000000 +0100
+--- a/bubbob/images/buildcolors.py
++++ b/bubbob/images/buildcolors.py
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
import sys, os
if __name__ == '__main__':
-diff -Nur bubbros-1.6/BubBob.py bubbros-1.6.new/BubBob.py
---- bubbros-1.6/BubBob.py 2007-09-08 17:03:41.000000000 +0200
-+++ bubbros-1.6.new/BubBob.py 2007-12-16 12:41:51.000000000 +0100
+--- a/BubBob.py
++++ b/BubBob.py
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
#
# This script is used to start the server.
-diff -Nur bubbros-1.6/display/Client.py bubbros-1.6.new/display/Client.py
---- bubbros-1.6/display/Client.py 2007-09-08 17:03:41.000000000 +0200
-+++ bubbros-1.6.new/display/Client.py 2007-12-16 12:41:51.000000000 +0100
+--- a/display/Client.py
++++ b/display/Client.py
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
# __________
import os, sys
-diff -Nur bubbros-1.6/display/pclient.py bubbros-1.6.new/display/pclient.py
---- bubbros-1.6/display/pclient.py 2007-12-16 12:41:42.000000000 +0100
-+++ bubbros-1.6.new/display/pclient.py 2007-12-16 12:41:51.000000000 +0100
+--- a/display/pclient.py
++++ b/display/pclient.py
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
import sys, os
from socket import *
-diff -Nur bubbros-1.6/display/playback.py bubbros-1.6.new/display/playback.py
---- bubbros-1.6/display/playback.py 2007-09-08 17:03:41.000000000 +0200
-+++ bubbros-1.6.new/display/playback.py 2007-12-16 12:41:51.000000000 +0100
+--- a/display/playback.py
++++ b/display/playback.py
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
Modified: packages/trunk/bubbros/debian/patches/replace_sf_logo.patch
===================================================================
--- packages/trunk/bubbros/debian/patches/replace_sf_logo.patch 2014-05-10 13:05:47 UTC (rev 15076)
+++ packages/trunk/bubbros/debian/patches/replace_sf_logo.patch 2014-05-10 16:02:34 UTC (rev 15077)
@@ -1,9 +1,10 @@
# Description: Replace SF.net logo with text to prevent privacy breach.
# Author: Juhani Numminen <juhaninumminen0 at gmail.com>
+# Bug: https://sourceforge.net/p/bub-n-bros/patches/2/
+# Last-Update: 2014-05-10
-diff -Nur bubbros-1.6/http2/sf/started.html bubbros-1.6.new/http2/sf/started.html
---- bubbros-1.6/http2/sf/started.html 2007-09-08 18:03:41.000000000 +0300
-+++ bubbros-1.6.new/http2/sf/started.html 2014-05-03 13:22:22.008419936 +0300
+--- a/http2/sf/started.html
++++ b/http2/sf/started.html
@@ -40,5 +40,5 @@
</table>
<br><hr><br>
More information about the Pkg-games-commits
mailing list