diff -u aclock.app-0.2.3/debian/changelog aclock.app-0.2.3/debian/changelog
--- aclock.app-0.2.3/debian/changelog
+++ aclock.app-0.2.3/debian/changelog
@@ -1,26 +1,10 @@
-aclock.app (0.2.3-3build4) oneiric; urgency=low
+aclock.app (0.2.3-3.1) unstable; urgency=low
 
-  * Rebuild for gnustep-base 0.22 and gnustep-gui 0.20.
+  * Non-maintainer upload.
+  * main.m (main): Use NSApplcationMain to prevent startup problems with
+    gnustep-gui0.20 (Closes: #645921).
 
- -- Colin Watson <cjwatson@ubuntu.com>  Mon, 11 Jul 2011 11:07:27 +0100
-
-aclock.app (0.2.3-3build3) natty; urgency=low
-
-  * Rebuild for the GNUstep transition.
-
- -- Luca Falavigna <dktrkranz@ubuntu.com>  Fri, 29 Oct 2010 19:57:22 +0200
-
-aclock.app (0.2.3-3build2) karmic; urgency=low
-
-  * Rebuild for the GNUstep transition.
-
- -- Luca Falavigna <dktrkranz@ubuntu.com>  Sun, 24 May 2009 11:11:39 +0000
-
-aclock.app (0.2.3-3build1) intrepid; urgency=low
-
-  * Rebuild for GNUstep transition.
-
- -- Luca Falavigna <dktrkranz@ubuntu.com>  Sun, 06 Jul 2008 14:44:15 +0200
+ -- Yavor Doganov <yavor@gnu.org>  Thu, 10 Nov 2011 19:00:27 +0200
 
 aclock.app (0.2.3-3) unstable; urgency=low
 
only in patch2:
unchanged:
--- aclock.app-0.2.3.orig/main.m
+++ aclock.app-0.2.3/main.m
@@ -1,10 +1,6 @@
 #include <AppKit/AppKit.h>
 
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
-	CREATE_AUTORELEASE_POOL(pool);
-	[NSApplication sharedApplication];
-	[NSApp run];
-	DESTROY(pool);
-	return 0;
+  return NSApplicationMain(argc, argv);
 }