rev 13108 - kde-extras/keurocalc/trunk/debian

Sat Jan 3 17:10:45 UTC 2009

Author: meskes
Date: 2009-01-03 17:10:45 +0000 (Sat, 03 Jan 2009)
New Revision: 13108

Added:
   kde-extras/keurocalc/trunk/debian/keurocalc-data.install
   kde-extras/keurocalc/trunk/debian/keurocalc.install
   kde-extras/keurocalc/trunk/debian/keurocalc.menu
Removed:
   kde-extras/keurocalc/trunk/debian/debiandirs
   kde-extras/keurocalc/trunk/debian/dirs
   kde-extras/keurocalc/trunk/debian/keurocalc-data.files
   kde-extras/keurocalc/trunk/debian/keurocalc.files
   kde-extras/keurocalc/trunk/debian/menu
   kde-extras/keurocalc/trunk/debian/patches/
Modified:
   kde-extras/keurocalc/trunk/debian/changelog
   kde-extras/keurocalc/trunk/debian/control
   kde-extras/keurocalc/trunk/debian/copyright
   kde-extras/keurocalc/trunk/debian/rules
Log:
New upstream version for kde4/experimental.



Modified: kde-extras/keurocalc/trunk/debian/changelog
===================================================================

--- kde-extras/keurocalc/trunk/debian/changelog	2009-01-03 17:02:06 UTC (rev 13107)
+++ kde-extras/keurocalc/trunk/debian/changelog	2009-01-03 17:10:45 UTC (rev 13108)
@@ -1,3 +1,11 @@
+keurocalc (1.0.1-1) experimental; urgency=low
+
+  * New upstream version for KDE4.
+  * Removed patches that were not needed anymore and simplified packaging.
+  * Migrated to cdbs.
+
+ -- Michael Meskes <meskes at debian.org>  Fri, 02 Jan 2009 20:34:52 +0100
+
 keurocalc (0.9.7-1) unstable; urgency=low
 
   * New maintainer, closes: #484541

Modified: kde-extras/keurocalc/trunk/debian/control
===================================================================
--- kde-extras/keurocalc/trunk/debian/control	2009-01-03 17:02:06 UTC (rev 13107)
+++ kde-extras/keurocalc/trunk/debian/control	2009-01-03 17:10:45 UTC (rev 13108)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Michael Meskes <meskes at debian.org>
-Build-Depends: debhelper (>= 5.0.0), kdelibs4-dev, dpatch
+Build-Depends: debhelper (>= 5.0.0), kdelibs5-dev, cdbs
 Standards-Version: 3.8.0
 Homepage: http://opensource.bureau-cornavin.com/keurocalc/
 
 Package: keurocalc
 Architecture: any
-Depends: keurocalc-data, ${shlibs:Depends}
+Depends: keurocalc-data, ${shlibs:Depends}, ${misc:Depends}
 Description: universal currency converter and calculator - binary package
  KEurocalc is a universal currency converter and calculator. 
  It downloads latest exchange rates directly from the 
@@ -17,7 +17,7 @@
 
 Package: keurocalc-data
 Architecture: all
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: keurocalc
 Replaces: keurocalc
 Description: universal currency converter and calculator - data package

Modified: kde-extras/keurocalc/trunk/debian/copyright
===================================================================
--- kde-extras/keurocalc/trunk/debian/copyright	2009-01-03 17:02:06 UTC (rev 13107)
+++ kde-extras/keurocalc/trunk/debian/copyright	2009-01-03 17:10:45 UTC (rev 13108)
@@ -6,6 +6,7 @@
 Copyright (C) 2001-2006 Éric Bischoff <e.bischoff at noos.fr>
         		Melchior Franz <a8603365 at unet.univie.ac.at>
 			Bas Willems <cybersurfer at euronet.nl>
+			Gil Gross <ptit.ours at gmail.com>
 
 License:
 
@@ -27,3 +28,26 @@
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
+The following files are licensed under the GNU Free Documentation License:
+ * index.docbook (C) 2008 Eric Bischoff <ebischoff at nerim.net>
+
+   The purpose of this License is to make a manual, textbook, or other
+   functional and useful document "free" in the sense of freedom: to
+   assure everyone the effective freedom to copy and redistribute it,
+   with or without modifying it, either commercially or noncommercially.
+   Secondarily, this License preserves for the author and publisher a way
+   to get credit for their work, while not being considered responsible
+   for modifications made by others.
+
+   This License is a kind of "copyleft", which means that derivative
+   works of the document must themselves be free in the same sense.  It
+   complements the GNU General Public License, which is a copyleft
+   license designed for free software.
+
+The full text of the GNU General Public License version 2 is available on
+Debian systems in /usr/share/common-licenses/GFDL.
+
+The Debian packaging is (C) 2005-2009, Claudio Moratti <maxer at knio.it> and
+Michael Meskes <meskes at debian.org>. It is licensed under the GPL, either
+version 2, or (at your option) any later version, see above.
+

Deleted: kde-extras/keurocalc/trunk/debian/debiandirs

Deleted: kde-extras/keurocalc/trunk/debian/dirs

Deleted: kde-extras/keurocalc/trunk/debian/keurocalc-data.files

Copied: kde-extras/keurocalc/trunk/debian/keurocalc-data.install (from rev 13104, kde-extras/keurocalc/trunk/debian/keurocalc-data.files)
===================================================================
--- kde-extras/keurocalc/trunk/debian/keurocalc-data.install	                        (rev 0)
+++ kde-extras/keurocalc/trunk/debian/keurocalc-data.install	2009-01-03 17:10:45 UTC (rev 13108)
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/doc/kde4
+debian/tmp/usr/share/kde4
+debian/tmp/usr/share/locale


Property changes on: kde-extras/keurocalc/trunk/debian/keurocalc-data.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: kde-extras/keurocalc/trunk/debian/keurocalc.files

Copied: kde-extras/keurocalc/trunk/debian/keurocalc.install (from rev 13104, kde-extras/keurocalc/trunk/debian/keurocalc.files)
===================================================================
--- kde-extras/keurocalc/trunk/debian/keurocalc.install	                        (rev 0)
+++ kde-extras/keurocalc/trunk/debian/keurocalc.install	2009-01-03 17:10:45 UTC (rev 13108)
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin
+debian/tmp/usr/share/applications


Property changes on: kde-extras/keurocalc/trunk/debian/keurocalc.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: kde-extras/keurocalc/trunk/debian/keurocalc.menu (from rev 13104, kde-extras/keurocalc/trunk/debian/menu)
===================================================================
--- kde-extras/keurocalc/trunk/debian/keurocalc.menu	                        (rev 0)
+++ kde-extras/keurocalc/trunk/debian/keurocalc.menu	2009-01-03 17:10:45 UTC (rev 13108)
@@ -0,0 +1,6 @@
+?package(keurocalc):\
+needs="X11"\
+section="Applications/Science/Mathematics"\
+hints="KDE"\
+title="KEuroCalc"\
+command="/usr/bin/keurocalc"


Property changes on: kde-extras/keurocalc/trunk/debian/keurocalc.menu
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: kde-extras/keurocalc/trunk/debian/menu

Modified: kde-extras/keurocalc/trunk/debian/rules
===================================================================
--- kde-extras/keurocalc/trunk/debian/rules	2009-01-03 17:02:06 UTC (rev 13107)
+++ kde-extras/keurocalc/trunk/debian/rules	2009-01-03 17:10:45 UTC (rev 13108)
@@ -1,97 +1,17 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
-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
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+DEB_KDE_ENABLE_FINAL := yes
+DEB_COMPRESS_EXCLUDE = .docbook
 
-include /usr/share/dpatch/dpatch.make
-
--include debian/debiandirs
-
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
-
-configure: patch configure-stamp
-configure-stamp:
-	dh_testdir
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
 endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-uselib $(configkde) 
 
-	touch configure-stamp
-
-build: build-stamp
-
-build-stamp:  configure
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
-
-clean: clean-patched unpatch
-
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	[ ! -f Makefile ] || $(MAKE) -i distclean
-	dh_clean config.sub config.guess po/*/*.gmo
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_desktop -i
-	dh_movefiles -i
-	dh_link -i
-	dh_compress -i -X.docbook -X.css -X-license -X.dcl -X.bz2
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a
-	dh_installdocs -a
-	dh_installmenu -a
-	dh_installman -a
-	dh_movefiles -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a 
-	dh_fixperms -a
-	dh_installdeb -a 
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 


