diff -u aqsis-1.1.0.20050815/debian/control aqsis-1.1.0.20050815/debian/control
--- aqsis-1.1.0.20050815/debian/control
+++ aqsis-1.1.0.20050815/debian/control
@@ -1,8 +1,9 @@
 Source: aqsis
 Section: graphics
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>> 4.0.0), libtiff4-dev, xlibmesa-gl-dev | libgl-dev, zlib1g-dev, libfltk1.1-dev, flex, libjpeg62-dev, libboost-dev
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+Original-Maintainer: Debian QA Group <packages@qa.debian.org>
+Build-Depends: debhelper (>> 4.0.0), libtiff4-dev, libgl1-mesa-dev | libgl-dev, zlib1g-dev, libfltk1.1-dev, flex, libjpeg62-dev, libboost-dev
 Standards-Version: 3.6.2
 
 Package: aqsis
diff -u aqsis-1.1.0.20050815/debian/changelog aqsis-1.1.0.20050815/debian/changelog
--- aqsis-1.1.0.20050815/debian/changelog
+++ aqsis-1.1.0.20050815/debian/changelog
@@ -1,3 +1,12 @@
+aqsis (1.1.0.20050815-4ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - GLU Transition
+    - Fix 64bit FTBFS
+  * Modified Maintainer values to match Debian-Maintainer-Field spec
+
+ -- Emmet Hikory <emmet.hikory@gmail.com>  Sat, 13 Jan 2007 18:32:39 +0900
+
 aqsis (1.1.0.20050815-4) unstable; urgency=low
 
   * QA upload.
@@ -16,6 +25,15 @@
 
  -- Andrew Pollock <apollock@debian.org>  Fri, 15 Dec 2006 05:43:01 -0800
 
+aqsis (1.1.0.20050815-2.1ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+  * Added debian/patches/debian_01_aqsis_g++-4.1.patch to 
+    fix g++-4.1 ftbfs (Closes: bts #356240)
+    Thx to Martin Michlmayr
+
+ -- Stephan Hermann <sh@sourcecode.de>  Fri,  7 Jul 2006 12:05:11 +0200
+
 aqsis (1.1.0.20050815-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -24,6 +42,34 @@
 
  -- Steve Langasek <vorlon@debian.org>  Thu, 24 Nov 2005 01:09:38 -0800
 
+aqsis (1.1.0.20050815-2ubuntu4) dapper; urgency=low
+
+  * Change Depends from aqsis-libs to aqsis-libsc2a
+
+ -- Andrew Mitchell <ajmitch@ubuntu.com>  Thu, 30 Mar 2006 23:36:47 +1200
+
+aqsis (1.1.0.20050815-2ubuntu3) dapper; urgency=low
+
+  * Renamed aqsis-libs to aqsis-libsc2a (libstdc++ new allocator)
+  * debian/control: Conflicts/Replaces aqsis-libs
+  * debian/rules: adjusted package names 
+  * debian/aqsis-libs.{dirs,files}: renamed to the right new package names
+
+ -- Stephan Hermann <sh@sourcecode.de>  Wed, 23 Nov 2005 21:45:29 +0100
+
+aqsis (1.1.0.20050815-2ubuntu2) breezy; urgency=low
+
+  * Applied patch to prevent FTBFS on 64bit archs (Closes: bts #324025)
+
+ -- Stephan Hermann <sh@sourcecode.de>  Mon, 19 Sep 2005 15:23:59 +0200
+
+aqsis (1.1.0.20050815-2ubuntu1) breezy; urgency=low
+
+  * GLUTransition: Removed build-depends: xlibmesa-gl-dev
+  * GLUTransition: Added build-depends: libgl1-mesa-dev
+
+ -- Ante Karamatic <ivoks@grad.hr>  Mon,  5 Sep 2005 08:56:32 +0200
+
 aqsis (1.1.0.20050815-2) unstable; urgency=low
 
   * Add build depends on libboost-dev. 
only in patch2:
unchanged:
--- aqsis-1.1.0.20050815.orig/libshadervm/shadervm.cpp
+++ aqsis-1.1.0.20050815/libshadervm/shadervm.cpp
@@ -1092,7 +1092,7 @@
                             // We have an initialiser we have not run yet
                             if((*candidate)->init){
                                 (*candidate)->initData =
-                                    ((*candidate)->init)((int)((void*)this),NULL);
+                                    ((*candidate)->init)((long)((void*)this),NULL);
                             };
                             (*candidate)->initialised = true;
                         };
only in patch2:
unchanged:
--- aqsis-1.1.0.20050815.orig/libri2rib/output.cpp
+++ aqsis-1.1.0.20050815/libri2rib/output.cpp
@@ -434,7 +434,7 @@
 RtVoid CqOutput::RiObjectInstance( RtObjectHandle handle )
 {
     PR( "ObjectInstance", ObjectInstance ); S;
-    PI( ( RtInt ) handle );
+    PI( ( long ) handle );
     EOL;
 }
 
@@ -786,7 +786,7 @@
 RtVoid CqOutput::RiIlluminate( RtLightHandle light, RtBoolean onoff )
 {
     PR( "Illuminate", Illuminate ); S;
-    PI( ( RtInt ) light ); S;
+    PI( ( long ) light ); S;
 
     if ( onoff == RI_TRUE )
         print( "1" );