diff -u galrey-1.0.2/debian/control galrey-1.0.2/debian/control
--- galrey-1.0.2/debian/control
+++ galrey-1.0.2/debian/control
@@ -1,7 +1,8 @@
 Source: galrey
 Section: graphics
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.3
 
diff -u galrey-1.0.2/debian/changelog galrey-1.0.2/debian/changelog
--- galrey-1.0.2/debian/changelog
+++ galrey-1.0.2/debian/changelog
@@ -1,3 +1,12 @@
+galrey (1.0.2-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #237493):
+    - Change interpreter from /bin/sh to /bin/bash in extra/massscale.sh to
+      make it work as expected (LP: #73274)
+    - Modified Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Nathan Handler <nathan.handler@gmail.com>  Wed, 04 Jun 2008 18:39:46 -0500
+
 galrey (1.0.2-2) unstable; urgency=low
 
   * QA upload.
@@ -13,6 +22,14 @@
 
  -- Barry deFreese <bddebian@comcast.net>  Tue, 08 Apr 2008 21:57:52 -0400
 
+galrey (1.0.2-1ubuntu1) feisty; urgency=low
+
+  * Change interpreter from /bin/sh to /bin/bash in extra/massscale.sh to
+    make it work as expected (LP: #73274)
+  * Modified Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Albin Tonnerre <lut1n.tne@gmail.com>  Fri,  9 Mar 2007 06:19:36 +0000
+
 galrey (1.0.2-1) unstable; urgency=low
 
   *  galrey has now a better error handling (closes: #332506)
@@ -71,0 +89 @@
+
only in patch2:
unchanged:
--- galrey-1.0.2.orig/extra/massscale.sh
+++ galrey-1.0.2/extra/massscale.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 if [ $# -ne 2 ]
 then
   echo Usage: $0 \"file pattern\" XxY