rev 16845 - in kde-extras/kile/trunk/debian: . patches source

Fathi Boudra fabo at alioth.debian.org
Wed Feb 10 11:12:30 UTC 2010


Author: fabo
Date: 2010-02-10 11:12:16 +0000 (Wed, 10 Feb 2010)
New Revision: 16845

Added:
   kde-extras/kile/trunk/debian/patches/kubuntu_01_improved_viewpart_warning.diff
   kde-extras/kile/trunk/debian/patches/kubuntu_02_disable_embedded_kbibtex.diff
   kde-extras/kile/trunk/debian/source/
   kde-extras/kile/trunk/debian/source/format
Removed:
   kde-extras/kile/trunk/debian/README.source
Modified:
   kde-extras/kile/trunk/debian/changelog
   kde-extras/kile/trunk/debian/control
   kde-extras/kile/trunk/debian/copyright
   kde-extras/kile/trunk/debian/patches/series
   kde-extras/kile/trunk/debian/rules
Log:
  * Update debian/control:
    - Bump build dependencies versions (debhelper, pkg-kde-tools and
      kdelibs5-dev).
    - Remove quilt build dependency.
    - Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
  * Update debian/rules:
    - Enable parallel build (pass --parallel option to dh).
    - Use kde sequence addon (pass --with kde option to dh).
    - Add override_dh_compress to avoid docbook files compression.
  * Merge from Ubuntu:
    - Add debian/patches/kubuntu_01_improved_viewpart_warning.diff
      instruct how to restore tools config; as an out-dated configuration from
      pre KDE 4 is the most likely cause of the embedded viewer failing.
    - Add kubuntu_02_disable_embedded_kbibtex.diff
      KBibTex-part isn't available for KDE 4 and KBibTex porting does not look
      to happen anytime soon, so disable the Embedded KBibTex option for now.


Modified: kde-extras/kile/trunk/debian/changelog
===================================================================
--- kde-extras/kile/trunk/debian/changelog	2010-02-09 22:10:49 UTC (rev 16844)
+++ kde-extras/kile/trunk/debian/changelog	2010-02-10 11:12:16 UTC (rev 16845)
@@ -1,6 +1,22 @@
-kile (1:2.1.0~svn1055250beta3-1) UNRELEASED; urgency=low
+kile (1:2.1.0~svn1055250beta3-1) unstable; urgency=low
 
   * New upstream release 2.1 beta 3 - svn r1055250. (Closes: #566240)
+  * Update debian/control:
+    - Bump build dependencies versions (debhelper, pkg-kde-tools and
+      kdelibs5-dev).
+    - Remove quilt build dependency.
+    - Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+  * Update debian/rules:
+    - Enable parallel build (pass --parallel option to dh).
+    - Use kde sequence addon (pass --with kde option to dh).
+    - Add override_dh_compress to avoid docbook files compression.
+  * Merge from Ubuntu:
+    - Add debian/patches/kubuntu_01_improved_viewpart_warning.diff
+      instruct how to restore tools config; as an out-dated configuration from
+      pre KDE 4 is the most likely cause of the embedded viewer failing.
+    - Add kubuntu_02_disable_embedded_kbibtex.diff
+      KBibTex-part isn't available for KDE 4 and KBibTex porting does not look
+      to happen anytime soon, so disable the Embedded KBibTex option for now.
 
  -- Fathi Boudra <fabo at debian.org>  Mon, 08 Feb 2010 16:13:31 +0100
 

Modified: kde-extras/kile/trunk/debian/control
===================================================================
--- kde-extras/kile/trunk/debian/control	2010-02-09 22:10:49 UTC (rev 16844)
+++ kde-extras/kile/trunk/debian/control	2010-02-10 11:12:16 UTC (rev 16845)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: quilt (>= 0.46-7), debhelper (>= 7.3.12), cmake, pkg-kde-tools (>= 0.4.11),
- kdelibs5-dev (>= 4:4.3.0)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.4.13), cmake, pkg-kde-tools (>= 0.6.1),
+ kdelibs5-dev (>= 4:4.3.4)
+Standards-Version: 3.8.4
 Homepage: http://kile.sourceforge.net
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kile/trunk
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kile/trunk

Modified: kde-extras/kile/trunk/debian/copyright
===================================================================
--- kde-extras/kile/trunk/debian/copyright	2010-02-09 22:10:49 UTC (rev 16844)
+++ kde-extras/kile/trunk/debian/copyright	2010-02-10 11:12:16 UTC (rev 16845)
@@ -86,7 +86,7 @@
 
 The Debian packaging is:
 
-    Copyright (C) 2008-2009, Fathi Boudra <fabo at debian.org>
+    Copyright (C) 2008-2010, Fathi Boudra <fabo at debian.org>
 
 and is licensed under the GPL, see above.
 

Added: kde-extras/kile/trunk/debian/patches/kubuntu_01_improved_viewpart_warning.diff
===================================================================
--- kde-extras/kile/trunk/debian/patches/kubuntu_01_improved_viewpart_warning.diff	                        (rev 0)
+++ kde-extras/kile/trunk/debian/patches/kubuntu_01_improved_viewpart_warning.diff	2010-02-10 11:12:16 UTC (rev 16845)
@@ -0,0 +1,10 @@
+--- a/src/kilelauncher.cpp
++++ b/src/kilelauncher.cpp
+@@ -360,6 +360,7 @@ namespace KileTool {
+ 		KPluginFactory *factory = pluginLoader.factory();
+ 		if (!factory) {
+ 			emit(message(Error, i18n("Could not find the %1 library.", m_libName)));
++			emit(message(Error, i18n("This is possibly due to old tools configuration; you can restore default tools configuration in Settings->Configure Kile->Tools->Build->Restore Default Tools.")));
+ 			return false;
+ 		}
+ 

Added: kde-extras/kile/trunk/debian/patches/kubuntu_02_disable_embedded_kbibtex.diff
===================================================================
--- kde-extras/kile/trunk/debian/patches/kubuntu_02_disable_embedded_kbibtex.diff	                        (rev 0)
+++ kde-extras/kile/trunk/debian/patches/kubuntu_02_disable_embedded_kbibtex.diff	2010-02-10 11:12:16 UTC (rev 16845)
@@ -0,0 +1,19 @@
+--- a/src/data/kilestdtools.rc
++++ b/src/data/kilestdtools.rc
+@@ -537,16 +537,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: kde-extras/kile/trunk/debian/patches/series
===================================================================
--- kde-extras/kile/trunk/debian/patches/series	2010-02-09 22:10:49 UTC (rev 16844)
+++ kde-extras/kile/trunk/debian/patches/series	2010-02-10 11:12:16 UTC (rev 16845)
@@ -1,2 +1,4 @@
 01_install_doc.diff
 02_tex_doc_location.diff
+kubuntu_01_improved_viewpart_warning.diff
+kubuntu_02_disable_embedded_kbibtex.diff

Modified: kde-extras/kile/trunk/debian/rules
===================================================================
--- kde-extras/kile/trunk/debian/rules	2010-02-09 22:10:49 UTC (rev 16844)
+++ kde-extras/kile/trunk/debian/rules	2010-02-10 11:12:16 UTC (rev 16845)
@@ -1,9 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk
-
 %:
-	dh --with quilt $@
+	dh --parallel --with kde $@
 
 override_dh_install:
 	# Fix lintian warning: script-not-executable
@@ -17,4 +15,7 @@
 
 	dh_install --list-missing
 
+override_dh_compress:
+	dh_compress -X.docbook
+
 .PHONY: override_dh_auto_test

Added: kde-extras/kile/trunk/debian/source/format
===================================================================
--- kde-extras/kile/trunk/debian/source/format	                        (rev 0)
+++ kde-extras/kile/trunk/debian/source/format	2010-02-10 11:12:16 UTC (rev 16845)
@@ -0,0 +1 @@
+3.0 (quilt)




More information about the pkg-kde-commits mailing list