[Python-apps-commits] r2469 - in packages/indywiki/trunk (17 files)
sez-guest at users.alioth.debian.org
sez-guest at users.alioth.debian.org
Sun Feb 22 18:49:55 UTC 2009
Date: Sunday, February 22, 2009 @ 18:49:54
Author: sez-guest
Revision: 2469
[svn-inject] Applying Debian modifications to trunk
Added:
packages/indywiki/trunk/debian/
packages/indywiki/trunk/debian/changelog
packages/indywiki/trunk/debian/compat
packages/indywiki/trunk/debian/control
packages/indywiki/trunk/debian/copyright
packages/indywiki/trunk/debian/dirs
packages/indywiki/trunk/debian/docs
packages/indywiki/trunk/debian/indywiki.1
packages/indywiki/trunk/debian/indywiki.menu
packages/indywiki/trunk/debian/patches/
packages/indywiki/trunk/debian/patches/do-nothing-on-bg-colour-cancel.diff
packages/indywiki/trunk/debian/patches/fix-imports.diff
packages/indywiki/trunk/debian/patches/non-native.diff
packages/indywiki/trunk/debian/patches/series
packages/indywiki/trunk/debian/pyversions
packages/indywiki/trunk/debian/rules
packages/indywiki/trunk/debian/watch
Added: packages/indywiki/trunk/debian/changelog
===================================================================
--- packages/indywiki/trunk/debian/changelog (rev 0)
+++ packages/indywiki/trunk/debian/changelog 2009-02-22 18:49:54 UTC (rev 2469)
@@ -0,0 +1,30 @@
+indywiki (0.9.9.1-4) unstable; urgency=low
+
+ * Rename "non-native" images to "nearby" images (Closes: #488464).
+ * Switch patch management to quilt.
+ * Add Uploaders and Vcs-* fields as it is now maintained as part of the
+ python-apps team.
+
+ -- Serafeim Zanikolas <serzan at hellug.gr> Sun, 22 Feb 2009 02:28:54 +0000
+
+indywiki (0.9.9.1-3) unstable; urgency=low
+
+ * Add missing dependency python-pkg-resources (Closes: #488405)
+ * Don't do anything when the user clicks cancel in the dialog box for
+ changing the background colour of non-native images (Closes: #488411)
+
+ -- Serafeim Zanikolas <serzan at hellug.gr> Sun, 29 Jun 2008 00:04:54 +0100
+
+indywiki (0.9.9.1-2) unstable; urgency=low
+
+ * Correct dependency for PyQt4 (Closes: #487663)
+
+ -- Serafeim Zanikolas <serzan at hellug.gr> Mon, 23 Jun 2008 21:19:20 +0100
+
+indywiki (0.9.9.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #473038)
+
+ -- Serafeim Zanikolas <serzan at hellug.gr> Tue, 10 Jun 2008 20:53:18 +0100
+
+
Added: packages/indywiki/trunk/debian/compat
===================================================================
--- packages/indywiki/trunk/debian/compat (rev 0)
+++ packages/indywiki/trunk/debian/compat 2009-02-22 18:49:54 UTC (rev 2469)
@@ -0,0 +1 @@
+6
Added: packages/indywiki/trunk/debian/control
===================================================================
--- packages/indywiki/trunk/debian/control (rev 0)
+++ packages/indywiki/trunk/debian/control 2009-02-22 18:49:54 UTC (rev 2469)
@@ -0,0 +1,28 @@
+Source: indywiki
+Section: web
+Priority: optional
+Maintainer: Serafeim Zanikolas <serzan at hellug.gr>
+Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 6), python, python-support (>= 0.6), quilt, python-setuptools
+Standards-Version: 3.8.0
+Vcs-Svn: svn://svn.debian.org/python-apps/packages/indywiki/trunk
+Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/indywiki/trunk/
+Homepage: http://indywiki.sf.net
+
+Package: indywiki
+Architecture: all
+Depends: ${python:Depends}, python-pkg-resources, python-qt4, python-nodebox-web
+Description: visual Wikipedia browser
+ Indywiki provides a visually-driven and intuitive way of browsing Wikipedia.
+ Indywiki's window is split in two parts, one with images related to the
+ current topic, and another with text and links from the current page.
+ Images are selected from the current page, the pages pointed to by the
+ current one (forward links), and the pages that point to the current one
+ (back-links). The text of the current page is presented one paragraph at a
+ time, and the page's links are shown in a single list.
+ .
+ In Indywiki, one browses wikipedia by selecting either text links or images
+ (the latter lead to the wiki page that contains the selected image).
+ .
+ Indywiki is not recommended for use with low-speed Internet connections, as
+ it downloads many images per page.
Added: packages/indywiki/trunk/debian/copyright
===================================================================
--- packages/indywiki/trunk/debian/copyright (rev 0)
+++ packages/indywiki/trunk/debian/copyright 2009-02-22 18:49:54 UTC (rev 2469)
@@ -0,0 +1,46 @@
+This package was debianized by Serafeim Zanikolas <serzan at hellug.gr> on
+Mon, 12 May 2008 23:15:22 +0100.
+
+It was downloaded from http://indywiki.sf.net
+
+Upstream Authors:
+
+ Markos Gogoulos <mgogoulos at gmail.com>
+ Serafeim Zanikolas <serzan at hellug.gr>
+
+Copyright:
+
+ Copyright © 2007-2008 Markos Gogoulos
+ Copyright © 2008 Serafeim Zanikolas
+
+License:
+
+ This package 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 2 of the License, or
+ (at your option) any later version.
+
+ This package 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 package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is © 2008, Serafeim Zanikolas <serzan at hellug.gr> and
+is licensed under the GPL, see above.
+
+
+The upstream distribution of indywiki embeds BeautifulSoup and the wikipedia
+subset of nodebox-web.
+
+nodebox-web-wikipedia is Copyright © 2008 Tom De Smedt
+<tomdesmedt at organisms.be> and licensed under the GPL version 2 or later.
+
+BeautifulSoup.py is Copyright (c) 2004-2006 Leonard Richardson
+<leonardr at segfault.org> and licensed under the PSF.
Added: packages/indywiki/trunk/debian/dirs
===================================================================
--- packages/indywiki/trunk/debian/dirs (rev 0)
+++ packages/indywiki/trunk/debian/dirs 2009-02-22 18:49:54 UTC (rev 2469)
@@ -0,0 +1 @@
+usr/bin
Added: packages/indywiki/trunk/debian/docs
===================================================================
--- packages/indywiki/trunk/debian/docs (rev 0)
+++ packages/indywiki/trunk/debian/docs 2009-02-22 18:49:54 UTC (rev 2469)
@@ -0,0 +1,2 @@
+README.txt
+TODO.txt
Added: packages/indywiki/trunk/debian/indywiki.1
===================================================================
--- packages/indywiki/trunk/debian/indywiki.1 (rev 0)
+++ packages/indywiki/trunk/debian/indywiki.1 2009-02-22 18:49:54 UTC (rev 2469)
@@ -0,0 +1,21 @@
+.TH indywiki 1
+.SH NAME
+indywiki \- a visual wikipedia browser for X11
+.SH SYNOPSIS
+.B indywiki
+.br
+.SH DESCRIPTION
+This manual page documents briefly
+.B indywiki.
+.PP
+\fBindywiki\fP is a wikipedia browser that gives equal emphasis to images and
+text. \fBindywiki\fP splits the screen into two parts: one shows the text,
+sections and links of the current wiki page; the other shows the images
+contained in the current page (native images), as well as images in pages
+pointed to, and from the current page (non-native images). The user may browse
+wikipedia by clicking either on text links or non-native images.
+.SH AUTHOR
+\fBindywiki\fP was written by Markos Gogoulos and Serafeim Zanikolas.
+.PP
+This manual page was written by Serafeim Zanikolas <serzan at hellug.gr>,
+for the Debian project (but may be used by others).
Added: packages/indywiki/trunk/debian/indywiki.menu
===================================================================
--- packages/indywiki/trunk/debian/indywiki.menu (rev 0)
+++ packages/indywiki/trunk/debian/indywiki.menu 2009-02-22 18:49:54 UTC (rev 2469)
@@ -0,0 +1,2 @@
+?package(indywiki):needs="X11" section="Applications/Network/Web Browsing"\
+ title="indywiki" command="/usr/bin/indywiki"
Added: packages/indywiki/trunk/debian/patches/do-nothing-on-bg-colour-cancel.diff
===================================================================
--- packages/indywiki/trunk/debian/patches/do-nothing-on-bg-colour-cancel.diff (rev 0)
+++ packages/indywiki/trunk/debian/patches/do-nothing-on-bg-colour-cancel.diff 2009-02-22 18:49:54 UTC (rev 2469)
@@ -0,0 +1,17 @@
+diff -u indywiki/src/indywiki/indywiki.py indywiki-0.9.9/src/indywiki/indywiki.py
+--- indywiki/src/indywiki/indywiki.py 2008-06-29 00:24:28.000000000 +0100
++++ indywiki-0.9.9/src/indywiki/indywiki.py 2008-06-29 00:24:00.000000000 +0100
+@@ -1202,8 +1202,11 @@
+ def setNNimageBgColor(self):
+ """Allows the user to customise the background colour of non-native
+ images."""
+- self.config.nn_img_rgb = QtGui.QColorDialog.getColor(
+- self.getNNimageBgColor(), self.centralwidget).getRgb()
++ new_setting = QtGui.QColorDialog.getColor(
++ self.getNNimageBgColor(), self.centralwidget)
++ if not new_setting.isValid():
++ return
++ self.config.nn_img_rgb = new_setting.getRgb()
+ for button in self.pushButtonList.values():
+ if not button.isNative:
+ self.updateButtonColor(button)
Added: packages/indywiki/trunk/debian/patches/fix-imports.diff
===================================================================
--- packages/indywiki/trunk/debian/patches/fix-imports.diff (rev 0)
+++ packages/indywiki/trunk/debian/patches/fix-imports.diff 2009-02-22 18:49:54 UTC (rev 2469)
@@ -0,0 +1,36 @@
+diff -ru indywiki/src/indywiki/config.py indywiki-0.9.9/src/indywiki/config.py
+--- indywiki/src/indywiki/config.py 2008-05-12 10:35:29.000000000 +0100
++++ indywiki-0.9.9/src/indywiki/config.py 2008-05-16 23:31:22.000000000 +0100
+@@ -1,7 +1,7 @@
+ import sys
+ import os
+ from release import __version__
+-from web1.wikipedia import languages as known_languages
++from nodebox_web.web.wikipedia import languages as known_languages
+
+ class Config(object):
+ """container for user-configurable options"""
+diff -ru indywiki/src/indywiki/indywiki.py indywiki-0.9.9/src/indywiki/indywiki.py
+--- indywiki/src/indywiki/indywiki.py 2008-05-12 10:35:29.000000000 +0100
++++ indywiki-0.9.9/src/indywiki/indywiki.py 2008-05-16 23:30:46.000000000 +0100
+@@ -11,7 +11,7 @@
+ import re
+ import time
+ from PyQt4 import QtCore, QtGui
+-from web1 import wikipedia
++from nodebox_web.web import wikipedia
+ import qrc_resources
+ import net
+ from release import __version__
+diff -ru indywiki/src/indywiki/net.py indywiki-0.9.9/src/indywiki/net.py
+--- indywiki/src/indywiki/net.py 2008-05-12 10:35:29.000000000 +0100
++++ indywiki-0.9.9/src/indywiki/net.py 2008-05-16 23:31:07.000000000 +0100
+@@ -6,7 +6,7 @@
+ import StringIO
+ import gzip
+ from PyQt4 import QtCore, QtGui
+-from web1 import wikipedia
++from nodebox_web.web import wikipedia
+
+ wikipedia.search = lambda q, language, light:\
+ wikipedia.WikipediaSearch(q, language, light, wait=20, asynchronous=False,
Added: packages/indywiki/trunk/debian/patches/non-native.diff
===================================================================
--- packages/indywiki/trunk/debian/patches/non-native.diff (rev 0)
+++ packages/indywiki/trunk/debian/patches/non-native.diff 2009-02-22 18:49:54 UTC (rev 2469)
@@ -0,0 +1,22 @@
+Index: indywiki/src/indywiki/indywiki.py
+===================================================================
+--- indywiki.orig/src/indywiki/indywiki.py 2009-02-22 14:37:21.000000000 +0000
++++ indywiki/src/indywiki/indywiki.py 2009-02-22 14:37:56.000000000 +0000
+@@ -192,7 +192,7 @@
+ self.actionNonNativeColour = QtGui.QAction(MainWindow)
+ self.actionNonNativeColour.setObjectName("actionNonNativeColour")
+ self.actionNonNativeColour.setStatusTip(
+- 'Change the background colour of non-native images' +
++ 'Change the background colour of nearby images' +
+ '(ie, images in pages pointed to/from the current page)')
+ QtCore.QObject.connect(self.actionNonNativeColour, QtCore.SIGNAL(
+ 'triggered()'), self.setNNimageBgColor)
+@@ -394,7 +394,7 @@
+ "MainWindow", "&Toggle Progress bar", None,
+ QtGui.QApplication.UnicodeUTF8))
+ self.actionNonNativeColour.setText(QtGui.QApplication.translate(
+- "MainWindow", "&Change background colour of non-native images", None,
++ "MainWindow", "&Change background colour of nearby images", None,
+ QtGui.QApplication.UnicodeUTF8))
+ self.actionLoadLatestPage.setText(QtGui.QApplication.translate(
+ "MainWindow", "&Load latest page on startup", None,
Added: packages/indywiki/trunk/debian/patches/series
===================================================================
--- packages/indywiki/trunk/debian/patches/series (rev 0)
+++ packages/indywiki/trunk/debian/patches/series 2009-02-22 18:49:54 UTC (rev 2469)
@@ -0,0 +1,3 @@
+non-native.diff
+fix-imports.diff
+do-nothing-on-bg-colour-cancel.diff
Added: packages/indywiki/trunk/debian/pyversions
===================================================================
--- packages/indywiki/trunk/debian/pyversions (rev 0)
+++ packages/indywiki/trunk/debian/pyversions 2009-02-22 18:49:54 UTC (rev 2469)
@@ -0,0 +1 @@
+2.3-
Added: packages/indywiki/trunk/debian/rules
===================================================================
--- packages/indywiki/trunk/debian/rules (rev 0)
+++ packages/indywiki/trunk/debian/rules 2009-02-22 18:49:54 UTC (rev 2469)
@@ -0,0 +1,46 @@
+#!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ python setup.py clean --all
+ rm -rf src/indywiki*egg-info
+ dh_clean
+
+build: build-stamp
+ rm -rf src/indywiki/web1 # remove embedded code
+ python setup.py build
+
+build-stamp: patch
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ python setup.py install --root="$(CURDIR)/debian/indywiki" --no-compile
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_link
+ dh_installchangelogs
+ dh_install --list-missing
+ dh_installdocs
+ dh_installman debian/indywiki.1
+ dh_pysupport
+ dh_fixperms
+ dh_compress
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-arch: build install
+# nothing for a python package
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Property changes on: packages/indywiki/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/indywiki/trunk/debian/watch
===================================================================
--- packages/indywiki/trunk/debian/watch (rev 0)
+++ packages/indywiki/trunk/debian/watch 2009-02-22 18:49:54 UTC (rev 2469)
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/indywiki/indywiki-(.*)\.tar\.gz
More information about the Python-apps-commits
mailing list