--- a/debian/changelog	Fri Apr 13 01:44:29 2018 +0300
+++ b/debian/changelog	Fri Apr 13 02:02:06 2018 +0300
@@ -1,49 +1,38 @@
+universalindentgui (1.2.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Update for new qscintilla2 library names (Closes: #885647)
+
+ -- Scott Kitterman <scott@kitterman.com>  Thu, 04 Jan 2018 07:06:09 -0500
+
 universalindentgui (1.2.0-1) unstable; urgency=low
 
-  * New upstream release:
-    - [add] The Linux version has a menu entry in the application development menu now.
-    - [add] The Linux version has a mime type association to some code files now, so that UiGUI is available as "open with".
-    - [add] Added support for the Visual Basic beautifier VBSBeautifier.
-    - [add] Added support for the SQL beautifier Pl/Sql tidy.
-    - [add] Updated the Artistic Style configuration to support Artistic Style version 2.02.1.
-    - [add] Updated the Uncrustify configuration to support Uncrustify version 0.59.
-    - [add] Updated the PerlTidy configuration to support PerlTidy version 1.74.
-    - [add] Updated the Ruby Script Beautifier to version 2.9.
-    - [fix] Bug ID 3021933: Updated the Artistic Style configuration to support Artistic Style version 2.01.
-    - [fix] Bug ID 3021931: Fixed calling of Artistic Style version 1.22 and later.
-    - [fix] Bug ID 3006513: Fixed compiling UiGUI using GCC 4.5 and later.
-    - [fix] Bug ID 2942381: When loading an indenter configuration file, the settings displayed in the docking widget were correctly updated, but the code wasn't.
-    - [fix] Bug ID 2135872: A zombie process kept on running if UiGUI was quit during the update check in background if no internet connection is available.
-    - [fix] Bug ID 3175027: Uncrustify had wrong pop-up comments for two check-boxes.
-    - [fix] Bug ID 2916163: The proxy settings are properly used and applied now.
-    - [fix] Made the JsDecoder integration be compatible with recent Qt versions.
-    - [change] Changed the created shell scripts indenter config file reference. Now each created shell script has a corresponding config file being created in the same dir as the shell script, with the same name but different suffix. But since the config file is referenced by "./", when calling the script the working directory must be the same as the directory containing the config file.
-    - [change] Using TCLAP as command line parser instead of own command line parsing.
-    - [change] Setting a file name as parameter on the command line without any prefix will load this file instead of the last opened one.
-    - [change] Rewritten and improved the internal way how settings are connected to the UI.
-    - [change] Refactored and cleaned up the code.
-    - [change] Will no longer deliver binary bundles linked against Qt statically. Instead delivering all dependent DLLs and libs.
+  * New upstream release.
+  * Drop 02_fix_gcc_4.5_build.patch - merged upstream.
+  * Update debian/contol:
+    - bump debhelper to 9.
+    - bump Standards-Version to 3.9.3 (no changes needed).
 
- -- Thomas Schweitzer <mail@thomas-schweitzer.de>  Sun, 01 Jan 2012 13:37:00 +0200
+ -- Fathi Boudra <fabo@debian.org>  Tue, 22 May 2012 08:49:27 +0300
+
+universalindentgui (1.1.0-2) unstable; urgency=low
+
+  * Add 02_fix_gcc_4.5_build.patch (Closes: #565043)
+
+ -- Fathi Boudra <fabo@debian.org>  Mon, 21 Feb 2011 12:21:21 +0200
 
 universalindentgui (1.1.0-1) unstable; urgency=low
 
-  * New upstream release:
-    - [add] Added a logging class, that can catch debug output and
-      make trace backs if any problems occur possible.
-    - [add] Added an application icon for Mac OS X.
-    - [change] Feature Request ID 2596302 : Updated the greatcode.ini.
-      Thanks to adxadx who has done this work!
-    - [change] Feature Request ID 2793216: Updated to Uncrustify 0.53.
-    - [change] Updated to JsDecoder version 1.1.0
-    - [fix] Bug ID 2791229: If UiGUI was located in a path containing
-      Unicode characters or such a path needed to be handed over to a
-      called indenter, the indenter could get confused on Windows.
-      So using the Windows 8.3 short path notation.
-    - [fix] On Mac OS X the used default font wasn't monospaced.
-      Switched back to use Courier on Mac.
+  * New upstream release.
+  * Update debian/control:
+    - Bump quilt and debhelper build-dependency versions.
+    - Bump Standards-Version to 3.8.3 (no changes needed).
+  * Convert debian/rules to dh usage.
+  * Rename debian/universalindentgui.lintian to
+    debian/universalindentgui.lintian-overrides for dh_lintian usage.
+  * Add debian/README.source file.
 
- -- Thomas Schweitzer <mail@thomas-schweitzer.de>  Thu, 16 Jul 2009 13:13:58 +0200
+ -- Fathi Boudra <fabo@debian.org>  Thu, 20 Aug 2009 13:41:45 +0200
 
 universalindentgui (1.0.2-1) unstable; urgency=low
 

--- a/debian/compat	Fri Apr 13 01:44:29 2018 +0300
+++ b/debian/compat	Fri Apr 13 02:02:06 2018 +0300
@@ -1,1 +1,1 @@
-7
+9

--- a/debian/control	Fri Apr 13 01:44:29 2018 +0300
+++ b/debian/control	Fri Apr 13 02:02:06 2018 +0300
@@ -1,19 +1,26 @@
 Source: universalindentgui
 Section: devel
 Priority: optional
-Maintainer: Thomas Schweitzer <mail@thomas-schweitzer.de>
+Maintainer: Thomas Schweitzer <thomas-schweitzer@arcor.de>
 Uploaders: Fathi Boudra <fabo@debian.org>
-Build-Depends: quilt, debhelper (>= 7), libqt4-dev, libqscintilla2-dev
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9), libqscintilla2-qt4-dev, libqt4-dev
+Standards-Version: 3.9.3
 Homepage: http://universalindent.sourceforge.net
 
 Package: universalindentgui
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: astyle, bcpp, csstidy, hindent, indent, perltidy, tidy, uncrustify,
- xmlindent
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: astyle,
+            bcpp,
+            csstidy,
+            hindent,
+            indent,
+            perltidy,
+            tidy,
+            uncrustify,
+            xmlindent
 Description: GUI frontend for several code beautifiers
- UniversalIndentGUI is a GUI frontend for several code beautifiers, currently
+ UniversalIndentGui is a GUI fontend for several code beautifiers, currently
  supporting:
   * Artistic Styler
   * BCPP
@@ -31,17 +38,13 @@
   * PHP Code Beautifier
   * PHP Stylist
   * pindent
-  * Pl/Sql tidy
   * Ruby Beautify
   * Ruby Formatter
   * Shell Indent
   * (HTML) Tidy
   * Uncrustify
-  * VBSBeautifier
   * XML Indent
  .
- UniversalIndentGUI allows you to tune a beautifier's configuration and see
+ UniversalIndentGui allows you to tune a beautifier's configuration and see
  how the changes affects a source example live. It is especially useful to
- compare different beautifiers when you have to choose one of them.
- Currently not supported indenters can be easily added by creating a
- configuration file for them.
+ compare different C/C++ beautifiers when you have to choose one of them.

--- a/debian/copyright	Fri Apr 13 01:44:29 2018 +0300
+++ b/debian/copyright	Fri Apr 13 02:02:06 2018 +0300
@@ -1,6 +1,6 @@
 This package was debianized by:
 
-    Thomas Schweitzer <mail@thomas-schweitzer.de> on Sun, 01 Jan 2012 13:37:00 +0200
+    Fathi Boudra <fabo@debian.org> on Wed, 29 Apr 2009 10:50:58 +0200
 
 It was downloaded from:
 
@@ -8,7 +8,7 @@
 
 Upstream Author:
 
-    Thomas Schweitzer <mail@thomas-schweitzer.de>
+    Thomas Schweitzer <thomas-schweitzer@arcor.de>
 
 Copyright:
 
@@ -25,7 +25,7 @@
 
 Copyright for indenters/JsDecoder.js file:
 
-    Copyright (C) 2004-2008 Cezary Tomczak
+    Copyright (C) 2004-2006 Cezary Tomczak
 
     This file is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -55,5 +55,5 @@
 
     Copyright (C) 2009 Fathi Boudra <fabo@debian.org>
 
-and is licensed under the GPL version 2, 
+and is licensed under the GPL version 2,
 see `/usr/share/common-licenses/GPL-2'.

--- a/debian/menu	Fri Apr 13 01:44:29 2018 +0300
+++ b/debian/menu	Fri Apr 13 02:02:06 2018 +0300
@@ -1,7 +1,5 @@
-?package(universalindentgui):\
-  needs="X11"\
-  section="Applications/Programming"\
-  title="UniversalIndentGUI"\
-  command="/usr/bin/universalindentgui"\
-  icon="/usr/share/pixmaps/universalIndentGUI_32x32.xpm"
-
+?package(universalindentgui): \
+  needs="X11" \
+  section="Applications/Programming" \
+  title="UniversalIndentgui" \
+  command="/usr/bin/universalindentgui"

--- a/debian/rules	Fri Apr 13 01:44:29 2018 +0300
+++ b/debian/rules	Fri Apr 13 02:02:06 2018 +0300
@@ -3,86 +3,17 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
-
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
-	dh_testdir
-
-	# Fix executable problem
-	find . -type f -exec chmod a-x '{}' \;
-	chmod a+x debian/rules
-
-	qmake-qt4
-
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-
-	$(MAKE)
+%:
+	dh $@ --parallel --buildsystem=qmake_qt4
 
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -rf debug release
-	rm -f translations/*.qm Makefile.* doc/universalindentgui.1.gz
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/universalindentgui install
+override_dh_auto_install:
+	dh_auto_install
 
-	mkdir -p $(CURDIR)/debian/universalindentgui/usr/share/pixmaps
-	cp $(CURDIR)/resources/universalIndentGUI_32x32.xpm $(CURDIR)/debian/universalindentgui/usr/share/pixmaps/
-	
 	# Remove shellindent
-	#rm -f debian/universalindentgui/usr/share/universalindentgui/indenters/example.sh	
-	#rm -f debian/universalindentgui/usr/share/universalindentgui/indenters/shellindent.awk
-	#rm -f debian/universalindentgui/usr/share/universalindentgui/indenters/uigui_shellindent.ini
-
-	# Fix lintian warnings
-	find debian -type f -name '*.rb' | xargs chmod a+x
-
-	# Install lintian override
-	install -D -p -m644 debian/universalindentgui.lintian \
-		debian/universalindentgui/usr/share/lintian/overrides/universalindentgui
-
-# Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
+	rm -f debian/universalindentgui/usr/share/universalindentgui/indenters/example.sh
+	rm -f debian/universalindentgui/usr/share/universalindentgui/indenters/shellindent.awk
+	rm -f debian/universalindentgui/usr/share/universalindentgui/indenters/uigui_shellindent.ini
 
-# Build architecture-dependent files here.
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGELOG.txt
-	dh_installdocs
-	dh_installexamples
-	dh_install debian/universalindentgui.desktop usr/share/applications
-	dh_installmenu
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+	# Fix lintian warnings/errors
+	find debian/universalindentgui/usr/share/universalindentgui -type f -exec chmod a-x '{}' \;
+	find debian/universalindentgui/usr/share/universalindentgui -type f -name '*.rb' | xargs chmod a+x