rev 13923 - in kde-extras/kile/branches/experimental/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Mon Mar 2 01:28:21 UTC 2009


Author: fabo
Date: 2009-03-02 01:28:20 +0000 (Mon, 02 Mar 2009)
New Revision: 13923

Added:
   kde-extras/kile/branches/experimental/debian/kile-doc.install
   kde-extras/kile/branches/experimental/debian/kile.docs
   kde-extras/kile/branches/experimental/debian/kile.install
   kde-extras/kile/branches/experimental/debian/patches/
   kde-extras/kile/branches/experimental/debian/patches/01_install_doc.diff
   kde-extras/kile/branches/experimental/debian/patches/series
   kde-extras/kile/branches/experimental/debian/postinst
Removed:
   kde-extras/kile/branches/experimental/debian/cdbs/
   kde-extras/kile/branches/experimental/debian/docs
Modified:
   kde-extras/kile/branches/experimental/debian/changelog
   kde-extras/kile/branches/experimental/debian/control
   kde-extras/kile/branches/experimental/debian/copyright
   kde-extras/kile/branches/experimental/debian/rules
Log:
kile 2.1.0~svn933829-1

  * New svn snapshot:
    - KDE 4 port
  * Remove all previous patches. Deprecated
  * Bump compat/debhelper to 7
  * Update debian/control:
    - Update build-depends:
      - Remove cdbs and pkg-config
      - Add cmake and pkg-kde-tools
      - Replace kdelibs4-dev by kdelibs5-dev (>= 4:4.2.0)
    - Update kile package depends: add texlive-base-bin
    - Update kile package recommends:
      - Remove kdvi, kghostview and kpdf
      - Add asymptote, context, dblatex, dvipdfmx, ghostscript, imagemagick,
        kbibtex | pybliographer | gbib | jabref, konqueror | iceweasel,
        latex2html, lilypond, okular | gv, psutils, tex4ht, texlive-metapost,
        texlive-xetex, zip
    - Update kile package suggests:
      - Remove gbib, latex2html, pybliographer, xfig and gv
      - add kile-doc
    - Add kile-doc package
    - Disable kile-i18n for svn snapshots
  * Update debian/copyright:
    - Refresh copyright years
    - Add GPL-3 path
  * Rename debian/docs to debian/kile.docs and refresh it
  * Update debian/kile.install: rewrite for KDE4 port
  * Add debian/postinst for dh_desktop usage
  * Refresh debian/README.Debian: syntax files are provided by kdelibs5-data
  * Rewrite debian/rules:
    - upstream build system is cmake
    - use debhelper only instead of cdbs


Modified: kde-extras/kile/branches/experimental/debian/changelog
===================================================================
--- kde-extras/kile/branches/experimental/debian/changelog	2009-03-01 16:25:37 UTC (rev 13922)
+++ kde-extras/kile/branches/experimental/debian/changelog	2009-03-02 01:28:20 UTC (rev 13923)
@@ -1,6 +1,36 @@
-kile (1:2.0.80+svn903157-1) UNRELEASED; urgency=low
+kile (1:2.1.0~svn933829-1) experimental; urgency=low
 
-  * Initial KDE4 release
+  * New svn snapshot:
+    - KDE 4 port
+  * Remove all previous patches. Deprecated
+  * Bump compat/debhelper to 7
+  * Update debian/control:
+    - Update build-depends:
+      - Remove cdbs and pkg-config
+      - Add cmake and pkg-kde-tools
+      - Replace kdelibs4-dev by kdelibs5-dev (>= 4:4.2.0)
+    - Update kile package depends: add texlive-base-bin
+    - Update kile package recommends:
+      - Remove kdvi, kghostview and kpdf
+      - Add asymptote, context, dblatex, dvipdfmx, ghostscript, imagemagick,
+        kbibtex | pybliographer | gbib | jabref, konqueror | iceweasel,
+        latex2html, lilypond, okular | gv, psutils, tex4ht, texlive-metapost,
+        texlive-xetex, zip
+    - Update kile package suggests:
+      - Remove gbib, latex2html, pybliographer, xfig and gv
+      - add kile-doc
+    - Add kile-doc package
+    - Disable kile-i18n for svn snapshots
+  * Update debian/copyright:
+    - Refresh copyright years
+    - Add GPL-3 path
+  * Rename debian/docs to debian/kile.docs and refresh it
+  * Update debian/kile.install: rewrite for KDE4 port
+  * Add debian/postinst for dh_desktop usage
+  * Refresh debian/README.Debian: syntax files are provided by kdelibs5-data
+  * Rewrite debian/rules:
+    - upstream build system is cmake
+    - use debhelper only instead of cdbs
 
  -- Fathi Boudra <fabo at debian.org>  Tue, 30 Dec 2008 14:15:38 +0100
 

Modified: kde-extras/kile/branches/experimental/debian/control
===================================================================
--- kde-extras/kile/branches/experimental/debian/control	2009-03-01 16:25:37 UTC (rev 13922)
+++ kde-extras/kile/branches/experimental/debian/control	2009-03-02 01:28:20 UTC (rev 13923)
@@ -1,20 +1,24 @@
 Source: kile
 Section: tex
-Priority: extra
+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: cdbs, debhelper (>= 7), cmake, quilt, kdelibs5-dev
+Build-Depends: quilt, debhelper (>= 7), cmake, pkg-kde-tools,
+ kdelibs5-dev (>= 4:4.2.0)
 Standards-Version: 3.8.0
 Homepage: http://kile.sourceforge.net
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kile/experimental
-Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kile/experimental
+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
-Section: tex
-Depends: ${shlibs:Depends}, ${misc:Depends}, konsole, texlive-latex-base
-Recommends: kdvi, kghostview, kpdf, dvipng
-Suggests: gbib, latex2html, pybliographer, xfig, kile-i18n, gv
+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 | gv, psutils, tex4ht, texlive-metapost,
+ texlive-xetex, zip
+Suggests: kile-doc, kile-i18n
 Conflicts: ktexmaker2 (<< 1.8)
 Replaces: ktexmaker2 (<< 1.8)
 Description: KDE Integrated LaTeX Environment
@@ -31,3 +35,11 @@
  .
  Kile can support large projects consisting of several smaller files.
 
+Package: kile-doc
+Architecture: all
+Section: doc
+Depends: ${shlibs:Depends}, ${misc: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.

Modified: kde-extras/kile/branches/experimental/debian/copyright
===================================================================
--- kde-extras/kile/branches/experimental/debian/copyright	2009-03-01 16:25:37 UTC (rev 13922)
+++ kde-extras/kile/branches/experimental/debian/copyright	2009-03-02 01:28:20 UTC (rev 13923)
@@ -19,9 +19,9 @@
 
     © 2003-2005 Jeroen Wijnout <Jeroen.Wijnhout_at_kdemail.net>
     © 2004-2007 Holger Danielsson <holger.danielsson_at_t-online.de>
-    © 2006-2007 Michel Ludwig <michel.ludwig at kdemail.net>
-    © 2005-2007 Thomas Braun <braun at physik.fu-berlin.de>
-    © 2002-2003 Pascal Brachet <pascal.brachet at club-internet.fr>
+    © 2006-2009 Michel Ludwig <michel.ludwig at kdemail.net>
+    © 2005-2009 Thomas Braun <braun at physik.fu-berlin.de>
+    © 2001-2003 Pascal Brachet <pascal.brachet at club-internet.fr>
 
 Copyright for kile grep dialog:
 
@@ -55,13 +55,14 @@
     © 2001, 2003 Peter Kelly <pmk at post.com>
     © 2003 Apple Computer Inc.
 
-Copyright for kile preview widget:
+Copyright for kile preview widget, category combobox and src/dialogs/tabular/*
+source code:
 
-    © Mathias Soeken <msoeken at informatik.uni-bremen.de>
+    © 2004, 2006, 2008 Mathias Soeken <msoeken at informatik.uni-bremen.de>
 
 Copyright for kile file select:
 
-    © Matt Newell
+    © 2001 Matt Newell
 
 License:
 
@@ -80,11 +81,12 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'
+and `/usr/share/common-licenses/GPL-3'.
 
 The Debian packaging is:
 
-    Copyright C) 2008, Fathi Boudra <fabo at debian.org>
+    Copyright (C) 2008-2009, Fathi Boudra <fabo at debian.org>
 
 and is licensed under the GPL, see above.
 
@@ -95,4 +97,3 @@
 
 On Debian systems, the complete text of the GNU Free Documentation
 License can be found in `/usr/share/common-licenses/GFDL'.
-

Deleted: kde-extras/kile/branches/experimental/debian/docs

Added: kde-extras/kile/branches/experimental/debian/kile-doc.install
===================================================================
--- kde-extras/kile/branches/experimental/debian/kile-doc.install	                        (rev 0)
+++ kde-extras/kile/branches/experimental/debian/kile-doc.install	2009-03-02 01:28:20 UTC (rev 13923)
@@ -0,0 +1 @@
+usr/share/doc/kde4/HTML

Added: kde-extras/kile/branches/experimental/debian/kile.docs
===================================================================
--- kde-extras/kile/branches/experimental/debian/kile.docs	                        (rev 0)
+++ kde-extras/kile/branches/experimental/debian/kile.docs	2009-03-02 01:28:20 UTC (rev 13923)
@@ -0,0 +1,8 @@
+Building-with-cmake.txt
+CODE-FORMATTING-STYLE.txt
+kile-remote-control.txt
+missing-stuff-from-branch.txt
+README
+README.cwl
+TODO
+TODO-2.1

Added: kde-extras/kile/branches/experimental/debian/kile.install
===================================================================
--- kde-extras/kile/branches/experimental/debian/kile.install	                        (rev 0)
+++ kde-extras/kile/branches/experimental/debian/kile.install	2009-03-02 01:28:20 UTC (rev 13923)
@@ -0,0 +1,9 @@
+usr/bin/kile
+usr/share/applications/kde4/kile.desktop
+usr/share/dbus-1/interfaces/net.sourceforge.kile.main.xml
+usr/share/icons/hicolor
+usr/share/kde4/apps/kconf_update
+usr/share/kde4/apps/kile
+usr/share/kde4/config.kcfg/kile.kcfg
+usr/share/mimelink/text/x-kilepr.desktop
+usr/share/pixmaps/kile.xpm

Added: kde-extras/kile/branches/experimental/debian/patches/01_install_doc.diff
===================================================================
--- kde-extras/kile/branches/experimental/debian/patches/01_install_doc.diff	                        (rev 0)
+++ kde-extras/kile/branches/experimental/debian/patches/01_install_doc.diff	2009-03-02 01:28:20 UTC (rev 13923)
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -105,7 +105,8 @@ ENDIF(  EXISTS ${kile_SOURCE_DIR}/doc OR
+ IF( EXISTS ${kile_SOURCE_DIR}/doc )
+ 	IF( KDE4_MEINPROC_EXECUTABLE )
+ 		MESSAGE( STATUS "Building standard documentation")
+-		KILE_ADD_DOCBOOK_DIRECTORY( kile_DOCUMENTATION_SOURCES doc index.docbook en )
++		ADD_SUBDIRECTORY( doc )
++        #KILE_ADD_DOCBOOK_DIRECTORY( kile_DOCUMENTATION_SOURCES doc index.docbook en )
+ 	ENDIF( KDE4_MEINPROC_EXECUTABLE )
+ ELSE( EXISTS ${kile_SOURCE_DIR}/doc )
+ 	MESSAGE( STATUS "Not building standard documentation")

Added: kde-extras/kile/branches/experimental/debian/patches/series
===================================================================
--- kde-extras/kile/branches/experimental/debian/patches/series	                        (rev 0)
+++ kde-extras/kile/branches/experimental/debian/patches/series	2009-03-02 01:28:20 UTC (rev 13923)
@@ -0,0 +1 @@
+01_install_doc.diff

Added: kde-extras/kile/branches/experimental/debian/postinst
===================================================================
--- kde-extras/kile/branches/experimental/debian/postinst	                        (rev 0)
+++ kde-extras/kile/branches/experimental/debian/postinst	2009-03-02 01:28:20 UTC (rev 13923)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

Modified: kde-extras/kile/branches/experimental/debian/rules
===================================================================
--- kde-extras/kile/branches/experimental/debian/rules	2009-03-01 16:25:37 UTC (rev 13922)
+++ kde-extras/kile/branches/experimental/debian/rules	2009-03-02 01:28:20 UTC (rev 13923)
@@ -1,15 +1,90 @@
 #!/usr/bin/make -f
 
-include debian/cdbs/kde.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-DEB_INSTALL_MANPAGES_kile := debian/kile.1
+include /usr/share/pkg-kde-tools/makefiles/1/variables.mk
+include /usr/share/quilt/quilt.make
 
-install/kile::
+DEB_DESTDIR = $(CURDIR)/debian/tmp
+
+builddir/Makefile: $(QUILT_STAMPFN)
+	dh_testdir
+
+	mkdir -p builddir
+	cd builddir && cmake .. \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_C_FLAGS="$(CFLAGS)" \
+		-DCMAKE_LD_FLAGS="-Wl,-z,defs" \
+		-DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_VERBOSE_MAKEFILE=ON \
+		$(DEB_CMAKE_KDE4_FLAGS)
+
+build: build-stamp
+build-stamp: builddir/Makefile
+	dh_testdir
+
+	$(MAKE) -C builddir
+
+	touch $@
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	rm -rf builddir
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	$(MAKE) -C builddir DESTDIR=$(DEB_DESTDIR) install
+
 	# Install pixmap
-	install -D -p -m0644 debian/kile.xpm debian/kile/usr/share/pixmaps/kile.xpm
+	install -D -p -m0644 debian/kile.xpm $(DEB_DESTDIR)/usr/share/pixmaps/kile.xpm
 
-	chmod +x debian/kile/usr/share/kde4/apps/kile/test/runTests.sh
-	chmod +x debian/kile/usr/share/kde4/apps/kconf_update/kile*_upd.pl
-	find debian -type f -name bibtex.xml | xargs rm -f
-	find debian -type f -name latex.xml | xargs rm -f
+	# Fix lintian warning: script-not-executable
+	chmod +x $(DEB_DESTDIR)/usr/share/kde4/apps/kile/test/runTests.sh
+	chmod +x $(DEB_DESTDIR)/usr/share/kde4/apps/kconf_update/kile*_upd.pl
 
+	# Syntax files bibtex.xml and latex.xml are provided by kdelibs5-data package.
+	find $(DEB_DESTDIR) -type f -name bibtex.xml | xargs rm -f
+	find $(DEB_DESTDIR) -type f -name latex.xml | xargs rm -f
+
+	# Fix lintian warning: package-contains-readme-for-other-platform-or-distro
+	find $(DEB_DESTDIR) -type f -name README.MacOSX | xargs rm -f
+
+# Build architecture-independent files here.
+binary-indep: install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installexamples
+	dh_install --list-missing
+	dh_installmenu
+	dh_installman debian/kile.1
+	dh_desktop
+	dh_link
+	dh_strip
+	dh_compress --exclude=.docbook
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 




More information about the pkg-kde-commits mailing list