[Debian GNUstep maintainers] Bug#350078: gworkspace NMU

[Hubert Chan]

Hi Jonathan,

I have prepared an NMU for gworkspace to compile it against the new 
GNUstep libraries.  Unfortunately, while preparing the NMU, I found a 
bug that I had introduced in pdfkit.framework that prevented 
gworkspace from compiling.  I've prepared a fixed pdfkit.framework, 
which is ready to upload.  And after it's been uploaded and built, I'm 
planning on uploading my gworkspace NMU unless you're planning on 
making an upload soon.

Let me know what your plans are.  Otherwise, I'll go ahead with my NMU 
when the fixed pdfkit.framework is ready.

Attached is an interdiff between my NMU and the latest gworkspace 
package.  I have made minimal changes, just fixing the critical bugs, 
and updating the dependencies.  (In other words, I haven't updated to 
the latest upstream version.)

<gworkspace-nmu.diff>

-- 
Hubert Chan <hubert at uhoreg.ca> - http://www.uhoreg.ca/
PGP/GnuPG key: 1024D/124B61FA
Fingerprint: 96C5 012F 5F74 A5F7 1FF7  5291 AF29 C719 124B 61FA
Key available at wwwkeys.pgp.net.   Encrypted e-mail preferred.
-------------- next part --------------
diff -u gworkspace-0.7.0/debian/control gworkspace-0.7.0/debian/control
--- gworkspace-0.7.0/debian/control
+++ gworkspace-0.7.0/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian GNUstep maintainers <pkg-gnustep-maintainers at lists.alioth.debian.org>
 Uploaders: Eric Heintzmann <eric at gnustep.fr.st>, Matthias Klose <doko at debian.org>, Jonathan Shipley <jon at windj.ath.cx>, Gürkan Sengün <gurkan at linuks.mine.nu>
-Build-Depends: debhelper (>= 4.2), libgnustep-gui0.9-dev (>= 0.9.4), pdfkit.framework (>= 0.8), file
+Build-Depends: debhelper (>= 4.2), libgnustep-gui0.10-dev (>= 0.10.0), pdfkit.framework (>= 0.8), file
 Standards-Version: 3.6.1.1
 
 Package: gworkspace.app
@@ -12,7 +12,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: gworkspace
 Replaces: gworkspace
-Recommends: preferences, wrapperfactory.app, preview.app, textedit.app, viewpdf.app, zipper.app, cynthiune.app
+Recommends: preferences.app, wrapperfactory.app, preview.app, textedit.app, viewpdf.app, zipper.app, cynthiune.app
 Suggests: gworkspace-apps-wrappers
 Description: GNUstep Workspace Manager
  GWorkspace is the official GNUstep workspace manager. It is a clone
diff -u gworkspace-0.7.0/debian/changelog gworkspace-0.7.0/debian/changelog
--- gworkspace-0.7.0/debian/changelog
+++ gworkspace-0.7.0/debian/changelog
@@ -1,3 +1,12 @@
+gworkspace (0.7.0-1.1) unstable; urgency=low
+
+  * NMU to rebuild against new GNUstep libraries (Closes: #350078).
+    - suggests: preferences.app instead of preferences (renamed).
+  * Fix FTBFS by adding "../.." to the includes path for GWRemote (Closes:
+    #327430).
+
+ -- Hubert Chan <hubert at uhoreg.ca>  Tue, 21 Feb 2006 23:25:28 -0700
+
 gworkspace (0.7.0-1) unstable; urgency=low
 
   * New upstream release (Closes: #286954).
diff -u gworkspace-0.7.0/debian/rules gworkspace-0.7.0/debian/rules
--- gworkspace-0.7.0/debian/rules
+++ gworkspace-0.7.0/debian/rules
@@ -219,6 +219,8 @@
 	for file in `find debian/gworkspace-apps-wrappers -name "*.tiff"`; do \
 	    chmod -v 644 $$file ; done
 	    
+	gsdh_gnustep -i
+
 	: # Overrides lintian warnings    
 	dh_installdirs -p$(p_wrap) usr/share/lintian/overrides
 	cp  $(CURDIR)/debian/$(p_wrap).lintian-overrides \
@@ -300,6 +302,8 @@
 		$(CURDIR)/debian/$$pack/usr/share/lintian/overrides/$$pack ; \
 	    done
 	
+	gsdh_gnustep -a
+
 	dh_installchangelogs -a ChangeLog
 	dh_installdocs -a
 #	dh_installexamples -a
only in patch2:
unchanged:
--- gworkspace-0.7.0.orig/GWRemote/GWRemote/GNUmakefile.preamble
+++ gworkspace-0.7.0/GWRemote/GWRemote/GNUmakefile.preamble
@@ -10,7 +10,7 @@
 
 # Additional include directories the compiler should search
 ADDITIONAL_INCLUDE_DIRS += -IGWRemote -I../IGWRemote -I../../IGWRemote \
-                          -IViewer -IRemoteEditor -IRemoteTerminal
+                          -IViewer -IRemoteEditor -IRemoteTerminal -I../..
 
 # ADDITIONAL_INCLUDE_DIRS +=