Merge lp:~murthy/kubuntu-packaging/kile-2.1.3 into lp:~kubuntu-packagers/kubuntu-packaging/kile

[Prasad Murthy]

[Philip Muškovac (yofel)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-24 13:02:49 +0000
+++ debian/changelog	2013-01-24 14:38:29 +0000
@@ -1,3 +1,10 @@
+kile (1:2.1.3-0ubuntu1) UNRELEASED; urgency=low
+  * New upstream release
+  * Disable kubuntu_02_disable_embedded_kbibtex.diff as kbibtex is now usable with kde4
+  * Adding kbibtex to suggests
+
+ -- Prasad Murthy <[e-mail]>  Thu, 24 Jan 2013 19:03:35 +0530
+
 kile (1:2.1.2-0ubuntu1) quantal; urgency=low
 
   * New upstream bug fix release [LP: #1009626]
 
=== modified file 'debian/control'
--- debian/control	2013-01-24 13:02:49 +0000
+++ debian/control	2013-01-24 14:38:29 +0000
@@ -29,7 +29,8 @@
           tex4ht,
           texlive-doc-base,
           texlive-xetex,
-          zip
+          zip,
+          kbibtex
 Breaks: ktexmaker2 (<< 1.8)
 Replaces: ktexmaker2 (<< 1.8)
 Description: KDE Integrated LaTeX Environment
 
=== removed file 'debian/patches/kubuntu_02_disable_embedded_kbibtex.diff'
--- debian/patches/kubuntu_02_disable_embedded_kbibtex.diff	2013-01-24 13:02:49 +0000
+++ debian/patches/kubuntu_02_disable_embedded_kbibtex.diff	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
---- a/src/data/kilestdtools.rc
-+++ b/src/data/kilestdtools.rc
-@@ -531,16 +531,6 @@ options='%source'
- from=bib
- to=bib
- 
--[Tool/ViewBib/KBibTex (embedded)]
--type=Part
--class=ViewBib
--libName=kbibtexpart
--className=KBibTeXPart
--liboptions='%source'
--state=Viewer
--from=bib
--to=bib
--
- [Tool/ViewHTML/Embedded Viewer]
- type=DocPart
- class=ViewHTML
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-01-24 13:02:49 +0000
+++ debian/patches/series	2013-01-24 14:38:29 +0000
@@ -1,4 +1,3 @@
 01_install_doc.diff
 02_tex_doc_location.diff
 kubuntu_01_improved_viewpart_warning.diff
-kubuntu_02_disable_embedded_kbibtex.diff