diff -Nru universalindentgui-1.2.0/debian/changelog universalindentgui-1.2.0/debian/changelog
--- universalindentgui-1.2.0/debian/changelog	2015-08-31 19:51:28.000000000 +0000
+++ universalindentgui-1.2.0/debian/changelog	2018-01-04 12:06:09.000000000 +0000
@@ -1,32 +1,9 @@
-universalindentgui (1.2.0-1build5) wily; urgency=medium
+universalindentgui (1.2.0-1.1) unstable; urgency=medium
 
-  * No-change rebuild against libqscintilla2-12v5
+  * Non-maintainer upload.
+  * Update for new qscintilla2 library names (Closes: #885647)
 
- -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 31 Aug 2015 19:51:28 +0000
-
-universalindentgui (1.2.0-1build4) wily; urgency=medium
-
-  * No change rebuild for libqscintilla2-12v5.
-
- -- Matthias Klose <doko@ubuntu.com>  Mon, 31 Aug 2015 21:22:22 +0200
-
-universalindentgui (1.2.0-1build3) wily; urgency=medium
-
-  * No change rebuild for libqscintilla2-12
-
- -- Micah Gersten <micahg@ubuntu.com>  Sun, 12 Jul 2015 23:52:42 -0500
-
-universalindentgui (1.2.0-1build2) trusty; urgency=low
-
-  * No change rebuild for libqscintilla2-11 transition
-
- -- Scott Kitterman <scott@kitterman.com>  Wed, 19 Feb 2014 07:51:46 -0500
-
-universalindentgui (1.2.0-1build1) raring; urgency=low
-
-  * No change rebuild for libqscintilla2-9 transition
-
- -- Scott Kitterman <scott@kitterman.com>  Thu, 07 Mar 2013 08:52:34 -0500
+ -- Scott Kitterman <scott@kitterman.com>  Thu, 04 Jan 2018 07:06:09 -0500
 
 universalindentgui (1.2.0-1) unstable; urgency=low
 
diff -Nru universalindentgui-1.2.0/debian/control universalindentgui-1.2.0/debian/control
--- universalindentgui-1.2.0/debian/control	2015-08-31 19:51:28.000000000 +0000
+++ universalindentgui-1.2.0/debian/control	2018-01-04 12:06:06.000000000 +0000
@@ -1,10 +1,9 @@
 Source: universalindentgui
 Section: devel
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Thomas Schweitzer <thomas-schweitzer@arcor.de>
+Maintainer: Thomas Schweitzer <thomas-schweitzer@arcor.de>
 Uploaders: Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 9), libqscintilla2-dev, libqt4-dev
+Build-Depends: debhelper (>= 9), libqscintilla2-qt4-dev, libqt4-dev
 Standards-Version: 3.9.3
 Homepage: http://universalindent.sourceforge.net
 
diff -Nru universalindentgui-1.2.0/debian/patches/qsci_rename.patch universalindentgui-1.2.0/debian/patches/qsci_rename.patch
--- universalindentgui-1.2.0/debian/patches/qsci_rename.patch	1970-01-01 00:00:00.000000000 +0000
+++ universalindentgui-1.2.0/debian/patches/qsci_rename.patch	2018-01-04 12:06:06.000000000 +0000
@@ -0,0 +1,40 @@
+--- universalindentgui-1.2.0.orig/UniversalIndentGUI.pro
++++ universalindentgui-1.2.0/UniversalIndentGUI.pro
+@@ -23,7 +23,7 @@ macx {
+  ICON = resources/UniversalIndentGUI.icns
+ }
+ else {
+- LIBS += -lqscintilla2
++ LIBS += -lqscintilla2_qt4
+ }
+ 
+ CONFIG(release, debug|release) {
+--- universalindentgui-1.2.0.orig/UniversalIndentGUI.xcodeproj/project.pbxproj
++++ universalindentgui-1.2.0/UniversalIndentGUI.xcodeproj/project.pbxproj
+@@ -571,7 +571,7 @@
+ 				);
+ 				OTHER_LDFLAGS = (
+ 					"-headerpad_max_install_names",
+-					"-lqscintilla2",
++					"-lqscintilla2_qt4",
+ 					"-L/opt/local/lib",
+ 				);
+ 				OTHER_REZFLAGS = "";
+@@ -637,7 +637,7 @@
+ 				);
+ 				OTHER_LDFLAGS = (
+ 					"-headerpad_max_install_names",
+-					"-lqscintilla2",
++					"-lqscintilla2_qt4",
+ 					"-L/opt/local/lib",
+ 				);
+ 				OTHER_REZFLAGS = "";
+@@ -701,7 +701,7 @@
+ 				);
+ 				OTHER_LDFLAGS = (
+ 					"-headerpad_max_install_names",
+-					"-lqscintilla2",
++					"-lqscintilla2_qt4",
+ 					"-L/opt/local/lib",
+ 				);
+ 				OTHER_REZFLAGS = "";
diff -Nru universalindentgui-1.2.0/debian/patches/series universalindentgui-1.2.0/debian/patches/series
--- universalindentgui-1.2.0/debian/patches/series	2012-05-22 06:30:31.000000000 +0000
+++ universalindentgui-1.2.0/debian/patches/series	2018-01-04 12:06:06.000000000 +0000
@@ -1 +1,2 @@
 disable_check_for_update.patch
+qsci_rename.patch