tags 667874 + pending thanks Dear maintainer,
I've prepared an NMU for gworkspace (versioned as 0.8.8-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Eagles
diff -Nru gworkspace-0.8.8/debian/changelog gworkspace-0.8.8/debian/changelog --- gworkspace-0.8.8/debian/changelog 2010-09-03 13:33:45.000000000 +0200 +++ gworkspace-0.8.8/debian/changelog 2012-05-26 18:51:35.000000000 +0200 @@ -1,3 +1,11 @@ +gworkspace (0.8.8-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS with GCC-4.7": add patch from Yavor Doganov + (Closes: #667874) + + -- gregor herrmann <gre...@debian.org> Sat, 26 May 2012 18:51:22 +0200 + gworkspace (0.8.8-1) unstable; urgency=low * New upstream version. diff -Nru gworkspace-0.8.8/debian/patches/667874.patch gworkspace-0.8.8/debian/patches/667874.patch --- gworkspace-0.8.8/debian/patches/667874.patch 1970-01-01 01:00:00.000000000 +0100 +++ gworkspace-0.8.8/debian/patches/667874.patch 2012-05-26 18:46:13.000000000 +0200 @@ -0,0 +1,191 @@ +--- gworkspace-0.8.8.orig/GWorkspace/GWorkspace.m ++++ gworkspace-0.8.8/GWorkspace/GWorkspace.m +@@ -1054,29 +1054,29 @@ + { + SEL action = [anItem action]; + +- if (sel_eq(action, @selector(showRecycler:))) { ++ if (sel_isEqual(action, @selector(showRecycler:))) { + return (([dtopManager isActive] == NO) || ([dtopManager dockActive] == NO)); + +- } else if (sel_eq(action, @selector(emptyRecycler:))) { ++ } else if (sel_isEqual(action, @selector(emptyRecycler:))) { + return ([trashContents count] != 0); + +- } else if (sel_eq(action, @selector(checkRemovableMedia:))) { ++ } else if (sel_isEqual(action, @selector(checkRemovableMedia:))) { + return [dtopManager isActive]; + +- } else if (sel_eq(action, @selector(removeTShelfTab:)) +- || sel_eq(action, @selector(renameTShelfTab:)) +- || sel_eq(action, @selector(addTShelfTab:))) { ++ } else if (sel_isEqual(action, @selector(removeTShelfTab:)) ++ || sel_isEqual(action, @selector(renameTShelfTab:)) ++ || sel_isEqual(action, @selector(addTShelfTab:))) { + return [tshelfWin isVisible]; + +- } else if (sel_eq(action, @selector(activateContextHelp:))) { ++ } else if (sel_isEqual(action, @selector(activateContextHelp:))) { + return ([NSHelpManager isContextHelpModeActive] == NO); + +- } else if (sel_eq(action, @selector(logout:))) { ++ } else if (sel_isEqual(action, @selector(logout:))) { + return !loggingout; + +- } else if (sel_eq(action, @selector(cut:)) +- || sel_eq(action, @selector(copy:)) +- || sel_eq(action, @selector(paste:))) { ++ } else if (sel_isEqual(action, @selector(cut:)) ++ || sel_isEqual(action, @selector(copy:)) ++ || sel_isEqual(action, @selector(paste:))) { + NSWindow *kwin = [NSApp keyWindow]; + + if (kwin && [kwin isKindOfClass: [TShelfWin class]]) { +@@ -1086,7 +1086,7 @@ + TShelfIconsView *iview = (TShelfIconsView *)[item view]; + + if ([iview iconsType] == DATA_TAB) { +- if (sel_eq(action, @selector(paste:))) { ++ if (sel_isEqual(action, @selector(paste:))) { + return YES; + } else { + return [iview hasSelectedIcon]; +--- gworkspace-0.8.8.orig/GWorkspace/Desktop/GWDesktopManager.m ++++ gworkspace-0.8.8/GWorkspace/Desktop/GWDesktopManager.m +@@ -599,18 +599,18 @@ + if ([self isActive]) { + SEL action = [menuItem action]; + +- if (sel_eq(action, @selector(duplicateFiles:)) +- || sel_eq(action, @selector(recycleFiles:)) +- || sel_eq(action, @selector(deleteFiles:))) { ++ if (sel_isEqual(action, @selector(duplicateFiles:)) ++ || sel_isEqual(action, @selector(recycleFiles:)) ++ || sel_isEqual(action, @selector(deleteFiles:))) { + return ([[desktopView selectedNodes] count] > 0); + +- } else if (sel_eq(action, @selector(openSelection:))) { ++ } else if (sel_isEqual(action, @selector(openSelection:))) { + NSArray *selection = [desktopView selectedNodes]; + + return (selection && [selection count] + && ([selection isEqual: [NSArray arrayWithObject: dskNode]] == NO)); + +- } else if (sel_eq(action, @selector(openWith:))) { ++ } else if (sel_isEqual(action, @selector(openWith:))) { + NSArray *selection = [desktopView selectedNodes]; + BOOL canopen = YES; + int i; +@@ -632,7 +632,7 @@ + + return canopen; + +- } else if (sel_eq(action, @selector(openSelectionAsFolder:))) { ++ } else if (sel_isEqual(action, @selector(openSelectionAsFolder:))) { + NSArray *selection = [desktopView selectedNodes]; + + if (selection && ([selection count] == 1)) { +--- gworkspace-0.8.8.orig/GWorkspace/FileViewer/GWViewer.m ++++ gworkspace-0.8.8/GWorkspace/FileViewer/GWViewer.m +@@ -1467,9 +1467,9 @@ + } else if ([itemTitle isEqual: NSLocalizedString(@"Background Color...", @"")]) { + return [nodeView respondsToSelector: @selector(setBackgroundColor:)]; + +- } else if (sel_eq(action, @selector(duplicateFiles:)) +- || sel_eq(action, @selector(recycleFiles:)) +- || sel_eq(action, @selector(deleteFiles:))) { ++ } else if (sel_isEqual(action, @selector(duplicateFiles:)) ++ || sel_isEqual(action, @selector(recycleFiles:)) ++ || sel_isEqual(action, @selector(deleteFiles:))) { + if (lastSelection && [lastSelection count] + && ([lastSelection isEqual: baseNodeArray] == NO)) { + return ([[baseNode path] isEqual: [gworkspace trashPath]] == NO); +@@ -1477,7 +1477,7 @@ + + return NO; + +- } else if (sel_eq(action, @selector(openSelection:))) { ++ } else if (sel_isEqual(action, @selector(openSelection:))) { + if ([[baseNode path] isEqual: [gworkspace trashPath]] == NO) { + BOOL canopen = YES; + int i; +@@ -1501,14 +1501,14 @@ + + return NO; + +- } else if (sel_eq(action, @selector(openSelectionAsFolder:))) { ++ } else if (sel_isEqual(action, @selector(openSelectionAsFolder:))) { + if (lastSelection && ([lastSelection count] == 1)) { + return [[lastSelection objectAtIndex: 0] isPackage]; + } + + return NO; + +- } else if (sel_eq(action, @selector(openWith:))) { ++ } else if (sel_isEqual(action, @selector(openWith:))) { + BOOL canopen = YES; + int i; + +@@ -1529,8 +1529,8 @@ + + return canopen; + +- } else if (sel_eq(action, @selector(newFolder:)) +- || sel_eq(action, @selector(newFile:))) { ++ } else if (sel_isEqual(action, @selector(newFolder:)) ++ || sel_isEqual(action, @selector(newFile:))) { + if ([[baseNode path] isEqual: [gworkspace trashPath]] == NO) { + return [[nodeView shownNode] isWritable]; + } +--- gworkspace-0.8.8.orig/GWorkspace/FileViewer/GWSpatialViewer.m ++++ gworkspace-0.8.8/GWorkspace/FileViewer/GWSpatialViewer.m +@@ -1158,9 +1158,9 @@ + } else if ([itemTitle isEqual: NSLocalizedString(@"Background Color...", @"")]) { + return [nodeView respondsToSelector: @selector(setBackgroundColor:)]; + +- } else if (sel_eq(action, @selector(duplicateFiles:)) +- || sel_eq(action, @selector(recycleFiles:)) +- || sel_eq(action, @selector(deleteFiles:))) { ++ } else if (sel_isEqual(action, @selector(duplicateFiles:)) ++ || sel_isEqual(action, @selector(recycleFiles:)) ++ || sel_isEqual(action, @selector(deleteFiles:))) { + if (lastSelection && [lastSelection count] + && ([lastSelection isEqual: baseNodeArray] == NO)) { + return ([[baseNode path] isEqual: [gworkspace trashPath]] == NO); +@@ -1168,7 +1168,7 @@ + + return NO; + +- } else if (sel_eq(action, @selector(openSelection:))) { ++ } else if (sel_isEqual(action, @selector(openSelection:))) { + if ([[baseNode path] isEqual: [gworkspace trashPath]] == NO) { + return (lastSelection && [lastSelection count] + && ([lastSelection isEqual: baseNodeArray] == NO)); +@@ -1176,14 +1176,14 @@ + + return NO; + +- } else if (sel_eq(action, @selector(openSelectionAsFolder:))) { ++ } else if (sel_isEqual(action, @selector(openSelectionAsFolder:))) { + if (lastSelection && ([lastSelection count] == 1)) { + return [[lastSelection objectAtIndex: 0] isPackage]; + } + + return NO; + +- } else if (sel_eq(action, @selector(openWith:))) { ++ } else if (sel_isEqual(action, @selector(openWith:))) { + BOOL canopen = YES; + int i; + +@@ -1204,8 +1204,8 @@ + + return canopen; + +- } else if (sel_eq(action, @selector(newFolder:)) +- || sel_eq(action, @selector(newFile:))) { ++ } else if (sel_isEqual(action, @selector(newFolder:)) ++ || sel_isEqual(action, @selector(newFile:))) { + if ([[baseNode path] isEqual: [gworkspace trashPath]] == NO) { + return [[nodeView shownNode] isWritable]; + } diff -Nru gworkspace-0.8.8/debian/patches/series gworkspace-0.8.8/debian/patches/series --- gworkspace-0.8.8/debian/patches/series 2010-09-03 13:27:59.000000000 +0200 +++ gworkspace-0.8.8/debian/patches/series 2012-05-26 18:47:25.000000000 +0200 @@ -1 +1,2 @@ debian-changes-0.8.8-1 +667874.patch
signature.asc
Description: Digital signature