--- forg-0.5.1.orig/AssociationsEditor.py +++ forg-0.5.1/AssociationsEditor.py @@ -48,19 +48,19 @@ # Left side widgets inputbox = Frame(self.left_side) - inputbox.grid(row=0, col=0, columnspan=2, rowspan=2, sticky=W) + inputbox.grid(row=0, column=0, columnspan=2, rowspan=2, sticky=W) # File extension entry box and label. ftlabel = Label(inputbox, text='File extension:') self.ftEntry = Entry(inputbox, width=6) - ftlabel.grid(row=0, col=0, sticky=W) - self.ftEntry.grid(row=0, col=1, sticky=W) + ftlabel.grid(row=0, column=0, sticky=W) + self.ftEntry.grid(row=0, column=1, sticky=W) # Application entry box and label applabel = Label(inputbox, text='Application:') self.appEntry = Entry(inputbox, width=30) - applabel.grid(row=1, col=0, sticky=W) - self.appEntry.grid(row=1, col=1, sticky=W) + applabel.grid(row=1, column=0, sticky=W) + self.appEntry.grid(row=1, column=1, sticky=W) # Instruction group box. group = Pmw.Group(self.left_side, tag_text='Instructions:') @@ -99,9 +99,9 @@ command=self.resetAssociations) # self.addAssociationButton.pack(side='top', expand=1, fill='both') # self.removeAssociationButton.pack(side='bottom', expand=1, fill='both') - self.addAssociationButton.grid(row=0, col=0, sticky='NEW') - self.removeAssociationButton.grid(row=1, col=0, sticky='NEW') - self.setDefaultsButton.grid(row=2, col=0, sticky='NEW') + self.addAssociationButton.grid(row=0, column=0, sticky='NEW') + self.removeAssociationButton.grid(row=1, column=0, sticky='NEW') + self.setDefaultsButton.grid(row=2, column=0, sticky='NEW') # Right side widgets self.associationList = Pmw.ScrolledListBox(self.right_side, --- forg-0.5.1.orig/BookmarkEditor.py +++ forg-0.5.1/BookmarkEditor.py @@ -86,7 +86,7 @@ self.tree = Tree.Tree(self.mainBox, bmtree, rootlabel="Bookmarks", lineflag=0) - self.tree.grid(row=0, col=0, sticky='NSEW') + self.tree.grid(row=0, column=0, sticky='NSEW') # Make expandable self.mainBox.grid_rowconfigure(0, weight=1) --- forg-0.5.1.orig/Cache.py +++ forg-0.5.1/Cache.py @@ -87,12 +87,12 @@ lab5 = Label(fr, text=" ") lab6 = Label(fr, text="Continue?") - lab1.grid(row=1, col=0, columnspan=5) - lab2.grid(row=2, col=0, columnspan=5) - lab3.grid(row=3, col=0, columnspan=5) - lab4.grid(row=4, col=0, columnspan=5) - lab5.grid(row=5, col=0, columnspan=5) - lab6.grid(row=6, col=0, columnspan=5) + lab1.grid(row=1, column=0, columnspan=5) + lab2.grid(row=2, column=0, columnspan=5) + lab3.grid(row=3, column=0, columnspan=5) + lab4.grid(row=4, column=0, columnspan=5) + lab5.grid(row=5, column=0, columnspan=5) + lab6.grid(row=6, column=0, columnspan=5) # self.dialog.activate() --- forg-0.5.1.orig/Dialogs.py +++ forg-0.5.1/Dialogs.py @@ -38,12 +38,12 @@ self.frame = Frame(self.dialog.interior()) self.frame.pack(expand=1, fill='both') - Label(self.frame, text="Find a term...").grid(row=0, col=0, + Label(self.frame, text="Find a term...").grid(row=0, column=0, columnspan=5) - Label(self.frame, text="Term: ").grid(row=1, col=0) + Label(self.frame, text="Term: ").grid(row=1, column=0) self.searchEntry = Entry(self.frame, text="") - self.searchEntry.grid(row=1, col=1, columnspan=4) + self.searchEntry.grid(row=1, column=1, columnspan=4) self.css = IntVar() @@ -51,7 +51,7 @@ text="Case-sensitive search", variable = self.css, command = self.cb) - self.caseSensitiveCheckBox.grid(row=2, col=0, columnspan=4) + self.caseSensitiveCheckBox.grid(row=2, column=0, columnspan=4) self.lastMatch = None # self.dialog.activate() @@ -161,10 +161,10 @@ buttons=self.buttons) i = self.dialog.interior() - Label(i, text="New Folder Title:").grid(row=0, col=0, + Label(i, text="New Folder Title:").grid(row=0, column=0, sticky='EW') self.__entry = Entry(i) - self.__entry.grid(row=1, col=0, sticky='EW') + self.__entry.grid(row=1, column=0, sticky='EW') if folderName: self.__entry.insert('end', folderName) --- forg-0.5.1.orig/GUIAskForm.py +++ forg-0.5.1/GUIAskForm.py @@ -65,7 +65,7 @@ print "Couldn't make wid: %s" % errstr continue - wid.grid(row=x, col=0, sticky=W) + wid.grid(row=x, column=0, sticky=W) self.question_widgets.append(wid) self.submit = Button(self, --- forg-0.5.1.orig/GUIDirectory.py +++ forg-0.5.1/GUIDirectory.py @@ -144,7 +144,7 @@ blurb_label = Label(self.sbox, foreground=self.DEFAULT_COLOR, text=rname) blurb_label.grid(row=x, columnspan=self.BLURB_SPAN, - col=self.BLURB_COLUMN, sticky=W) + column=self.BLURB_COLUMN, sticky=W) self.searchlist.append([rname, blurb_label, self.DEFAULT_COLOR]) @@ -167,7 +167,7 @@ resource.__blurb__ = Label(box, text=resource.toURL()) resource.__blurb__.grid(row=rowno, - col=p.HOSTPORT_COLUMN, + column=p.HOSTPORT_COLUMN, columnspan=p.HOSTPORT_SPAN, sticky=E) @@ -207,11 +207,11 @@ self.searchlist.append([rname, b, default_color]) l.grid(row=x, - col=self.TYPE_COLUMN, + column=self.TYPE_COLUMN, columnspan=self.TYPE_SPAN, sticky=W) b.grid(row=x, - col=self.NAME_COLUMN, + column=self.NAME_COLUMN, columnspan=self.NAME_SPAN, sticky=W) @@ -226,16 +226,16 @@ t = t[0:40] Label(self.sbox, text=t).grid(row=x, - col=self.INFO_COLUMN, + column=self.INFO_COLUMN, columnspan=self.INFO_SPAN) else: Label(self.sbox, text=t).grid(row=x, - col=self.INFO_COLUMN, + column=self.INFO_COLUMN, columnspan=self.INFO_SPAN) else: Label(self.sbox, text=" ").grid(row=x, - col=self.INFO_COLUMN, + column=self.INFO_COLUMN, columnspan=self.INFO_SPAN) # Possibly report to the user whether or not a given file is @@ -245,12 +245,12 @@ if cacheobj.isInCache(r): Label(self.sbox, text="Cached").grid(row=x, - col=self.CACHE_COLUMN, + column=self.CACHE_COLUMN, columnspan=self.CACHE_SPAN) else: Label(self.sbox, text=" ").grid(row=x, - col=self.CACHE_COLUMN, + column=self.CACHE_COLUMN, columnspan=self.CACHE_SPAN) self.scrolled_window.resizescrollregion() --- forg-0.5.1.orig/GUIQuestion.py +++ forg-0.5.1/GUIQuestion.py @@ -48,7 +48,7 @@ promptString = self.question.getPromptString() defaultValue = self.question.getDefault() - Label(self, text=promptString).grid(row=0, col=0, sticky=W) + Label(self, text=promptString).grid(row=0, column=0, sticky=W) if self.type == QUESTION_NOTE: # Prompt string is all we need for this one. @@ -58,30 +58,30 @@ self.entry = Entry(self) if len(defaultValue) > 0: self.entry.insert('end', defaultValue) - self.entry.grid(row=0, col=1, columnspan=4, sticky=W) + self.entry.grid(row=0, column=1, columnspan=4, sticky=W) return None if self.type == QUESTION_ASKF or self.type == QUESTION_CHOOSEF: self.entry = Entry(self) if len(defaultValue) > 0: self.entry.insert('end', defaultValue) - self.entry.grid(row=0, col=1, columnspan=4, sticky=W) + self.entry.grid(row=0, column=1, columnspan=4, sticky=W) # Browse buttons for file selection. self.browse = Button(text="Browse", command=self.browse) - self.browse.grid(row=0, col=5, sticky=W) + self.browse.grid(row=0, column=5, sticky=W) return None if self.type == QUESTION_ASKP: self.entry = Entry(self, show="*") if len(defaultValue) > 0: self.entry.insert('end', defaultValue) - self.entry.grid(row=0, col=1, columnspan=4, sticky=W) + self.entry.grid(row=0, column=1, columnspan=4, sticky=W) return None if self.type == QUESTION_ASKL: self.entry = Pmw.ScrolledText(self, hscrollmode='dynamic', text_width=80, text_height=6, vscrollmode='dynamic') - self.entry.grid(row=1, col=0, columnspan=2, rowspan=2, + self.entry.grid(row=1, column=0, columnspan=2, rowspan=2, sticky='N') return None if self.type == QUESTION_SELECT: @@ -95,7 +95,7 @@ print "Invoking defalut %s" % defaultValue self.entry.invoke(defaultValue) - self.entry.grid(row=1, col=0, columnspan=4, rowspan=4, + self.entry.grid(row=1, column=0, columnspan=4, rowspan=4, sticky='NSEW') print 'Returning SELECT GUIQuestion' return None @@ -108,7 +108,7 @@ print "Invoking defalut %s" % defaultValue self.entry.invoke(defaultValue) - self.entry.grid(row=1, col=0, columnspan=4, rowspan=4, + self.entry.grid(row=1, column=0, columnspan=4, rowspan=4, sticky='NSEW') print "Returning CHOOSE GUIQuestion" return None --- forg-0.5.1.orig/GUISearch.py +++ forg-0.5.1/GUISearch.py @@ -48,11 +48,11 @@ for x in range(0, len(labels)): last = x label = labels[x] - Label(self, text=label, foreground='#000000').grid(row=x, col=0, + Label(self, text=label, foreground='#000000').grid(row=x, column=0, columnspan=2) self.entryArea = Frame(self) - self.entryArea.grid(row=(x+1), col=0, columnspan=5, sticky='EW') + self.entryArea.grid(row=(x+1), column=0, columnspan=5, sticky='EW') self.entryBox = Entry(self.entryArea, text='') self.entryBox.pack(side='left', expand=1, fill='x') self.entryBox.bind("", self.submit) @@ -74,7 +74,7 @@ if self.bottom_label: self.bottom_label.destroy() self.bottom_label = Label(self, "Searching for \"%s\"" % terms) - self.bottom_label.grid(row=10, col=0, columnspan=2, + self.bottom_label.grid(row=10, column=0, columnspan=2, sticky=W) # Copy the data from the current resource. --- forg-0.5.1.orig/TkGui.py +++ forg-0.5.1/TkGui.py @@ -141,19 +141,19 @@ self.portEntry = Entry(self.navBox, width=5) self.portEntry.insert('end', '70') - self.hostLabel.grid(row=0, col=0, sticky=W) - self.hostEntry.grid(row=0, col=1, columnspan=2, sticky=W) - self.resourceLabel.grid(row=0, col=3, sticky=W) - self.resourceEntry.grid(row=0, col=4, columnspan=2, sticky=W) - self.portLabel.grid(row=0, col=6, sticky=W) - self.portEntry.grid(row=0, col=7, sticky=W) # No colspan: short box + self.hostLabel.grid(row=0, column=0, sticky=W) + self.hostEntry.grid(row=0, column=1, columnspan=2, sticky=W) + self.resourceLabel.grid(row=0, column=3, sticky=W) + self.resourceEntry.grid(row=0, column=4, columnspan=2, sticky=W) + self.portLabel.grid(row=0, column=6, sticky=W) + self.portEntry.grid(row=0, column=7, sticky=W) # No colspan: short box self.gobutton = Button(self.navBox, text='Go', command=self.go) if Options.program_options.getOption('use_url_format'): self.gobutton.pack(side='right') else: - self.gobutton.grid(row=0, col=8, sticky=W) + self.gobutton.grid(row=0, column=8, sticky=W) if URL != None: resource = GopherResource.GopherResource() --- forg-0.5.1.orig/debian/changelog +++ forg-0.5.1/debian/changelog @@ -0,0 +1,104 @@ +forg (0.5.1-7.2build1) focal; urgency=medium + + * No-change rebuild to generate dependencies on python2. + + -- Matthias Klose Tue, 17 Dec 2019 12:33:15 +0000 + +forg (0.5.1-7.2) unstable; urgency=medium + + * Non-maintainer upload. + * Convert to debhelper compatibility level 9 (Closes: #800172). + + Magically fixes lintian warning no-upstream-changelog. + + Replace "dh_clean -k" with "dh_prop" + + Replace "dh_installmanpages" with "dh_installman". + + Add dependency on ${misc:Depends}. + + Use dh_auto_clean instead of "-$(MAKE) clean". (Fixes lintian warning + debian-rules-ignores-make-clean-error.) + + Add recommended debian/rules targets build-indep and build-arch. + * Build-depend on dh-python. (Fixes dh_python2 warning.) + * Fix lintian warning capitalization-error-in-description (python vs + Python) and remove trailing newline from debian/control. + * Add man-page written by Robert Marder. (Closes: #453526) + + -- Axel Beckert Sun, 06 Dec 2015 22:46:49 +0100 + +forg (0.5.1-7.1) unstable; urgency=low + + * Non-maintainer upload. + * Convert to dh_python2 (Closes: #616813). + + -- Luca Falavigna Mon, 27 May 2013 20:44:16 +0200 + +forg (0.5.1-7) unstable; urgency=low + + * Update for new python policy. Closes: #380796. + * Update standards version. + + -- John Goerzen Mon, 4 Sep 2006 08:56:10 -0500 + +forg (0.5.1-6) unstable; urgency=low + + * ACK NMU. Closes: #213121, #213923, #206401. + + -- John Goerzen Tue, 21 Oct 2003 22:19:14 -0500 + +forg (0.5.1-5.2) unstable; urgency=medium + + * NMU. + * Compensate for debhelper's missing dependency on python (closes: #213923). + + -- Matthias Klose Tue, 7 Oct 2003 08:17:22 +0200 + +forg (0.5.1-5.1) unstable; urgency=low + + * NMU. + * forg binary: Use /usr/bin/python. + * Remove debian example files. + * Make python dependencies more robust (closes: #206401). + + -- Matthias Klose Sun, 28 Sep 2003 15:02:58 +0200 + +forg (0.5.1-5) unstable; urgency=low + + * Updated to by python2.3-friendly -- but don't close #205544, since + python-pmw isn't yet. + + -- John Goerzen Mon, 18 Aug 2003 15:16:44 -0500 + +forg (0.5.1-4) unstable; urgency=low + + * Changed all occurances of col= to column= to provide compatibility with + newer Tk. + + -- John Goerzen Wed, 5 Feb 2003 16:21:07 -0600 + +forg (0.5.1-3) unstable; urgency=low + + * Added dependency on python-imaging-tk. Closes: #164913. + + -- John Goerzen Wed, 5 Feb 2003 16:16:37 -0600 + +forg (0.5.1-2) unstable; urgency=low + + * Switched to Python-2.2. (Closes: #161556). Patch by Thomas Schoepf. + + -- John Goerzen Tue, 15 Oct 2002 08:55:06 -0500 + +forg (0.5.1-1) unstable; urgency=low + + * New upstream release. + * Fixed Control file for newer python. Closes: #142453. + * Fixed typo in description. Closes: #135450. + + -- John Goerzen Fri, 12 Apr 2002 10:46:37 -0500 + +forg (0.03-1) unstable; urgency=low + + * Initial Release. + + -- John Goerzen Sun, 7 Jan 2001 23:48:33 -0500 + +Local variables: +mode: debian-changelog +add-log-mailing-address "jgoerzen@complete.org" +End: --- forg-0.5.1.orig/debian/compat +++ forg-0.5.1/debian/compat @@ -0,0 +1 @@ +9 --- forg-0.5.1.orig/debian/control +++ forg-0.5.1/debian/control @@ -0,0 +1,14 @@ +Source: forg +Section: net +Priority: optional +Maintainer: John Goerzen +Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), dh-python +Standards-Version: 3.7.2 + +Package: forg +Architecture: all +Depends: ${misc:Depends}, ${python:Depends}, python-tk, python-pmw, python-imaging-tk +Description: Graphical Gopher Browser + forg is a new graphical browser for gopher written in Python. + It will let you browse the world-wide gopherspace and handles + various types of media, including HTML and video. --- forg-0.5.1.orig/debian/copyright +++ forg-0.5.1/debian/copyright @@ -0,0 +1,14 @@ +This package was debianized by John Goerzen on +Sun, 7 Jan 2001 23:48:33 -0500. + +It was downloaded from http://opop.nols.com/proggie/forg-0.03.tar.gz. + +Its homepage is http://opop.nols.com/forg.shtml + +Upstream Author: "David Allen" + +Copyright: + +GNU GPL. Debian GNU/Linux users may find that in +/usr/share/common-licenses/GPL. + --- forg-0.5.1.orig/debian/dirs +++ forg-0.5.1/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/forg --- forg-0.5.1.orig/debian/docs +++ forg-0.5.1/debian/docs @@ -0,0 +1,3 @@ +BUGS +README +TODO --- forg-0.5.1.orig/debian/forg.1 +++ forg-0.5.1/debian/forg.1 @@ -0,0 +1,28 @@ +.TH FORG 1 "29 Nov 2007" +.SH NAME +\fBforg\fP \- graphical gopher:// client + +.SH SYNOPSIS +.B forg +.RI [gopher-url] +.SH DESCRIPTION +.B forg +is a graphical gopher client written in Python. It includes bookmarking, browser-style navigation, launching specific file types with user-specified programs, and Gopher+ compliance. + +.LP +.SH OPTIONS + +.TP +\fBgopher\-url\fR +Specifies the initial URL to open when +.B forg +starts. If this is not specified, +.B forg +will load the home page as set in ~/.forg/forgrc or will load the built in default of gopher://gopher.floodgap.com:70/. +.B forg +requires that an absolute URI be used; thus the gopher:// protocol part is required. The port number nor any path information needs to be specified, however. +.SH BUGS +If you find a bug, please report it using the Debian Bug Tracker at http://bugs.debian.org/forg. +.SH AUTHORS +David Allen (mda@idatar.com) + --- forg-0.5.1.orig/debian/manpages +++ forg-0.5.1/debian/manpages @@ -0,0 +1 @@ +debian/forg.1 --- forg-0.5.1.orig/debian/rules +++ forg-0.5.1/debian/rules @@ -0,0 +1,82 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + + touch configure-stamp + +build: build-arch build-indep +build-arch: +build-indep: configure-stamp build-stamp +build-stamp: + dh_testdir + + # Add here commands to compile the package. + #$(MAKE) + #/usr/bin/docbook-to-man debian/forg.sgml > forg.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + dh_auto_clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + # Add here commands to install the package into debian/forg. + #\$(MAKE) install DESTDIR=$(CURDIR)/debian/ + cp *.py debian/forg/usr/share/forg + # It's a cp because other forg modules import forg.py... argh. + cp debian/forg/usr/share/forg/forg.py debian/forg/usr/bin/forg + + +# Build architecture-independent files here. +binary-arch: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-indep: build install + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs + dh_installexamples + dh_installmenu +# dh_installemacsen +# dh_installpam +# dh_installinit + dh_installcron + dh_installman + dh_installinfo +# dh_undocumented + dh_installchangelogs + dh_link + dh_compress + dh_fixperms + dh_python2 + dh_installdeb +# dh_perl + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- forg-0.5.1.orig/forg.py +++ forg-0.5.1/forg.py @@ -44,6 +44,8 @@ import sys import tkFileDialog +sys.path.append("/usr/share/forg") + # Non-GUI FORG specific imports from gopher import * import utils