Bug#767723: unblock: addresses-for-gnustep/0.4.7-2

[Yavor Doganov <yavor@gnu.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package addresses-for-gnustep, it fixes RC bug #749721
which also lead to the removal of agenda.app from testing.

Debdiff attached.

unblock addresses-for-gnustep/0.4.7-2

diff --git a/Frameworks/AddressView/ADPersonPropertyView.h b/Frameworks/AddressView/ADPersonPropertyView.h
index 4f94b43..334e437 100644
--- a/Frameworks/AddressView/ADPersonPropertyView.h
+++ b/Frameworks/AddressView/ADPersonPropertyView.h
@@ -122,7 +122,7 @@ typedef enum {
 - (void) beginEditingInLastCell;
 - (void) endEditing;
 
-- (int) indexOfEditableCellWithDetails: (id) details;
+- (NSUInteger) indexOfEditableCellWithDetails: (id) details;
 
 - (NSString*) propertyForDragWithDetails: (id) details;
 - (NSImage*) imageForDraggedProperty: (NSString*) prop;
diff --git a/Frameworks/AddressView/ADPersonPropertyView.m b/Frameworks/AddressView/ADPersonPropertyView.m
index 37b4df3..d976c54 100644
--- a/Frameworks/AddressView/ADPersonPropertyView.m
+++ b/Frameworks/AddressView/ADPersonPropertyView.m
@@ -626,9 +626,9 @@ static float _globalFontSize;
   [self beginEditingInCellAtIndex: [_cells count]-1 countingBackwards: YES];
 }
 
-- (int) indexOfEditableCellWithDetails: (id) details
+- (NSUInteger) indexOfEditableCellWithDetails: (id) details
 {
-  int i;
+  NSUInteger i;
 
   for(i=0; i<[_cells count]; i++)
     {
diff --git a/Frameworks/AddressView/ADPersonView.m b/Frameworks/AddressView/ADPersonView.m
index d512929..901ca0c 100644
--- a/Frameworks/AddressView/ADPersonView.m
+++ b/Frameworks/AddressView/ADPersonView.m
@@ -205,6 +205,7 @@ static NSString *__defaultCountryCode = nil;
   int y;
   NSRect noteRect;
   id label;
+  NSString *note;
 
   properties = [NSArray arrayWithObjects: ADHomePageProperty,
 			ADPhoneProperty,
@@ -270,7 +271,9 @@ static NSString *__defaultCountryCode = nil;
   [_noteView setVerticallyResizable: YES];
   [_noteView setHorizontallyResizable: YES];
   [_noteView setDelegate: self];
-  [_noteView setString: [_person valueForProperty: ADNoteProperty]];
+  note = [_person valueForProperty: ADNoteProperty];
+  if (note != nil)
+    [_noteView setString: note];
   [_noteView setFont: [NSFont systemFontOfSize: _fontSize]];
   _noteTextChanged = NO;
 
diff --git a/Frameworks/Addresses/ADMultiValue.h b/Frameworks/Addresses/ADMultiValue.h
index dd61750..dff9ead 100644
--- a/Frameworks/Addresses/ADMultiValue.h
+++ b/Frameworks/Addresses/ADMultiValue.h
@@ -31,7 +31,7 @@
 - (NSString*) labelAtIndex: (int) index;
 - (NSString*) identifierAtIndex: (int) index;
     
-- (int) indexForIdentifier: (NSString*) identifier;
+- (NSUInteger) indexForIdentifier: (NSString*) identifier;
 
 - (NSString*) primaryIdentifier;
     
diff --git a/Frameworks/Addresses/ADMultiValue.m b/Frameworks/Addresses/ADMultiValue.m
index 9ad538a..81880f8 100644
--- a/Frameworks/Addresses/ADMultiValue.m
+++ b/Frameworks/Addresses/ADMultiValue.m
@@ -15,7 +15,7 @@
 /* my includes */
 #include "ADMultiValue.h"
 
-#define IS_A(obj,cls) [obj isKindOf: [cls class]]
+#define IS_A(obj,cls) [obj isKindOfClass: [cls class]]
 
 static ADPropertyType _propTypeFromDict(NSDictionary *dict)
 {
@@ -91,9 +91,9 @@ static ADPropertyType _propTypeFromDict(NSDictionary *dict)
   return [[_arr objectAtIndex: index] objectForKey: @"ID"];
 }
 
-- (int) indexForIdentifier: (NSString*) identifier
+- (NSUInteger) indexForIdentifier: (NSString*) identifier
 {
-  int i;
+  NSUInteger i;
 
   for(i=0; i<[_arr count]; i++)
     if([[[_arr objectAtIndex: i] objectForKey: @"ID"]
diff --git a/Frameworks/Addresses/ADPListConverter.m b/Frameworks/Addresses/ADPListConverter.m
index 14ac5c7..558f719 100644
--- a/Frameworks/Addresses/ADPListConverter.m
+++ b/Frameworks/Addresses/ADPListConverter.m
@@ -29,7 +29,7 @@
 - (BOOL) useString: (NSString*) str
 {
   _plist = [str propertyList];
-  if(![_plist isKindOf: [NSDictionary class]])
+  if(![_plist isKindOfClass: [NSDictionary class]])
     {
       NSLog(@"String (%@) does not contain valid property list!\n", str);
       return NO;
diff --git a/debian/changelog b/debian/changelog
index c4f491f..754d079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+addresses-for-gnustep (0.4.7-2) unstable; urgency=medium
+
+  * Team upload.
+  * Apply minimal fix to make the package usable with the current GNUstep
+    libraries (Closes: #749721):
+    - Fix overflow in implicit constant conversion;
+    - Fix improper use of non-existent method;
+    - Do not set string of a NSTextView to nil.
+
+ -- Yavor Doganov <yavor@gnu.org>  Wed, 29 Oct 2014 11:25:10 +0200
+
 addresses-for-gnustep (0.4.7-1) unstable; urgency=low
 
   * New upstream release.