[Python-apps-commits] r4486 - in packages/ttb/trunk (16 files)
quadrispro-guest at users.alioth.debian.org
quadrispro-guest at users.alioth.debian.org
Sun Jan 10 12:21:29 UTC 2010
Date: Sunday, January 10, 2010 @ 12:21:27
Author: quadrispro-guest
Revision: 4486
[svn-inject] Applying Debian modifications to trunk
Added:
packages/ttb/trunk/debian/
packages/ttb/trunk/debian/README.source
packages/ttb/trunk/debian/changelog
packages/ttb/trunk/debian/compat
packages/ttb/trunk/debian/control
packages/ttb/trunk/debian/copyright
packages/ttb/trunk/debian/docs
packages/ttb/trunk/debian/manpages
packages/ttb/trunk/debian/patches/
packages/ttb/trunk/debian/patches/01-small_update.diff
packages/ttb/trunk/debian/patches/series
packages/ttb/trunk/debian/pyversions
packages/ttb/trunk/debian/rules
packages/ttb/trunk/debian/ttb.1
packages/ttb/trunk/debian/ttb.lintian-overrides
packages/ttb/trunk/debian/watch
Property changes on: packages/ttb/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: packages/ttb/trunk/debian/README.source
===================================================================
--- packages/ttb/trunk/debian/README.source (rev 0)
+++ packages/ttb/trunk/debian/README.source 2010-01-10 12:21:27 UTC (rev 4486)
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ fi
+ done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+ quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches. Then, for every file that will be modified by this patch,
+run:
+
+ quilt add <file>
+
+before editing those files. You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly. After editing the files, run:
+
+ quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+ quilt import -P <patch> /path/to/patch
+ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches. The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
Added: packages/ttb/trunk/debian/changelog
===================================================================
--- packages/ttb/trunk/debian/changelog (rev 0)
+++ packages/ttb/trunk/debian/changelog 2010-01-10 12:21:27 UTC (rev 4486)
@@ -0,0 +1,15 @@
+ttb (1.0.1-2) unstable; urgency=low
+
+ * Add quilt support.
+ * debian/patches/01-small_update.diff:
+ - don't use strings for exceptions
+ - show message boxes for errors
+ - fix bug LP: #440764 by re-assigning the whole tuple
+
+ -- Alessio Treglia <quadrispro at ubuntu.com> Wed, 21 Oct 2009 22:45:17 +0200
+
+ttb (1.0.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #548178).
+
+ -- Alessio Treglia <quadrispro at ubuntu.com> Thu, 24 Sep 2009 12:57:47 +0200
Added: packages/ttb/trunk/debian/compat
===================================================================
--- packages/ttb/trunk/debian/compat (rev 0)
+++ packages/ttb/trunk/debian/compat 2010-01-10 12:21:27 UTC (rev 4486)
@@ -0,0 +1 @@
+7
Added: packages/ttb/trunk/debian/control
===================================================================
--- packages/ttb/trunk/debian/control (rev 0)
+++ packages/ttb/trunk/debian/control 2010-01-10 12:21:27 UTC (rev 4486)
@@ -0,0 +1,18 @@
+Source: ttb
+Section: gnome
+Priority: optional
+Maintainer: Alessio Treglia <quadrispro at ubuntu.com>
+Build-Depends: debhelper (>= 7), quilt (>= 0.46-7)
+Build-Depends-Indep: python-support (>= 0.5.3)
+Standards-Version: 3.8.3
+Homepage: http://www.djcbsoftware.nl/code/ttb/
+Vcs-Bzr: https://code.launchpad.net/~quadrispro/+junk/ttb
+Vcs-Browser: http://bazaar.launchpad.net/~quadrispro/+junk/ttb
+
+Package: ttb
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}, python-gtk2
+Description: Browse teletekst (Dutch) on your computer
+ Teletekst Browser (ttb) is a small browser for the Teletekst system as used in
+ The Netherlands, and provides a convenient way to stay up to date with news,
+ sports, weather, stock exchange and what not.
Added: packages/ttb/trunk/debian/copyright
===================================================================
--- packages/ttb/trunk/debian/copyright (rev 0)
+++ packages/ttb/trunk/debian/copyright 2010-01-10 12:21:27 UTC (rev 4486)
@@ -0,0 +1,30 @@
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=48
+Name: TTB
+Maintainer: Dirk-Jan C. Binnema <djcb at djcbsoftware.nl>
+Source: http://www.djcbsoftware.nl/code/ttb/
+
+Files: *
+Copyright: 2004-2009, Dirk-Jan C. Binnema (djcb at djcbsoftware.nl)
+License: GPL-3
+
+Files: debian/*
+Copyright: 2005, Johnny Mast <rave at rosiello.org>
+ 2009, Alessio Treglia <quadrispro at ubuntu.com>
+License: GPL-3
+
+License: GPL-3
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+X-Comment: On Debian GNU/Linux systems, the complete text of the GNU
+ General Public License can be found in /usr/share/common-licenses/GPL-3
Added: packages/ttb/trunk/debian/docs
===================================================================
--- packages/ttb/trunk/debian/docs (rev 0)
+++ packages/ttb/trunk/debian/docs 2010-01-10 12:21:27 UTC (rev 4486)
@@ -0,0 +1 @@
+AUTHORS
Added: packages/ttb/trunk/debian/manpages
===================================================================
--- packages/ttb/trunk/debian/manpages (rev 0)
+++ packages/ttb/trunk/debian/manpages 2010-01-10 12:21:27 UTC (rev 4486)
@@ -0,0 +1 @@
+debian/ttb.1
Added: packages/ttb/trunk/debian/patches/01-small_update.diff
===================================================================
--- packages/ttb/trunk/debian/patches/01-small_update.diff (rev 0)
+++ packages/ttb/trunk/debian/patches/01-small_update.diff 2010-01-10 12:21:27 UTC (rev 4486)
@@ -0,0 +1,130 @@
+Description: some bugfixes and small improvements
+Vendor: http://gitorious.org/ttb/mainline/commit/613f50b23df0bcd1720f3d64f584578652d7f26d
+Index: ttb-1.0.1/src/ttb
+===================================================================
+--- ttb-1.0.1.orig/src/ttb 2009-10-21 23:35:48.583141606 +0200
++++ ttb-1.0.1/src/ttb 2009-10-21 23:35:51.359141415 +0200
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env python
+ # -*-mode:python-*-*
+-# Time-stamp: <2009-05-21 15:44:12 (djcb)>
++# Time-stamp: <2009-10-09 00:48:28 (djcb)>
+ #
+ # Browser for Teletekst pages
+ #
+@@ -55,6 +55,13 @@
+
+ ttb_debug = 0
+
++class TTBException:
++ def __init__ (self,msg):
++ self.msg = msg
++ def msg (self):
++ return msg
++
++
+ #
+ # our main application class
+ #
+@@ -158,13 +165,17 @@
+ self.history.append (page)
+ except:
+ if (page[1] != 1):
+- page[1] = 1
++ page = (page[0],1)
+ return self.goto_page (page,nocache,add_to_history)
+ else:
+ print "error retrieving page " + str(page)
+- self.image_file = self.network.retrieve_error_page()
+- return self.page
+-
++
++ try:
++ self.image_file = self.network.retrieve_error_page()
++ return self.page
++ except:
++ error_exit ("Verbinding met Teletekst mislukt!")
++
+ self.image_file = new_image
+ self.metainfo = metainfo
+ self.page = page
+@@ -309,7 +320,7 @@
+ elif how == self.size.BIGGER:
+ self.size.grow()
+ else:
+- raise "illegal size for zooming"
++ raise TTBException("illegal size for zooming")
+
+ self.update()
+ self.look_busy(0)
+@@ -775,7 +786,7 @@
+ try:
+ data = self.http_get (gif)
+ except:
+- raise "could not retrieve " + gif
++ raise TTBException("could not retrieve " + gif)
+
+ # save the gif to a tempfile
+ imgfile = open (localimg,'w')
+@@ -789,7 +800,7 @@
+ html = self.http_get(html)
+ data = html.replace('<script','<!--').replace('</script>','-->')
+ except:
+- raise "could not retrieve " + html
++ raise TTBException("could not retrieve " + html)
+
+ htmlfile = open (localhtml,'w')
+ htmlfile.write (data)
+@@ -814,7 +825,7 @@
+ try:
+ data = self.http_get (errorgif)
+ except:
+- raise "could not retrieve " + errorgif
++ raise TTBException ("could not retrieve " + errorgif)
+
+ # save the gif to a tempfile
+ imgfile = open (localerr,'w')
+@@ -835,7 +846,7 @@
+ if os.path.isdir (fp):
+ return fp
+
+- raise "Could not find data directory"
++ raise TTBException("Could not find data directory")
+
+ def get_data_file (name):
+
+@@ -844,10 +855,22 @@
+ if os.path.isfile(fp):
+ return fp
+
+- raise "Could not find " + name
++ raise TTBException("Could not find " + name)
+
+-
+
++def error_exit (msg):
++
++ dialog = gtk.MessageDialog(
++ flags = gtk.DIALOG_DESTROY_WITH_PARENT,
++ type = gtk.MESSAGE_ERROR,
++ buttons = gtk.BUTTONS_OK,
++ message_format = msg)
++ dialog.set_title("TTB Error")
++
++ dialog.run()
++
++ sys.exit(1)
++
+
+ def main (argv=None):
+
+@@ -879,6 +902,9 @@
+
+ except KeyboardInterrupt:
+ return 0
++
++ except TTBException as ex:
++ error_exit (ex.msg)
+
+ return 0
+
Added: packages/ttb/trunk/debian/patches/series
===================================================================
--- packages/ttb/trunk/debian/patches/series (rev 0)
+++ packages/ttb/trunk/debian/patches/series 2010-01-10 12:21:27 UTC (rev 4486)
@@ -0,0 +1 @@
+01-small_update.diff
Added: packages/ttb/trunk/debian/pyversions
===================================================================
--- packages/ttb/trunk/debian/pyversions (rev 0)
+++ packages/ttb/trunk/debian/pyversions 2010-01-10 12:21:27 UTC (rev 4486)
@@ -0,0 +1 @@
+2.5-
Added: packages/ttb/trunk/debian/rules
===================================================================
--- packages/ttb/trunk/debian/rules (rev 0)
+++ packages/ttb/trunk/debian/rules 2010-01-10 12:21:27 UTC (rev 4486)
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+ dh --with quilt $@
Property changes on: packages/ttb/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/ttb/trunk/debian/ttb.1
===================================================================
--- packages/ttb/trunk/debian/ttb.1 (rev 0)
+++ packages/ttb/trunk/debian/ttb.1 2010-01-10 12:21:27 UTC (rev 4486)
@@ -0,0 +1,31 @@
+'\" -*- coding: us-ascii -*-
+.if \n(.g .ds T< \\FC
+.if \n(.g .ds T> \\F[\n[.fam]]
+.de URL
+\\$2 \(la\\$1\(ra\\$3
+..
+.if \n(.g .mso www.tmac
+.TH ttb 1 2005-12-16 "" ""
+.SH NAME
+ttb \- Browse Teletekst in gnome
+.SH DESCRIPTION
+ttb graphical interface for GNOME.
+.PP
+Teletekst browser
+Teletekst browser is an application to browse Teletekst pages via the
+internet. www.omroep.nl offers a service like this on there website but
+the package they offer can only be used on Windows and MacOS.
+Teletekst browser is written by Dirk-Jan Binnema with help of some other people around
+him.
+Bugs can requests can be emailed to djcb at djcbsoftware.nl
+.SH COPYRIGHT
+This manual page was written by Johnny Mast
+<\*(T<rave at rosiello.org\*(T>> for the
+Ubuntu system (but may be used by others).
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU General Public License,
+Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public
+License can be found in
+\*(T<\fI/usr/share/common\-licenses/GPL\fR\*(T>.
Added: packages/ttb/trunk/debian/ttb.lintian-overrides
===================================================================
--- packages/ttb/trunk/debian/ttb.lintian-overrides (rev 0)
+++ packages/ttb/trunk/debian/ttb.lintian-overrides 2010-01-10 12:21:27 UTC (rev 4486)
@@ -0,0 +1 @@
+ttb: no-upstream-changelog
Added: packages/ttb/trunk/debian/watch
===================================================================
--- packages/ttb/trunk/debian/watch (rev 0)
+++ packages/ttb/trunk/debian/watch 2010-01-10 12:21:27 UTC (rev 4486)
@@ -0,0 +1,2 @@
+version=3
+http://www.djcbsoftware.nl/code/ttb/ (?:.*/)?ttb-?_?([\d+\.]+|\d+)\.tar.* debian uupdate
More information about the Python-apps-commits
mailing list