rev 15405 - kde-extras/kchmviewer/trunk/debian

Fathi Boudra fabo at alioth.debian.org
Wed Jul 29 20:11:03 UTC 2009 

Author: fabo
Date: 2009-07-29 20:11:03 +0000 (Wed, 29 Jul 2009)
New Revision: 15405

Added:
   kde-extras/kchmviewer/trunk/debian/not-installed
Removed:
   kde-extras/kchmviewer/trunk/debian/Makefile
   kde-extras/kchmviewer/trunk/debian/debiandirs
   kde-extras/kchmviewer/trunk/debian/dirs
Modified:
   kde-extras/kchmviewer/trunk/debian/changelog
   kde-extras/kchmviewer/trunk/debian/compat
   kde-extras/kchmviewer/trunk/debian/control
   kde-extras/kchmviewer/trunk/debian/copyright
   kde-extras/kchmviewer/trunk/debian/menu
   kde-extras/kchmviewer/trunk/debian/rules
Log:
  * New upstream release. (Closes: #479402, #496888)
  * Bump compat/debhelper to 7.
  * Update debian/control:
    - Set Debian KDE Extras Team as Maintainer and myself in Uploaders.
    - Update build dependencies:
      - Add cmake and pkg-kde-tools
      - Replace kdelibs4-dev by kdelibs5-dev
      - Remove autotools-dev
    - Update Standards-Version to 3.8.2 (no changes needed).
    - Add Homepage field
  * Remove deprecated files: debiandirs, dirs and Makefile.
  * Update debian/menu file to Debian menu policy 2.1
  * Switch debian/rules to dh.


Modified: kde-extras/kchmviewer/trunk/debian/changelog
===================================================================
--- kde-extras/kchmviewer/trunk/debian/changelog	2009-07-29 19:42:47 UTC (rev 15404)
+++ kde-extras/kchmviewer/trunk/debian/changelog	2009-07-29 20:11:03 UTC (rev 15405)
@@ -1,3 +1,21 @@
+kchmviewer (4.1-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #479402, #496888)
+  * Bump compat/debhelper to 7.
+  * Update debian/control:
+    - Set Debian KDE Extras Team as Maintainer and myself in Uploaders.
+    - Update build dependencies:
+      - Add cmake and pkg-kde-tools
+      - Replace kdelibs4-dev by kdelibs5-dev
+      - Remove autotools-dev
+    - Update Standards-Version to 3.8.2 (no changes needed).
+    - Add Homepage field
+  * Remove deprecated files: debiandirs, dirs and Makefile.
+  * Update debian/menu file to Debian menu policy 2.1
+  * Switch debian/rules to dh.
+
+ -- Fathi Boudra <fabo at debian.org>  Wed, 29 Jul 2009 21:43:18 +0200
+
 kchmviewer (3.1-2) unstable; urgency=low
 
   * Fixed FTBFS with gcc-4.3 (Closes: #474869)

Modified: kde-extras/kchmviewer/trunk/debian/compat
===================================================================
--- kde-extras/kchmviewer/trunk/debian/compat	2009-07-29 19:42:47 UTC (rev 15404)
+++ kde-extras/kchmviewer/trunk/debian/compat	2009-07-29 20:11:03 UTC (rev 15405)
@@ -1 +1 @@
-4
+7

Modified: kde-extras/kchmviewer/trunk/debian/control
===================================================================
--- kde-extras/kchmviewer/trunk/debian/control	2009-07-29 19:42:47 UTC (rev 15404)
+++ kde-extras/kchmviewer/trunk/debian/control	2009-07-29 20:11:03 UTC (rev 15405)
@@ -1,9 +1,12 @@
 Source: kchmviewer
 Section: kde
 Priority: optional
-Maintainer: Jose Luis Tallon <jltallon at adv-solutions.net>
-Build-Depends: debhelper (>= 4.2.0), kdelibs4-dev, libchm-dev, autotools-dev
-Standards-Version: 3.7.3
+Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Uploaders: Fathi Boudra <fabo at debian.org>, Jose Luis Tallon <jltallon at adv-solutions.net>
+Build-Depends: debhelper (>= 7.3.8), cmake, pkg-kde-tools (>= 0.4.11),
+ kdelibs5-dev, libchm-dev
+Standards-Version: 3.8.2
+Homepage: http://www.kchmviewer.net/
 
 Package: kchmviewer
 Architecture: any
@@ -11,8 +14,8 @@
 Description: CHM viewer for KDE
  KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
  Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget
- library, and does not depend on KDE or Gnome. However, it may be compiled
- with full KDE support, including KDE widgets and KIO/KHTML. 
+ library, and does not depend on KDE or GNOME. However, it may be compiled
+ with full KDE support, including KDE widgets and KIO/KHTML.
  .
  The main advantage of KchmViewer is non-English language support. Unlike
  others, KchmViewer in most cases correctly detects help file encoding,
@@ -22,7 +25,7 @@
  .
  Completely safe and harmless. Does not support JavaScript in any way,
  optionally warns you before opening an external web page, or switching to
- another help file. Shows an appropriate image for every TOC entry. 
+ another help file. Shows an appropriate image for every TOC entry.
  .
  KchmViewer Has complete chm index support, including multiple index entries,
  cross-links and parent/child entries in index as well as Persistent bookmarks

Modified: kde-extras/kchmviewer/trunk/debian/copyright
===================================================================
--- kde-extras/kchmviewer/trunk/debian/copyright	2009-07-29 19:42:47 UTC (rev 15404)
+++ kde-extras/kchmviewer/trunk/debian/copyright	2009-07-29 20:11:03 UTC (rev 15405)
@@ -4,8 +4,9 @@
 
 It was downloaded from http://kchmviewer.sourceforge.net
 
-Copyright Holder: Georgy Gunayev <tim at krasnogorsk.ru>
+Copyright Holder:
 
+   © 2004-2009 Georgy Gunayev <tim at krasnogorsk.ru>
 
 License statement:
    This package is free software; you can redistribute it and/or modify
@@ -19,8 +20,7 @@
    GNU General Public License for more details.
 
 Additional Licenses:
-	The 'kio-msits' KIOSlave module is covered by the GNU LGPL license.
+   The 'kio-msits' KIOSlave module is covered by the GNU LGPL license.
 
-
 On Debian systems, the complete text of the GNU GPL2 and LGPL licenses
-can be found at `/usr/share/common-licenses'. 
+can be found at `/usr/share/common-licenses'.

Modified: kde-extras/kchmviewer/trunk/debian/menu
===================================================================
--- kde-extras/kchmviewer/trunk/debian/menu	2009-07-29 19:42:47 UTC (rev 15404)
+++ kde-extras/kchmviewer/trunk/debian/menu	2009-07-29 20:11:03 UTC (rev 15405)
@@ -1,2 +1,5 @@
-?package(kchmviewer):needs="X11" section="Apps/Viewers"\
-  title="kchmviewer" command="/usr/bin/kchmviewer"
+?package(kchmviewer): \
+    needs="X11" \
+    section="Applications/Viewers" \
+    title="kchmviewer" \
+    command="/usr/bin/kchmviewer"

Added: kde-extras/kchmviewer/trunk/debian/not-installed
===================================================================
--- kde-extras/kchmviewer/trunk/debian/not-installed	                        (rev 0)
+++ kde-extras/kchmviewer/trunk/debian/not-installed	2009-07-29 20:11:03 UTC (rev 15405)
@@ -0,0 +1,3 @@
+# Conflict against okular-extra-backends
+./usr/share/kde4/services/msits.protocol
+./usr/lib/kde4/kio_msits.so

Modified: kde-extras/kchmviewer/trunk/debian/rules
===================================================================
--- kde-extras/kchmviewer/trunk/debian/rules	2009-07-29 19:42:47 UTC (rev 15404)
+++ kde-extras/kchmviewer/trunk/debian/rules	2009-07-29 20:11:03 UTC (rev 15405)
@@ -1,102 +1,6 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk
 
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
--include debian/debiandirs
-
-config.status: configure
-	dh_testdir
-#	automake
-#	autoconf
-	test -e config.sub -a -L config.sub || \
-		ln -sf /usr/share/misc/config.sub config.sub
-	test -e config.guess -a -L config.guess || \
-		ln -sf /usr/share/misc/config.guess config.guess
-
-	CFLAGS="$(CFLAGS)" ./configure \
-	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	--prefix=$(kde_prefix) --with-qt-dir=$(qtdir) \
-	--sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) \
-	--infodir=$(infodir) --mandir=$(mandir) \
-	--disable-debug --disable-rpath \
-	--with-kde
-
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-	$(MAKE)
-#	docbook-to-man debian/kchmviewer.sgml > kchmviewer.1
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-	-$(MAKE) distclean
-	$(RM) src/pics/Makefile
-	$(RM) config.sub config.guess
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kchmviewer
-	$(MAKE) -C src/pics install DESTDIR=$(CURDIR)/debian/kchmviewer
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-	dh_installmenu
-#	dh_installdebconf	
-#	dh_installmime
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	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 
+%:
+	dh $@

More information about the pkg-kde-commits mailing list