Patch information for helpviewer.app (0.3-7) debian-dir only changes

--- helpviewer.app-0.3.orig/debian/copyright
+++ helpviewer.app-0.3/debian/copyright
@@ -0,0 +1,29 @@
+This package was debianized by Gürkan Sengün <gurkan@linuks.mine.nu> on
+Sat,  7 Aug 2004 11:39:50 +0200.
+
+It was downloaded from http://www.roard.com/helpviewer/download.html
+
+Upstream Author:
+
+    Nicolas Roard <nicolas@roard.com>
+
+License:
+
+    Copyright (C) 2003 Nicolas Roard
+
+    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 2 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, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
--- helpviewer.app-0.3.orig/debian/README.source
+++ helpviewer.app-0.3/debian/README.source
@@ -0,0 +1,8 @@
+This package uses quilt (in a fairly standard/straightforward way) to
+manage all modifications to the upstream source.  Please see
+
+  /usr/share/doc/quilt/README.source and quilt(1)
+
+for further instructions.
+
+ -- Yavor Doganov <yavor@gnu.org>, Sun, 30 May 2010 10:48:20 +0300
--- helpviewer.app-0.3.orig/debian/menu
+++ helpviewer.app-0.3/debian/menu
@@ -0,0 +1,4 @@
+?package(helpviewer.app):needs="X11" section="Help"\
+  title="HelpViewer" command="/usr/bin/HelpViewer"\
+  longtitle="Online help viewer for GNUstep"\
+  icon="/usr/share/pixmaps/HelpViewer.xpm"
--- helpviewer.app-0.3.orig/debian/preinst
+++ helpviewer.app-0.3/debian/preinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+# dpkg will not replace a real directory with a symlink.
+# FIXME: Remove during the squeeze+1 cycle.
+
+set -e
+set -u
+
+RESDIR=/usr/lib/GNUstep/Applications/HelpViewer.app/Resources
+
+case "$1" in
+    install | upgrade)
+	if [ -d $RESDIR ] && [ ! -L $RESDIR ]; then
+	    rm -rf $RESDIR
+	fi
+    ;;
+    
+    abort-upgrade)
+    ;;
+
+    *)
+	echo "preinst called with unknown argument \`$1'" >&2
+	exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- helpviewer.app-0.3.orig/debian/changelog
+++ helpviewer.app-0.3/debian/changelog
@@ -0,0 +1,100 @@
+helpviewer.app (0.3-7) unstable; urgency=low
+
+  * debian/compat: Set to 7.
+  * debian/control (Section): Change to `gnustep'.
+    (Build-Depends): Require debhelper >= 7; unversion
+    libgnustep-gui-dev.
+    (Depends): Add ${misc:Depends} and ${gnustep:Depends}.
+    (Description): Extend.
+    (Standards-Version): Claim compliance with 3.8.4 as of this release.
+    (Vcs-Arch): New field.
+  * debian/rules: Export GNUSTEP_MAKEFILES and avoid gs_make.
+    (OPTFLAG): No longer define; rework noopt handling to be compatible
+    with gnustep-make/2.4.x (Closes: #581951).
+    (install): Replace dh_clean -k with dh_prep.
+    (binary-arch): Conditionally move Resources to /usr/share.
+  * debian/preinst:
+  * debian/README.source:
+  * debian/source/format: New file.
+  * debian/lintian-overrides: Delete.
+  * debian/patches/05_compilation-fixes.patch: Add description.
+  * debian/HelpViewer.desktop: Make it valid.
+  * debian/watch: Make it work, just in case.
+
+ -- Yavor Doganov <yavor@gnu.org>  Sun, 30 May 2010 10:54:31 +0300
+
+helpviewer.app (0.3-6) unstable; urgency=low
+
+  * debian/compat: Set to 6.
+  * debian/control (Maintainer): Adopt package, set to the GNUstep team
+    (Closes: #450890).
+    (Uploaders): Add myself.
+    (Build-Depends): Bump debhelper to >= 6.0.7 (for dh_lintian) and
+    lignustep-gui-dev to >= 0.14.  Drop gnustep-make.  Add quilt for the
+    patch management and imagemagick for the icon conversion.
+    (Standards-Version): Set to 3.8.0 (no changes needed).
+    (Homepage): New field, moved from Description.
+  * debian/docs: Delete; README is useless.
+  * debian/dirs: Delete.
+  * debian/menu: Add `longtitle' and `icon' sections.
+  * debian/HelpViewer.desktop: Set the proper `Version'; set the full path
+    for `Icon' and add Bulgarian `Name' and `Comment'.
+  * debian/lintian-override: Rename as...
+  * debian/lintian-overrides: ...to get it installed by dh_lintian.
+  * debian/rules: Include quilt.make and adjust all rules accordingly.
+    Use automatic variables where possible.  Use gs_make in all recipes.
+    (GNUSTEP_MAKEFILES, MAKE): Do not define.
+    (d_app, LDFLAGS): Define.
+    (OPTFLAG): Define conditionally, based on the presence of `noopt' in
+    DEB_BUILD_OPTIONS.
+    (build-stamp): Pass OPTFLAG, LDFLAGS and messages=yes to gs_make.
+    Convert the TIFF icon to XPM format.
+    (clean-patched): Delete the XPM icon.
+    (install): Don't invoke dh_installdirs.  Install the XPM icon.
+    (binary-arch): Use dh_lintian to install the override.
+  * debian/patches/05_compilation-fixes.patch: New; conditionally
+    include GNUstep.h if GNUSTEP is not defined, so that the 
+    ASSIGN/RELEASE macros actually work.  Add a few more minor
+    fixes to avoid compilation warnings with the current GNUstep 
+    libraries (Closes: #489695).  Incidentally, it appears that .xlp files
+    render again (Closes: #489880).
+  * debian/watch: New dummy file with comments only.
+
+ -- Yavor Doganov <yavor@gnu.org>  Thu, 10 Jul 2008 19:30:11 +0300
+
+helpviewer.app (0.3-5) unstable; urgency=low
+
+  * GNUstep transition.
+    + Updated debian/rules.
+  * Added a desktop file.
+
+ -- Gürkan Sengün <gurkan@linuks.mine.nu>  Wed, 31 Oct 2007 13:07:01 +0100
+
+helpviewer.app (0.3-4) unstable; urgency=low
+
+  * Rebuild against latest libgnustep-gui-dev.
+  * Bump standards version.
+
+ -- Gürkan Sengün <gurkan@linuks.mine.nu>  Tue, 26 Sep 2006 22:39:25 +0200
+
+helpviewer.app (0.3-3) unstable; urgency=low
+
+  * Rebuild against latest libgnustep-gui.
+  * Update manual page.
+  * Bump standards version.
+
+ -- Gürkan Sengün <gurkan@linuks.mine.nu>  Wed,  8 Feb 2006 14:02:34 +0100
+
+helpviewer.app (0.3-2) unstable; urgency=low
+
+  * Updated debian/control build-depends for GNUstep 0.9.4.
+  * Fixed debian/copyright.
+  * Renamed source package to helpviewer.app.
+
+ -- Gürkan Sengün <gurkan@linuks.mine.nu>  Sun, 21 Nov 2004 21:59:43 +0100
+
+helpviewer (0.3-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Gürkan Sengün <gurkan@linuks.mine.nu>  Sat,  7 Aug 2004 11:39:50 +0200
--- helpviewer.app-0.3.orig/debian/compat
+++ helpviewer.app-0.3/debian/compat
@@ -0,0 +1 @@
+7
--- helpviewer.app-0.3.orig/debian/watch
+++ helpviewer.app-0.3/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.roard.com/helpviewer/download/HelpViewer-(.*)\.tgz
--- helpviewer.app-0.3.orig/debian/rules
+++ helpviewer.app-0.3/debian/rules
@@ -0,0 +1,73 @@
+#!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
+include /usr/share/GNUstep/debian/config.mk
+
+export GNUSTEP_MAKEFILES := $(GS_MAKE_DIR)
+d_app := $(CURDIR)/debian/helpviewer.app
+LDFLAGS := -Wl,-z,defs -Wl,--as-needed
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+optim := debug=yes
+endif
+
+build: patch build-stamp
+
+build-stamp:
+	dh_testdir
+	$(MAKE) $(optim) LDFLAGS="$(LDFLAGS)" messages=yes
+	convert Icons/HelpViewer.tiff -resize 32x32 HelpViewer.xpm
+	touch $@
+
+clean: clean-patched unpatch
+
+clean-patched:
+	dh_testdir
+	dh_testroot
+	$(MAKE) distclean
+	dh_clean build-stamp HelpViewer.xpm
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	$(MAKE) install DESTDIR=$(d_app) GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
+	dh_install debian/*.desktop usr/share/applications/
+	rm $(d_app)/usr/lib/GNUstep/Applications/*.app/Resources/*.desktop
+	install -D -m 644 HelpViewer.xpm \
+	  $(d_app)/usr/share/pixmaps/HelpViewer.xpm
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_lintian
+	dh_installmenu
+	dh_installman
+ifeq ($(GS_USE_FHS),yes)
+	gsdh_gnustep
+	dh_installdirs usr/share/GNUstep
+	mv $(d_app)$(GNUSTEP_SYSTEM_APPS)/HelpViewer.app/Resources \
+	  $(d_app)/usr/share/GNUstep/HelpViewer.app
+	dh_link usr/share/GNUstep/HelpViewer.app \
+	  $(GNUSTEP_SYSTEM_APPS)/HelpViewer.app/Resources
+endif
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- helpviewer.app-0.3.orig/debian/control
+++ helpviewer.app-0.3/debian/control
@@ -0,0 +1,22 @@
+Source: helpviewer.app
+Section: gnustep
+Priority: optional
+Maintainer: Debian GNUstep maintainers <pkg-gnustep-maintainers@lists.alioth.debian.org>
+Uploaders: Yavor Doganov <yavor@gnu.org>
+Build-Depends: debhelper (>= 7),
+	       quilt,
+	       libgnustep-gui-dev,
+	       imagemagick
+Vcs-Arch: http://arch.debian.org/arch/pkg-gnustep/gnustep/helpviewer-app--debian--1.0
+Standards-Version: 3.8.4
+Homepage: http://www.roard.com/helpviewer/
+
+Package: helpviewer.app
+Architecture: any
+Depends: ${shlibs:Depends},
+	 ${misc:Depends},
+	 ${gnustep:Depends}
+Description: Online help viewer for GNUstep programs
+ HelpViewer is an online help viewer for GNUstep programs.  It can
+ render files in the XLP format, although this format has been
+ deprecated and only several packages still use it.
--- helpviewer.app-0.3.orig/debian/HelpViewer.1
+++ helpviewer.app-0.3/debian/HelpViewer.1
@@ -0,0 +1,19 @@
+.TH HELPVIEWER 1 "August  7, 2004"
+.SH NAME
+HelpViewer \- Online help viewer for GNUstep programs
+.SH SYNOPSIS
+.B HelpViewer
+.SH DESCRIPTION
+This manual page documents briefly the
+.B HelpViewer
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+\fBHelpViewer\fP is an online help viewer for GNUstep programs.
+.SH SEE ALSO
+.BR GNUstep (7).
+.br
+.SH AUTHOR
+This manual page was written by G\[:u]rkan Seng\[:u]n <gurkan@linuks.mine.nu>,
+for the Debian project (but may be used by others).
--- helpviewer.app-0.3.orig/debian/HelpViewer.desktop
+++ helpviewer.app-0.3/debian/HelpViewer.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Categories=Documentation;Utility;
+Name=HelpViewer
+Name[bg]=HelpViewer
+Comment=GNUstep Help Viewer
+Comment[bg]=Браузър на документация за GNUstep
+Icon=/usr/share/pixmaps/HelpViewer.xpm
+Exec=HelpViewer
--- helpviewer.app-0.3.orig/debian/manpages
+++ helpviewer.app-0.3/debian/manpages
@@ -0,0 +1 @@
+debian/HelpViewer.1
--- helpviewer.app-0.3.orig/debian/source/format
+++ helpviewer.app-0.3/debian/source/format
@@ -0,0 +1 @@
+1.0
--- helpviewer.app-0.3.orig/debian/patches/series
+++ helpviewer.app-0.3/debian/patches/series
@@ -0,0 +1 @@
+05_compilation-fixes.patch
--- helpviewer.app-0.3.orig/debian/patches/05_compilation-fixes.patch
+++ helpviewer.app-0.3/debian/patches/05_compilation-fixes.patch
@@ -0,0 +1,283 @@
+Description: Various fixes for compilation errors and warnings.
+
+Index: helpviewer.app-0.3/Controller.m
+===================================================================
+--- helpviewer.app-0.3.orig/Controller.m	2008-07-10 21:30:57.000000000 +0300
++++ helpviewer.app-0.3/Controller.m	2008-07-10 21:31:44.000000000 +0300
+@@ -65,6 +65,7 @@
+ - (void) dealloc 
+ {
+     RELEASE (windowController);
++    [super dealloc];
+ }
+ 
+ - (void) openFile: (id) sender
+Index: helpviewer.app-0.3/FigureCell.m
+===================================================================
+--- helpviewer.app-0.3.orig/FigureCell.m	2008-07-10 21:30:57.000000000 +0300
++++ helpviewer.app-0.3/FigureCell.m	2008-07-10 21:31:44.000000000 +0300
+@@ -59,7 +59,6 @@
+     if (_legends)
+     {
+ 	      int i;
+-	      float interspace = 20;
+ 	      float spaceMargin = 20;
+ 	      float border = 12;
+ 	      float Margin = ([textView bounds].size.width - imageWidth - 2*spaceMargin - 2*border)/2;
+@@ -165,11 +164,8 @@
+ 
+ 	NSPoint p1 = NSMakePoint (r.origin.x, r.origin.y + radius);
+ 	NSPoint p2 = NSMakePoint (r.origin.x, r.origin.y + r.size.height - radius);
+-	NSPoint p3 = NSMakePoint (r.origin.x + radius, r.origin.y + r.size.height);
+ 	NSPoint p4 = NSMakePoint (r.origin.x + r.size.width - radius, r.origin.y + r.size.height);
+-	NSPoint p5 = NSMakePoint (r.origin.x + r.size.width, r.origin.y + r.size.height - radius);
+ 	NSPoint p6 = NSMakePoint (r.origin.x + r.size.width, r.origin.y + radius);
+-	NSPoint p7 = NSMakePoint (r.origin.x + r.size.width - radius, r.origin.y);
+ 	NSPoint p8 = NSMakePoint (r.origin.x + radius, r.origin.y);
+ 
+ 	NSPoint pr1 = NSMakePoint (r.origin.x + radius, r.origin.y + r.size.height - radius);
+Index: helpviewer.app-0.3/HandlerStructureXLP.h
+===================================================================
+--- helpviewer.app-0.3.orig/HandlerStructureXLP.h	2008-07-10 21:30:57.000000000 +0300
++++ helpviewer.app-0.3/HandlerStructureXLP.h	2008-07-10 21:31:44.000000000 +0300
+@@ -29,7 +29,7 @@
+ #ifdef MACOSX
+ @interface HandlerStructureXLP : NSObject <HandlerStructure>
+ #else
+-#include "Foundation/GSXML.h"
++#include <GNUstepBase/GSXML.h>
+ @interface HandlerStructureXLP : GSSAXHandler <HandlerStructure>
+ #endif
+ {
+Index: helpviewer.app-0.3/HandlerStructureXLP.m
+===================================================================
+--- helpviewer.app-0.3.orig/HandlerStructureXLP.m	2008-07-10 21:30:57.000000000 +0300
++++ helpviewer.app-0.3/HandlerStructureXLP.m	2008-07-10 21:31:44.000000000 +0300
+@@ -44,6 +44,7 @@
+ 
+ - (void) dealloc {
+ 	RELEASE (_firstSection);
++	[super dealloc];
+ }
+ 
+ - (void) startElement: (NSString*) elementName attributes: (NSMutableDictionary*) elementAttributes {
+@@ -99,7 +100,6 @@
+ 		id str = [[NSMutableAttributedString alloc] initWithString: tag];
+ 
+ 		[tag release];
+-		int i;
+ 		
+ 		NSEnumerator *enumerator = [elementAttributes keyEnumerator];
+ 		id key;
+Index: helpviewer.app-0.3/Label.m
+===================================================================
+--- helpviewer.app-0.3.orig/Label.m	2008-07-10 21:30:57.000000000 +0300
++++ helpviewer.app-0.3/Label.m	2008-07-10 21:31:44.000000000 +0300
+@@ -33,6 +33,7 @@
+ 
+ - (void) dealloc {
+     RELEASE (_ID);
++    [super dealloc];
+ }
+ 
+ - (void) setBegin: (int) locationBegin {
+Index: helpviewer.app-0.3/Legend.m
+===================================================================
+--- helpviewer.app-0.3.orig/Legend.m	2008-07-10 21:30:57.000000000 +0300
++++ helpviewer.app-0.3/Legend.m	2008-07-10 21:31:44.000000000 +0300
+@@ -41,6 +41,7 @@
+ - (void) dealloc 
+ {
+     RELEASE (legend);
++    [super dealloc];
+ }
+ 
+ - (NSComparisonResult) compareLegends: (id) sender
+Index: helpviewer.app-0.3/main.m
+===================================================================
+--- helpviewer.app-0.3.orig/main.m	2008-07-10 21:30:57.000000000 +0300
++++ helpviewer.app-0.3/main.m	2008-07-10 21:31:44.000000000 +0300
+@@ -17,7 +17,7 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+-#include <Foundation/NSObject.h>
++#include <AppKit/NSApplication.h>
+ 
+ int main (int argc, const char **argv)
+ {
+Index: helpviewer.app-0.3/mainWindowController.h
+===================================================================
+--- helpviewer.app-0.3.orig/mainWindowController.h	2008-07-10 21:30:57.000000000 +0300
++++ helpviewer.app-0.3/mainWindowController.h	2008-07-10 21:31:44.000000000 +0300
+@@ -20,7 +20,9 @@
+ #ifndef __MAIN_WINDOW_CONTROLLER_H__
+ #define __MAIN_WINDOW_CONTROLLER_H__
+ 
++#ifndef GNUSTEP
+ #include "GNUstep.h"
++#endif
+ #include "Label.h"
+ #include "Parser.h"
+ #include "HandlerStructure.h"
+Index: helpviewer.app-0.3/mainWindowController.m
+===================================================================
+--- helpviewer.app-0.3.orig/mainWindowController.m	2008-07-10 21:30:57.000000000 +0300
++++ helpviewer.app-0.3/mainWindowController.m	2008-07-10 21:31:44.000000000 +0300
+@@ -98,7 +98,6 @@
+ 
+ - (BOOL) loadFile: (NSString*) fileName 
+ {
+-    NSAttributedString* string;
+     BOOL ret = NO;
+ 
+     ASSIGN (handler, [HandlerStructureXLP new]);
+@@ -474,6 +473,7 @@
+ */
+     RELEASE (resultTextView);
+     RELEASE (resultOutlineView);
++    [super dealloc];
+ }
+ 
+ @end
+Index: helpviewer.app-0.3/NoteCell.m
+===================================================================
+--- helpviewer.app-0.3.orig/NoteCell.m	2008-07-10 21:30:57.000000000 +0300
++++ helpviewer.app-0.3/NoteCell.m	2008-07-10 21:32:36.000000000 +0300
+@@ -62,7 +62,6 @@
+ 
+     float heighttext;
+       float imageWidth = [_image size].width;
+-      float imageHeight = [_image size].height;   
+       float border = 12;
+       float Margin = ([textView bounds].size.width - 16 - imageWidth- border);
+ 
+@@ -109,11 +108,8 @@
+ 
+ 	NSPoint p1 = NSMakePoint (cellFrame.origin.x, cellFrame.origin.y + radius);
+ 	NSPoint p2 = NSMakePoint (cellFrame.origin.x, cellFrame.origin.y + cellFrame.size.height - radius);
+-	NSPoint p3 = NSMakePoint (cellFrame.origin.x + radius, cellFrame.origin.y + cellFrame.size.height);
+ 	NSPoint p4 = NSMakePoint (cellFrame.origin.x + cellFrame.size.width - radius, cellFrame.origin.y + cellFrame.size.height);
+-	NSPoint p5 = NSMakePoint (cellFrame.origin.x + cellFrame.size.width, cellFrame.origin.y + cellFrame.size.height - radius);
+ 	NSPoint p6 = NSMakePoint (cellFrame.origin.x + cellFrame.size.width, cellFrame.origin.y + radius);
+-	NSPoint p7 = NSMakePoint (cellFrame.origin.x + cellFrame.size.width - radius, cellFrame.origin.y);
+ 	NSPoint p8 = NSMakePoint (cellFrame.origin.x + radius, cellFrame.origin.y);
+ 
+ 	NSPoint pr1 = NSMakePoint (cellFrame.origin.x + radius, cellFrame.origin.y + cellFrame.size.height - radius);
+@@ -142,11 +138,8 @@
+ 	if (_note)
+ 	{
+ 		  
+-	      int i;
+-	      float interspace = 20;
+ 	      float imageWidth = [_image size].width;
+ 	      float imageHeight = [_image size].height;   
+-	      float spaceMargin = 20;
+ 	      float border = 12;
+ 	      //NSLog (@"cellFrame.size.width : %.2f", cellFrame.size.width);
+ 	      float Margin = (cellFrame.size.width - imageWidth- border);
+Index: helpviewer.app-0.3/Page.m
+===================================================================
+--- helpviewer.app-0.3.orig/Page.m	2008-07-10 21:30:57.000000000 +0300
++++ helpviewer.app-0.3/Page.m	2008-07-10 21:31:44.000000000 +0300
+@@ -36,6 +36,7 @@
+     RELEASE (subviews);
+     RELEASE (title);
+     RELEASE (text);
++    [super dealloc];
+ }
+ 
+ - (NSString*) title {
+Index: helpviewer.app-0.3/Section.m
+===================================================================
+--- helpviewer.app-0.3.orig/Section.m	2008-07-10 21:30:57.000000000 +0300
++++ helpviewer.app-0.3/Section.m	2008-07-10 21:31:44.000000000 +0300
+@@ -51,6 +51,7 @@
+     RELEASE (text);
+     RELEASE (header);
+     RELEASE (path);
++    [super dealloc];
+ }
+ 
+ - (NSMutableAttributedString*) text {
+Index: helpviewer.app-0.3/TextFormatterXLP.h
+===================================================================
+--- helpviewer.app-0.3.orig/TextFormatterXLP.h	2008-07-10 21:30:57.000000000 +0300
++++ helpviewer.app-0.3/TextFormatterXLP.h	2008-07-10 21:31:44.000000000 +0300
+@@ -32,7 +32,7 @@
+ #ifdef MACOSX
+ @interface TextFormatterXLP : NSObject <TextFormatter>
+ #else
+-#include "Foundation/GSXML.h"
++#include <GNUstepBase/GSXML.h>
+ @interface TextFormatterXLP : GSSAXHandler <TextFormatter>
+ #endif
+ {
+Index: helpviewer.app-0.3/TextFormatterXLP.m
+===================================================================
+--- helpviewer.app-0.3.orig/TextFormatterXLP.m	2008-07-10 21:30:57.000000000 +0300
++++ helpviewer.app-0.3/TextFormatterXLP.m	2008-07-10 21:31:44.000000000 +0300
+@@ -49,7 +49,6 @@
+ 	id str = [[NSMutableAttributedString alloc] initWithString: tag];
+ 
+ 	[tag release];
+-	int i;
+ 	
+ 	NSEnumerator *enumerator = [elementAttributes keyEnumerator];
+ 	id key;
+@@ -321,7 +320,6 @@
+ - (void) characters: (NSString*) name {
+     NSMutableDictionary* attr = [NSMutableDictionary dictionaryWithCapacity: 2];
+     NSFont* font = nil;
+-    NSMutableString* value;
+     NSFontTraitMask FontMask = 0;
+     int FontSize = 12;
+ 
+@@ -425,9 +423,9 @@
+ 
+ 	    BRCell* attachCell = [BRCell sharedBRCell];
+ 	    [BR setAttachmentCell: attachCell];
+-	    NSMutableAttributedString* AS = [NSMutableAttributedString attributedStringWithAttachment: BR];
++	    NSMutableAttributedString* AS = (NSMutableAttributedString *)[NSMutableAttributedString attributedStringWithAttachment: BR];
+     	    
+-	    NSFont* font = [[NSFontManager sharedFontManager]
++	    [[NSFontManager sharedFontManager]
+                 convertFont: [NSFont userFontOfSize: 1]
+                 toHaveTrait: 0];
+ 
+@@ -469,7 +467,7 @@
+         NSTextAttachment* Attachment = [[NSTextAttachment alloc] init];
+         [Attachment setAttachmentCell: attachCell];
+ 
+-        NSMutableAttributedString* t = [NSMutableAttributedString attributedStringWithAttachment: Attachment];
++        NSMutableAttributedString* t = (NSMutableAttributedString *)[NSMutableAttributedString attributedStringWithAttachment: Attachment];
+         //[t setAlignment: NSCenterTextAlignment range: NSMakeRange (0, [t length])];
+ 
+     	[astring appendAttributedString: t];
+@@ -504,7 +502,7 @@
+         Attachment = [[NSTextAttachment alloc] initWithFileWrapper: wrapper];
+         [Attachment setAttachmentCell: attachCell];
+ 
+-        NSMutableAttributedString* t = [NSMutableAttributedString attributedStringWithAttachment: Attachment];
++        NSMutableAttributedString* t = (NSMutableAttributedString *)[NSMutableAttributedString attributedStringWithAttachment: Attachment];
+         //[t setAlignment: NSCenterTextAlignment range: NSMakeRange (0, [t length])];
+ 
+     	[_currentContent appendAttributedString: t];
+@@ -540,7 +538,7 @@
+     [attachCell resizeWithTextView: textView];
+ 
+     [BR setAttachmentCell: attachCell];
+-    NSMutableAttributedString* AS = [NSMutableAttributedString attributedStringWithAttachment: BR];
++    NSMutableAttributedString* AS = (NSMutableAttributedString *)[NSMutableAttributedString attributedStringWithAttachment: BR];
+     //[AS setAlignment: NSCenterTextAlignment range: NSMakeRange (0, [AS length])];
+     NSMutableAttributedString* astring = [[NSMutableAttributedString alloc] initWithString: @"\n"];
+ 
+@@ -586,7 +584,7 @@
+     [attachCell setLegends: plegends];
+     [attachCell resizeWithTextView: textView];
+     [BR setAttachmentCell: attachCell];
+-    NSMutableAttributedString* AS = [NSMutableAttributedString attributedStringWithAttachment: BR];
++    NSMutableAttributedString* AS = (NSMutableAttributedString *)[NSMutableAttributedString attributedStringWithAttachment: BR];
+     [AS setAlignment: NSCenterTextAlignment range: NSMakeRange (0, [AS length])];
+ 
+     [_currentContent appendAttributedString: AS];
helpviewer.app (0.3-7) debian-dir only changes

Summary

Patch contents
