diff -u cron-3.0pl1/pathnames.h cron-3.0pl1/pathnames.h
--- cron-3.0pl1/pathnames.h
+++ cron-3.0pl1/pathnames.h
@@ -75,7 +75,7 @@
 			 * environment variable specified.
 			 */
 #if defined(DEBIAN)
-# define EDITOR "/usr/bin/editor"
+# define EDITOR "/usr/bin/sensible-editor"
 #elif defined(_PATH_VI)
 # define EDITOR _PATH_VI
 #else
diff -u cron-3.0pl1/debian/changelog cron-3.0pl1/debian/changelog
--- cron-3.0pl1/debian/changelog
+++ cron-3.0pl1/debian/changelog
@@ -1,3 +1,11 @@
+cron (3.0pl1-104+ubuntu1) intrepid; urgency=low
+
+  * pathnames.h: Use the Debian sensible-editor (LP: #222830).
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 09 Jun 2008 11:42:25 -0500
+
 cron (3.0pl1-104+build1) intrepid; urgency=low
 
   * Fake sync with Debian. The previous merge wasn't necessary, Debian adopted
diff -u cron-3.0pl1/debian/control cron-3.0pl1/debian/control
--- cron-3.0pl1/debian/control
+++ cron-3.0pl1/debian/control
@@ -1,7 +1,8 @@
 Source: cron
 Section: admin
 Priority: important
-Maintainer: Javier Fernandez-Sanguino Pen~a <jfs@computer.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Javier Fernandez-Sanguino Pen~a <jfs@computer.org>
 Uploaders: Steve Greenland <stevegr@debian.org>
 Standards-Version: 3.6.1
 Build-Depends: debhelper, libpam0g-dev, libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
only in patch2:
unchanged: