diff -u varkon-1.18A/debian/changelog varkon-1.18A/debian/changelog
--- varkon-1.18A/debian/changelog
+++ varkon-1.18A/debian/changelog
@@ -1,3 +1,28 @@
+varkon (1.18A-4ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #390430)
+    - The change /bin/sh to /bin/bash in debian/varkon.sh is still needed.
+
+ -- Charlie Smotherman <cjsmo@ubuntu.com>  Wed, 24 Jun 2009 11:53:12 -0500
+
+varkon (1.18A-4) unstable; urgency=high
+
+  * QA upload - set urgency to “high” due to RC bugfix
+  * Now using gcc-3.4 instead of gcc-3.3 (Closes: #473929)
+    Thanks Tim Retout
+  * Updated Standards-Version: 3.8.1 (no changes needed)
+  * debian/control: moved Homepage to own field
+  * debian/control: added Build-Depends on autotools-dev
+  * debian/copyright: fixed obsolete national encoding
+  * debian/copyright: added copyright notice for packaging
+  * Corrected debian/varkon.1 (formatting errors)
+  * Corrected debian/msbc.1 (formatting errors)
+  * Corrected debian/varkon.doc-base (section was invalid)
+  * Corrected debian/varkon.menu (section was invalid)
+  * Added watch file
+
+ -- Philipp Huebner <debalance@arcor.de>  Sun, 12 Apr 2009 12:25:28 +0200
+
 varkon (1.18A-3ubuntu2) gutsy; urgency=low
 
   * debian/control: add missing libxext-dev build-dependency (fixes FTBFS).
diff -u varkon-1.18A/debian/rules varkon-1.18A/debian/rules
--- varkon-1.18A/debian/rules
+++ varkon-1.18A/debian/rules
@@ -18,7 +18,7 @@
 	dh_testdir
 
 	mkdir -p bin
-	VARKON_ROOT=`pwd` make -C sources CC=gcc-3.3
+	VARKON_ROOT=`pwd` make -C sources CC=gcc-3.4
 
 	touch build-stamp
 
diff -u varkon-1.18A/debian/varkon.1 varkon-1.18A/debian/varkon.1
--- varkon-1.18A/debian/varkon.1
+++ varkon-1.18A/debian/varkon.1
@@ -4,12 +4,12 @@
 \fBvarkon\fR \- a CAD-system with parametric modelling
 
 .SH SYNOPSIS
-.NF
-varkon [--rc <file>]
-       [--env]
-       [--exp]
-       [--config]
-       [-h|--help|-?]
+.nf
+varkon [\-\-rc <file>]
+       [\-\-env]
+       [\-\-exp]
+       [\-\-config]
+       [\-h|\-\-help|\-?]
 
 .SH DESCRIPTION
 VARKON is a high level development tool for applications in the
diff -u varkon-1.18A/debian/mbsc.1 varkon-1.18A/debian/mbsc.1
--- varkon-1.18A/debian/mbsc.1
+++ varkon-1.18A/debian/mbsc.1
@@ -4,14 +4,14 @@
 \fBmbsc\fR \- the MBS compiler for varkon
 
 .SH SYNOPSIS
-.NF
+.nf
 mbsc source
-     [-v]
-     [-l]
-     [-wn]
-     [-hn]
-     [-sn]
-     [-pmn]
+     [\-v]
+     [\-l]
+     [\-wn]
+     [\-hn]
+     [\-sn]
+     [\-pmn]
 
 .SH DESCRIPTION
 VARKON is a high level development tool for applications in the
diff -u varkon-1.18A/debian/copyright varkon-1.18A/debian/copyright
--- varkon-1.18A/debian/copyright
+++ varkon-1.18A/debian/copyright
@@ -1,17 +1,19 @@
 This package was debianized by Stephan Helma <sph@debian.org> on
 Thu,  9 Dec 2004 21:59:14 +0100.
+It was taken over by Debian QA group on Sat, 28 Apr 2007 11:40:31 +0200.
 
 It was downloaded from http://www.tech.oru.se/cad/varkon/download.htm
 
 Upstream Authors:
+
         The CAD research group
         Department of Technology
-        �rebro University
-        S-70182 �rebro
+        Örebro University
+        S-70182 Örebro
         SWEDEN
 
         URL: http://www.tech.oru.se/cad
-  
+
 
 Copyright:
 
@@ -23 +25,8 @@
-Public License can be found in /usr/share/common-licenses/LGPL .
+Public License can be found in /usr/share/common-licenses/LGPL.
+
+The Debian packaging is
+    © 2004 Stephan Helma <sph@debian.org>
+    © 2006 Bill Allombert <ballombe@debian.org>
+    © 2007 Matej Vela <vela@debian.org>
+    © 2009 Philipp Huebner <debalance@arcor.de>
+and is licensed under the LGPL, see above.
diff -u varkon-1.18A/debian/varkon.doc-base varkon-1.18A/debian/varkon.doc-base
--- varkon-1.18A/debian/varkon.doc-base
+++ varkon-1.18A/debian/varkon.doc-base
@@ -10,7 +10,7 @@
  VARKON includes interactive parametric modelling in 2D or 3D but also
  the unique MBS programming language integrated in the graphical
  environment.
-Section: Apps/Technical
+Section: Science/Engineering
 
 Format: HTML
 Index: /usr/share/doc/varkon/help/man.htm
diff -u varkon-1.18A/debian/varkon.menu varkon-1.18A/debian/varkon.menu
--- varkon-1.18A/debian/varkon.menu
+++ varkon-1.18A/debian/varkon.menu
@@ -1,3 +1,3 @@
-?package(varkon):needs="X11" section="Apps/Technical"\
+?package(varkon):needs="X11" section="Applications/Science/Engineering"\
   title="varkon" command="/usr/bin/varkon"\
   icon="/usr/share/pixmaps/varkon.xpm"
diff -u varkon-1.18A/debian/control varkon-1.18A/debian/control
--- varkon-1.18A/debian/control
+++ varkon-1.18A/debian/control
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 5), dpatch, libx11-dev, libgl1-mesa-dev, libglu1-mesa-dev, unixodbc-dev, gcc-3.3, libxext-dev
-Standards-Version: 3.7.2
+Build-Depends: autotools-dev, debhelper (>= 5), dpatch, libx11-dev, libgl1-mesa-dev, libglu1-mesa-dev, libxext-dev, unixodbc-dev, gcc-3.4
+Standards-Version: 3.8.1
+Homepage: http://www.tech.oru.se/cad/varkon
 
 Package: varkon
 Architecture: any
@@ -21,8 +22,6 @@
  VARKON includes interactive parametric modelling in 2D or 3D but also
  the unique MBS programming language integrated in the graphical
  environment.
- .
- Homepage: http://www.tech.oru.se/cad/varkon
 
 Package: varkon-user-manual
 Architecture: all
@@ -34,8 +33,6 @@
  area of Engineering, Computer Aided Design and Product Modelling.
  .
  This is the user manual.
- .
- Homepage: http://www.tech.oru.se/cad/varkon
 
 Package: varkon-programmer-manual
 Architecture: all
@@ -53,2 +49,0 @@
- .
- Homepage: http://www.tech.oru.se/cad/varkon
only in patch2:
unchanged:
--- varkon-1.18A.orig/debian/watch
+++ varkon-1.18A/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/varkon/Varkon_sources_(.*)\.tar\.gz