diff -Nru kile-2.1.3/debian/changelog kile-2.1.3/debian/changelog
--- kile-2.1.3/debian/changelog	2016-03-27 17:38:37.000000000 +0000
+++ kile-2.1.3/debian/changelog	2016-05-15 12:48:00.000000000 +0000
@@ -1,10 +1,20 @@
-kile (4:2.1.3-3ubuntu1) xenial; urgency=low
+kile (4:2.1.3-4) unstable; urgency=medium
 
-  * Merge from Debian unstable.  Remaining changes:
-    - debian/control:
-      + Drop unused texlive-doc-base from Suggests.
+  * Team upload.
+  * Drop menu file and its pixmap, since kile already provides a .desktop file.
+  * Stop installing CODE-FORMATTING-STYLE.txt as documentation, as it is
+    development-related (and thus not interesting for users).
+  * Remove obsolete texlive-doc-base suggest: its previous content is in
+    texlive-base, dependency of texlive-latex-base.
+  * Update Vcs-* fields.
+  * Remove ktexmaker2 breaks/replaces, as ktexmaker2 is dead for more than a
+    decade.
+  * Bump Standards-Version to 3.9.8, no changes required.
+  * Remove unused ${shlibs:Depends} from kile-doc.
+  * Use ${perl:Depends} in kile.
+  * Link in as-needed mode.
 
- -- Artur Rona <ari-tczew@ubuntu.com>  Sun, 27 Mar 2016 19:38:31 +0200
+ -- Pino Toscano <pino@debian.org>  Sun, 15 May 2016 14:47:54 +0200
 
 kile (4:2.1.3-3) unstable; urgency=low
 
@@ -21,25 +31,6 @@
 
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Fri, 23 Oct 2015 16:08:24 -0300
 
-kile (4:2.1.3-2ubuntu3) vivid; urgency=medium
-
-  * depend on konsole4-kpart not konsole
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 04 Dec 2014 16:18:14 +0100
-
-kile (4:2.1.3-2ubuntu2) utopic; urgency=medium
-
-  * debian/control: Remove unused depedency on package texlive-doc-base (LP: #1360709)
-
- -- Filip Sohajek <filip.sohajek@gmail.com>  Tue, 26 Aug 2014 17:55:07 +0200
-
-kile (4:2.1.3-2ubuntu1) saucy; urgency=low
-
-  * Don't run optipng during archive build.
-    (applied in debian svn so package can be synced with 4:2.1.3-3)
-
- -- Philip Muškovac <yofel@kubuntu.org>  Sat, 29 Jun 2013 19:54:09 +0200
-
 kile (4:2.1.3-2) unstable; urgency=low
 
   * Upload to unstable
diff -Nru kile-2.1.3/debian/control kile-2.1.3/debian/control
--- kile-2.1.3/debian/control	2016-03-27 17:38:49.000000000 +0000
+++ kile-2.1.3/debian/control	2016-05-15 12:41:37.000000000 +0000
@@ -1,8 +1,7 @@
 Source: kile
 Section: tex
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
+Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo@debian.org>,
            Mark Purcell <msp@debian.org>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
@@ -11,14 +10,14 @@
                kdelibs5-dev (>= 4:4.4.4),
                pkg-kde-tools (>= 0.9.0),
                shared-mime-info
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://kile.sourceforge.net
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-extras/kile.git/
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kile.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/kde-extras/kile.git/
+Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-extras/kile.git
 
 Package: kile
 Architecture: any
-Depends: konsole4-kpart, texlive-latex-base, ${misc:Depends}, ${shlibs:Depends}
+Depends: konsole4-kpart, texlive-latex-base, ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}
 Recommends: dvipng, ghostscript, imagemagick, psutils, texlive
 Suggests: aspell | ispell | hspell,
           asymptote,
@@ -32,8 +31,6 @@
           tex4ht,
           texlive-xetex,
           zip
-Breaks: ktexmaker2 (<< 1.8)
-Replaces: ktexmaker2 (<< 1.8)
 Description: KDE Integrated LaTeX Environment
  Kile is a user-friendly LaTeX source editor and TeX shell for KDE.
  .
@@ -51,7 +48,7 @@
 Package: kile-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}
 Description: KDE Integrated LaTeX Environment (documentation)
  Kile is a user-friendly LaTeX source editor and TeX shell for KDE.
  .
diff -Nru kile-2.1.3/debian/kile.docs kile-2.1.3/debian/kile.docs
--- kile-2.1.3/debian/kile.docs	2015-10-23 18:50:07.000000000 +0000
+++ kile-2.1.3/debian/kile.docs	2016-01-17 16:45:05.000000000 +0000
@@ -1,4 +1,3 @@
-CODE-FORMATTING-STYLE.txt
 README
 README.cwl
 kile-remote-control.txt
diff -Nru kile-2.1.3/debian/kile.install kile-2.1.3/debian/kile.install
--- kile-2.1.3/debian/kile.install	2015-10-23 18:50:07.000000000 +0000
+++ kile-2.1.3/debian/kile.install	2016-01-17 16:39:06.000000000 +0000
@@ -1,4 +1,3 @@
-debian/kile.xpm usr/share/pixmaps/
 usr/bin/kile
 usr/share/applications/kde4/kile.desktop
 usr/share/dbus-1/interfaces/net.sourceforge.kile.main.xml
diff -Nru kile-2.1.3/debian/kile.xpm kile-2.1.3/debian/kile.xpm
--- kile-2.1.3/debian/kile.xpm	2015-10-23 18:24:46.000000000 +0000
+++ kile-2.1.3/debian/kile.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,176 +0,0 @@
-/* XPM */
-static char *kile[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 138 2",
-"   c black",
-".  c #015FBC",
-"X  c #1067BE",
-"o  c #005DC0",
-"O  c #0063C3",
-"+  c #006BC9",
-"@  c #0A6EC9",
-"#  c #0071CC",
-"$  c #0E76CE",
-"%  c #0076D0",
-"&  c #007BD2",
-"*  c #0978D0",
-"=  c #1467C0",
-"-  c #1468C1",
-";  c #136FC9",
-":  c #1A6AC1",
-">  c #1372CA",
-",  c #1C7BCE",
-"<  c #1B7DD0",
-"1  c #267ACD",
-"2  c #2878C6",
-"3  c #2C7ECE",
-"4  c #207ED0",
-"5  c #3D7BC1",
-"6  c #3F83BB",
-"7  c #0080D6",
-"8  c #0086DA",
-"9  c #008ADC",
-"0  c #0A85D8",
-"q  c #0C8BDB",
-"w  c #1A81D2",
-"e  c #2F81D0",
-"r  c #2B89D4",
-"t  c #2A98D9",
-"y  c #3D80C2",
-"u  c #3D8ACB",
-"i  c #328BD5",
-"p  c #3985D0",
-"a  c #3A89D3",
-"s  c #3D90CF",
-"d  c #3296DC",
-"f  c #3D92D0",
-"g  c #399CDF",
-"h  c #399EE0",
-"j  c #20A0E4",
-"k  c #4981C2",
-"l  c #468DD3",
-"z  c #4C8DD2",
-"x  c #4891D6",
-"c  c #518EC8",
-"v  c #5C8EC5",
-"b  c #5B9ECF",
-"n  c #5493D5",
-"m  c #519CD1",
-"M  c #549ADA",
-"N  c #5D98D7",
-"B  c #5F9AD8",
-"V  c #4FA2DF",
-"C  c #53A0DD",
-"Z  c #5BA4D2",
-"A  c #5BA3DE",
-"S  c #40A7E4",
-"D  c #4DA4E1",
-"F  c #53A9E3",
-"G  c #629CD9",
-"H  c #7999C3",
-"J  c #6DA2DB",
-"K  c #79A8CD",
-"L  c #71A5DC",
-"P  c #73A8DD",
-"I  c #7AABDE",
-"U  c #6DADE2",
-"Y  c #63B2E6",
-"T  c #77AEE1",
-"R  c #75B4E5",
-"E  c #7EB3E3",
-"W  c #79BAE8",
-"Q  c #829DC4",
-"!  c #82A2C7",
-"~  c #82A7CA",
-"^  c #89B6D8",
-"/  c #88BCDF",
-"(  c #92A6C5",
-")  c #92AECA",
-"_  c #91B3CF",
-"`  c #96B6D0",
-"'  c #9BBCD5",
-"]  c #84B2E1",
-"[  c #8EB7E3",
-"{  c #8EBBE5",
-"}  c #92BAE5",
-"|  c #98BEE6",
-" . c #A1BED5",
-".. c #B6B6C5",
-"X. c #87C9EF",
-"o. c #95C2E9",
-"O. c #9CC0E7",
-"+. c #9AC5EA",
-"@. c #ADC2D6",
-"#. c #BEC1CF",
-"$. c #B2C2D4",
-"%. c #B6C4DA",
-"&. c #BDC8D7",
-"*. c #A4C5E9",
-"=. c #A1C8E3",
-"-. c #ABCBEB",
-";. c #AAD0EF",
-":. c #AAD3F0",
-">. c #B1CDEC",
-",. c #B5D0ED",
-"<. c #BDD5ED",
-"1. c #B7D6F1",
-"2. c #B4D8F2",
-"3. c #BBD7F0",
-"4. c #BFE6F9",
-"5. c #C0C9D7",
-"6. c #C1CCDD",
-"7. c #C0D6EF",
-"8. c #C6DBEC",
-"9. c #C8D2E0",
-"0. c #C0D7F0",
-"q. c #C3DAF0",
-"w. c #C9DDF2",
-"e. c #D1DEEC",
-"r. c #C6E8FA",
-"t. c #CDE0F3",
-"y. c #D2E3F4",
-"u. c #D4EBF9",
-"i. c #DBE8F6",
-"p. c #DBEDF9",
-"a. c #E1ECF7",
-"s. c #E5EEF8",
-"d. c #E6F1F9",
-"f. c #E9F3FB",
-"g. c #F1F6FB",
-"h. c #F6F9FD",
-"j. c #FEFEFE",
-"k. c None",
-/* pixels */
-"k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.",
-"k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.",
-"k.k.k.k.k.k.k.k.k.k.k... .%.&.&.&.&.@.' ....k.k.k.k.k.k.k.k.k.k.",
-"k.k.k.k.k.k.k.k.k.....9.r.p.f.f.f.f.u.4.<.$...k.k.k.k.k.k.k.k.k.",
-"k.k.k.k.k.k.k...#.e.s.s.s.s.s.s.f.d.s.s.d.s.8.%.....k.k.k.k.k.k.",
-"k.k.k.k.k.k...6.e.i.i.i.i.i.i.i.i.i.i.i.i.i.p.y.=.` k.k.k.k.k.k.",
-"k.k.k.k.k...6.t.y.w.w.y.y.w.w.y.t.t.t.y.t.w.y.w.w.X._ ..k.k.k.k.",
-"k.k.k.k...%.7.7.q.8.0.8.7.w.w.0.7.w.q.7.8.q.7.8.8.3./ ..k.k.k.k.",
-"k.k.k...^ 1.y.t.t.<.>.,.>.7.w.y.i.y.y.0.>.>.>.1.>.1.+.j ..k.k.k.",
-"k.k.k...Y s.j.j.j.w.-.-.-.-.g.j.j.j.s.>.>.-.>.-.-.-.*.S Z ..k.k.",
-"k.k._ t R i.j.j.j.7.*.| *.i.j.j.j.g.>.*.O.O.| | | O.| F t ) k.k.",
-"k.k.K q U i.j.j.j.>.} } 7.h.j.j.h.0.| } } } } } } } } D 9 K k.k.",
-"k...m 9 C y.j.j.j.-.^ O.h.j.j.h.>.] ] ] ^ ] ] } -.=.o.W 9 9 ..k.",
-"k...8 8 d t.j.j.j.*.[ s.j.j.h.q.] ] ] ] I I ] w.j.a.O.f.q 8 N ..",
-"..~ 7 7 0 2.j.j.j.*.y.j.j.j.>.^ ] I I G J J | f.-.y.C r.h 7 s ..",
-"..f 7 7 7 :.j.j.j.i.j.j.j.i.I P L L G G G G | s.] 8.d u.h 7 s ..",
-"..f & & & :.j.j.j.j.j.j.j.s.J G G N N n n n L s.y.i.y.p.& & f ..",
-"..u & & & :.j.j.j.j.j.j.j.j.<.G n n n n l z l U i.j.y.D & & u ..",
-"..u % % % -.j.j.j.q.o.h.j.j.h.*.z z l p e < * % % % % % % % u ..",
-"..u # % # :.j.j.j.F w 1.j.j.j.g.M 1 , $ r +.:.:.:.:.-.:.# % u ..",
-"k...# # # -.j.j.j.C # < p.j.j.j.y.i # # r ,.t.q.q.t.q.t.# # u ..",
-"k.k.c + # -.j.j.j.M + + B d.j.j.j.;.+ + # < < < w < < < + + ! ..",
-"k.k.H + + -.j.j.j.M + + @ T j.j.j.j.] @ , E a E { { { { + H k.k.",
-"k.k.( 2 O -.j.j.j.M + O + @ 7.j.j.j.s.x a s.P s.j.h.j.j.+ H k.k.",
-"k.k...v O 1 a p p ; O O O + ; a a a a 3 O O O O O O O O 5 6 k.k.",
-"k.k.k...O O o . O o o O o o O + O + O O O o O O O O O o ....k.k.",
-"k.k.k.k...5 . o o . o o o O O + O O o o . o o o . o - Q k.k.k.k.",
-"k.k.k.k...Q o o o o o o o o o o o o o o o o o o . o Q ..k.k.k.k.",
-"k.k.k.k.k.k.Q 5 o o o o o o o o o o o o o o o o 5 Q k.k.k.k.k.k.",
-"k.k.k.k.k.k.....= o o o o o o o o o o o o o o . ....k.k.k.k.k.k.",
-"k.k.k.k.k.k.k.k.....Q 5 o o o o o o o o - : ....k.k.k.k.k.k.k.k.",
-"k.k.k.k.k.k.k.k.k.k.....k H H H H H H k 5 ..k.k.k.k.k.k.k.k.k.k."
-};
diff -Nru kile-2.1.3/debian/menu kile-2.1.3/debian/menu
--- kile-2.1.3/debian/menu	2015-10-23 18:24:46.000000000 +0000
+++ kile-2.1.3/debian/menu	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-?package(kile):needs="X11" \
-  section="Applications/Editors" \
-  hints="KDE" \
-  title="Kile" \
-  longtitle="Kile (LaTeX development environment)" \
-  command="/usr/bin/kile" \
-  icon="/usr/share/pixmaps/kile.xpm"
diff -Nru kile-2.1.3/debian/rules kile-2.1.3/debian/rules
--- kile-2.1.3/debian/rules	2015-10-23 18:33:47.000000000 +0000
+++ kile-2.1.3/debian/rules	2016-05-15 12:42:40.000000000 +0000
@@ -7,6 +7,8 @@
 # symbol icons which kile depends on for the symbol table. LP: #772631
 export NO_PNG_PKG_MANGLE=1
 
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+
 %:
 	dh $@ --parallel --with kde