diff -u charmap.app-0.2/debian/changelog charmap.app-0.2/debian/changelog
--- charmap.app-0.2/debian/changelog
+++ charmap.app-0.2/debian/changelog
@@ -1,14 +1,15 @@
-charmap.app (0.2-10build2) oneiric; urgency=low
+charmap.app (0.2-11) unstable; urgency=low
 
-  * Rebuild for gnustep-base 0.22 and gnustep-gui 0.20.
+  * debian/patches/load-gorm-file.patch: New, fixes startup issues with
+    gnustep-gui/0.20 (Closes: #645927).
+  * debian/patches/series: Update.
+  * debian/control (Vcs-Arch): Replace with...
+    (Vcs-Git, Vcs-Browser): ...as the package is now maintained in Git.
+    (Standards-Version): Bump to 3.9.2; no changes needed.
+  * debian/rules (binary-arch): Remove GS_USE_FHS conditional.
+  * debian/preinst: Delete; not needed anymore.
 
- -- Colin Watson <cjwatson@ubuntu.com>  Mon, 11 Jul 2011 11:21:53 +0100
-
-charmap.app (0.2-10build1) natty; urgency=low
-
-  * Rebuild for the GNUstep transition.
-
- -- Luca Falavigna <dktrkranz@ubuntu.com>  Fri, 29 Oct 2010 20:41:56 +0200
+ -- Yavor Doganov <yavor@gnu.org>  Sat, 22 Oct 2011 12:42:16 +0300
 
 charmap.app (0.2-10) unstable; urgency=low
 
diff -u charmap.app-0.2/debian/rules charmap.app-0.2/debian/rules
--- charmap.app-0.2/debian/rules
+++ charmap.app-0.2/debian/rules
@@ -50,14 +50,12 @@
 	dh_installdocs NEWS TODO
 	dh_installmenu
 	dh_installman debian/Charmap.1
-ifeq ($(GS_USE_FHS),yes)
 	gsdh_gnustep
 	dh_installdirs usr/share/GNUstep
 	mv $(d_app)$(GNUSTEP_SYSTEM_APPS)/Charmap.app/Resources \
 	  $(d_app)/usr/share/GNUstep/Charmap.app
 	dh_link usr/share/GNUstep/Charmap.app \
 	  $(GNUSTEP_SYSTEM_APPS)/Charmap.app/Resources
-endif
 	dh_strip
 	dh_compress
 	dh_fixperms
reverted:
--- charmap.app-0.2/debian/preinst
+++ charmap.app-0.2.orig/debian/preinst
@@ -1,28 +0,0 @@
-#!/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/Charmap.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
diff -u charmap.app-0.2/debian/control charmap.app-0.2/debian/control
--- charmap.app-0.2/debian/control
+++ charmap.app-0.2/debian/control
@@ -7,9 +7,10 @@
 	       quilt,
 	       libgnustep-gui-dev,
 	       imagemagick
-Standards-Version: 3.9.0
-Vcs-Arch: http://arch.debian.org/arch/pkg-gnustep/gnustep/charmap-app--debian--1.0
+Standards-Version: 3.9.2
 Homepage: http://www.nongnu.org/charmap/
+Vcs-Git: git://git.debian.org/pkg-gnustep/charmap.app.git
+Vcs-Browser: http://git.debian.org/?p=pkg-gnustep/charmap.app.git
 
 Package: charmap.app
 Architecture: any
diff -u charmap.app-0.2/debian/patches/series charmap.app-0.2/debian/patches/series
--- charmap.app-0.2/debian/patches/series
+++ charmap.app-0.2/debian/patches/series
@@ -1 +1,2 @@
+load-gorm-file.patch
 Controller-generateCharmap.patch
only in patch2:
unchanged:
--- charmap.app-0.2.orig/debian/patches/load-gorm-file.patch
+++ charmap.app-0.2/debian/patches/load-gorm-file.patch
@@ -0,0 +1,15 @@
+2011-10-22  Yavor Doganov  <yavor@gnu.org>
+
+	* main.m (main): Explicitly load the gorm file.
+
+
+--- charmap.app.orig/main.m
++++ charmap.app/main.m
+@@ -30,6 +30,7 @@
+ 
+   [NSApplication sharedApplication];
+   [NSApp setDelegate: [[Controller alloc] init]];
++  [NSBundle loadNibNamed: @"Charmap" owner: NSApp];
+   [NSApp run];
+ 
+   RELEASE(pool);