diff -Nru upx-ucl-3.05/debian/changelog upx-ucl-3.05/debian/changelog
--- upx-ucl-3.05/debian/changelog	2010-06-12 19:51:26.000000000 +0530
+++ upx-ucl-3.05/debian/changelog	2010-07-08 13:42:31.000000000 +0530
@@ -1,3 +1,12 @@
+upx-ucl (3.05-1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable. (LP: #603122) Remaining changes:
+    - [arm] needs porting to thumb2; use -marm as the code
+      does a lot of low level hacking not yet ready for thumb2 
+      (LP: #514254)
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Thu, 08 Jul 2010 13:40:54 +0530
+
 upx-ucl (3.05-1) unstable; urgency=low
 
   * New upstream release.
@@ -8,6 +17,13 @@
 
  -- Robert Luberda <robert@debian.org>  Sat, 12 Jun 2010 16:21:24 +0200
 
+upx-ucl (3.04-1ubuntu1) lucid; urgency=low
+
+  * fix LP: #514254 - [arm] needs porting to thumb2; use -marm as the code
+    does a lot of low level hacking not yet ready for thumb2 
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 12 Apr 2010 15:24:02 +0200
+
 upx-ucl (3.04-1) unstable; urgency=low
 
   * New upstream release:
+
diff -Nru upx-ucl-3.05/debian/control upx-ucl-3.05/debian/control
--- upx-ucl-3.05/debian/control	2010-06-12 19:49:56.000000000 +0530
+++ upx-ucl-3.05/debian/control	2010-07-08 13:40:45.000000000 +0530
@@ -1,7 +1,8 @@
 Source: upx-ucl
 Section: utils
 Priority: optional
-Maintainer: Robert Luberda <robert@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Robert Luberda <robert@debian.org>
 Standards-Version: 3.8.4
 Build-Depends: debhelper (>= 7), libucl-dev (>= 1.03), zlib1g-dev (>= 1:1.1.4)
 
diff -Nru upx-ucl-3.05/debian/rules upx-ucl-3.05/debian/rules
--- upx-ucl-3.05/debian/rules	2009-10-15 16:24:57.000000000 +0530
+++ upx-ucl-3.05/debian/rules	2010-06-19 01:57:29.000000000 +0530
@@ -34,6 +34,12 @@
 	LDFLAGS 	+= -L $(L)
 endif
 
+ifeq (armel,$(DEB_BUILD_ARCH))
+	# [asac] not thumb2 ready - use -marm
+	CXXFLAGS	+= -marm
+endif
+
+
 build: build-stamp
 build-stamp:
 	dh_testdir