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

Fathi Boudra fabo at alioth.debian.org
Sun Jun 12 07:51:23 UTC 2011


Author: fabo
Date: 2011-06-12 07:51:22 +0000 (Sun, 12 Jun 2011)
New Revision: 18902

Added:
   kde-extras/kile/trunk/debian/kile-l10n.install
Removed:
   kde-extras/kile/trunk/debian/patches/00_root_document_not_detected_kde_bug_233667.diff
   kde-extras/kile/trunk/debian/patches/03_mime_install_dir.diff
Modified:
   kde-extras/kile/trunk/debian/changelog
   kde-extras/kile/trunk/debian/control
   kde-extras/kile/trunk/debian/patches/01_install_doc.diff
   kde-extras/kile/trunk/debian/patches/02_tex_doc_location.diff
   kde-extras/kile/trunk/debian/patches/kubuntu_01_improved_viewpart_warning.diff
   kde-extras/kile/trunk/debian/patches/series
   kde-extras/kile/trunk/debian/rules
Log:
* Add kile-l10n package (replace kile-i18n).
* Remove patches:
 - 00_root_document_not_detected_kde_bug_233667.diff - stolen upstream.
 - 03_mime_install_dir.diff - merged upstream.
* Update debian/rules: remove bibtex.xml/latex.xml work around. The files
  aren't shipped by kile anymore.
* Cleanup dependencies (Closes: #625916):
  - remove from Depends: texlive-base-bin.
  - add to Recommends: texlive.
  - demote to Suggests: lilypond, texlive-xetex, asymptote, context,
    dblatex, latex2html, tex4ht.
    - remove from Recommends:, okular | evince | gv,
      kbibtex | pybliographer | gbib | jabref, konqueror | firefox, dvipdfmx,
      texlive-metapost.


Modified: kde-extras/kile/trunk/debian/changelog
===================================================================
--- kde-extras/kile/trunk/debian/changelog	2011-06-11 11:56:28 UTC (rev 18901)
+++ kde-extras/kile/trunk/debian/changelog	2011-06-12 07:51:22 UTC (rev 18902)
@@ -1,6 +1,20 @@
-kile (1:2.1-1) UNRELEASED; urgency=low
+kile (1:2.1.0-1) unstable; urgency=low
 
-  * New upstream release.
+  * New upstream release. (Closes: #630122)
+  * Add kile-l10n package (replace kile-i18n).
+  * Remove patches:
+    - 00_root_document_not_detected_kde_bug_233667.diff - stolen upstream.
+    - 03_mime_install_dir.diff - merged upstream.
+  * Update debian/rules: remove bibtex.xml/latex.xml work around. The files
+    aren't shipped by kile anymore.
+  * Cleanup dependencies (Closes: #625916):
+    - remove from Depends: texlive-base-bin.
+    - add to Recommends: texlive.
+    - demote to Suggests: lilypond, texlive-xetex, asymptote, context, dblatex,
+      latex2html, tex4ht.
+    - remove from Recommends:, okular | evince | gv,
+      kbibtex | pybliographer | gbib | jabref, konqueror | firefox, dvipdfmx,
+      texlive-metapost.
 
  -- Fathi Boudra <fabo at debian.org>  Sat, 11 Jun 2011 14:55:19 +0300
 

Modified: kde-extras/kile/trunk/debian/control
===================================================================
--- kde-extras/kile/trunk/debian/control	2011-06-11 11:56:28 UTC (rev 18901)
+++ kde-extras/kile/trunk/debian/control	2011-06-12 07:51:22 UTC (rev 18902)
@@ -3,24 +3,33 @@
 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: debhelper (>= 7.4.15), cmake, pkg-kde-tools (>= 0.9.0),
- kdelibs5-dev (>= 4:4.4.4), shared-mime-info
-Standards-Version: 3.8.4
+Build-Depends: cmake,
+               debhelper (>= 7.4.15),
+               kdelibs5-dev (>= 4:4.4.4),
+               pkg-kde-tools (>= 0.9.0),
+               shared-mime-info
+Standards-Version: 3.9.2
 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
 
 Package: kile
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- konsole, texlive-base-bin, texlive-latex-base
-Recommends: asymptote, context, dblatex, dvipdfmx, dvipng, ghostscript,
- imagemagick, kbibtex | pybliographer | gbib | jabref, konqueror | iceweasel,
- latex2html, lilypond, okular | evince | gv, psutils, tex4ht, texlive-metapost,
- texlive-xetex, zip
-Suggests: kile-doc, kile-i18n, texlive-doc-base,
- aspell | ispell | hspell
-Conflicts: ktexmaker2 (<< 1.8)
+Depends: konsole, texlive-latex-base, ${misc:Depends}, ${shlibs:Depends}
+Recommends: dvipng, ghostscript, imagemagick, psutils, texlive
+Suggests: aspell | ispell | hspell,
+          asymptote,
+          context,
+          dblatex,
+          kile-doc,
+          kile-l10n,
+          latex2html,
+          lilypond,
+          tex4ht,
+          texlive-doc-base,
+          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.
@@ -39,8 +48,19 @@
 Package: kile-doc
 Architecture: all
 Section: doc
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: KDE Integrated LaTeX Environment (documentation)
  Kile is a user-friendly LaTeX source editor and TeX shell for KDE.
  .
  This package contains the documentation for Kile.
+
+Package: kile-l10n
+Architecture: all
+Section: localization
+Depends: kile (>= ${source:Version}), ${misc:Depends}
+Breaks: kile-i18n (<< 2.1.0-1)
+Replaces: kile-i18n (<< 2.1.0-1)
+Description: KDE Integrated LaTeX Environment (localization)
+ Kile is a user-friendly LaTeX source editor and TeX shell for KDE.
+ .
+ This package contains the translations for Kile.

Added: kde-extras/kile/trunk/debian/kile-l10n.install
===================================================================
--- kde-extras/kile/trunk/debian/kile-l10n.install	                        (rev 0)
+++ kde-extras/kile/trunk/debian/kile-l10n.install	2011-06-12 07:51:22 UTC (rev 18902)
@@ -0,0 +1 @@
+usr/share/locale/*/LC_MESSAGES/kile.mo

Modified: kde-extras/kile/trunk/debian/patches/01_install_doc.diff
===================================================================
--- kde-extras/kile/trunk/debian/patches/01_install_doc.diff	2011-06-11 11:56:28 UTC (rev 18901)
+++ kde-extras/kile/trunk/debian/patches/01_install_doc.diff	2011-06-12 07:51:22 UTC (rev 18902)
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -104,7 +104,8 @@ ENDIF(  EXISTS ${kile_SOURCE_DIR}/doc OR
+@@ -106,7 +106,8 @@ ENDIF(  EXISTS ${kile_SOURCE_DIR}/doc OR
  IF( EXISTS ${kile_SOURCE_DIR}/doc )
  	IF( KDE4_MEINPROC_EXECUTABLE )
  		MESSAGE( STATUS "Building standard documentation")

Modified: kde-extras/kile/trunk/debian/patches/02_tex_doc_location.diff
===================================================================
--- kde-extras/kile/trunk/debian/patches/02_tex_doc_location.diff	2011-06-11 11:56:28 UTC (rev 18901)
+++ kde-extras/kile/trunk/debian/patches/02_tex_doc_location.diff	2011-06-12 07:51:22 UTC (rev 18902)
@@ -1,6 +1,6 @@
 --- a/src/kile.kcfg
 +++ b/src/kile.kcfg
-@@ -282,7 +282,7 @@
+@@ -286,7 +286,7 @@
  	<group name="Help">
  		<entry name="location" type="String">
  			<label>Location of the TeX documentation.</label>

Modified: kde-extras/kile/trunk/debian/patches/kubuntu_01_improved_viewpart_warning.diff
===================================================================
--- kde-extras/kile/trunk/debian/patches/kubuntu_01_improved_viewpart_warning.diff	2011-06-11 11:56:28 UTC (rev 18901)
+++ kde-extras/kile/trunk/debian/patches/kubuntu_01_improved_viewpart_warning.diff	2011-06-12 07:51:22 UTC (rev 18902)
@@ -1,6 +1,6 @@
 --- a/src/kilelauncher.cpp
 +++ b/src/kilelauncher.cpp
-@@ -360,6 +360,7 @@ namespace KileTool {
+@@ -396,6 +396,7 @@ namespace KileTool {
  		KPluginFactory *factory = pluginLoader.factory();
  		if (!factory) {
  			emit(message(Error, i18n("Could not find the %1 library.", m_libName)));

Modified: kde-extras/kile/trunk/debian/patches/series
===================================================================
--- kde-extras/kile/trunk/debian/patches/series	2011-06-11 11:56:28 UTC (rev 18901)
+++ kde-extras/kile/trunk/debian/patches/series	2011-06-12 07:51:22 UTC (rev 18902)
@@ -1,6 +1,4 @@
-00_root_document_not_detected_kde_bug_233667.diff
 01_install_doc.diff
 02_tex_doc_location.diff
-03_mime_install_dir.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	2011-06-11 11:56:28 UTC (rev 18901)
+++ kde-extras/kile/trunk/debian/rules	2011-06-12 07:51:22 UTC (rev 18902)
@@ -6,16 +6,16 @@
 %:
 	dh $@ --parallel --with kde
 
-override_dh_install:
-	# Fix lintian warning: script-not-executable
-	find debian -type f -name '*.sh' -or -name '*.pl' | xargs chmod +x
+override_dh_auto_install:
+	dh_auto_install
 
-	# Syntax files bibtex.xml and latex.xml are provided by kdelibs5-data package.
-	find debian -type f -name bibtex.xml -or -name latex.xml -delete
-
 	# Fix lintian warning: package-contains-readme-for-other-platform-or-distro
-	find debian -type f -name README.MacOSX -delete
+	rm -f debian/tmp/usr/share/doc/kile/README.MacOSX
 
-	dh_install --list-missing
+	# Fix lintian warning: unknown-locale-code
+	rm -rf debian/tmp/usr/share/locale/x-test
 
-.PHONY: override_dh_auto_test
+	# Fix lintian warning: script-not-executable
+	find debian/tmp -type f -name '*.sh' -or -name '*.pl' | xargs chmod +x
+
+override_dh_auto_test:




More information about the pkg-kde-commits mailing list