rev 16534 - kde-extras/digikam-doc/trunk/debian

[Mark Purcell]

Author: msp
Date: 2010-01-05 11:38:54 +0000 (Tue, 05 Jan 2010)
New Revision: 16534

Removed:
   kde-extras/digikam-doc/trunk/debian/patches/
Modified:
   kde-extras/digikam-doc/trunk/debian/README.Debian
   kde-extras/digikam-doc/trunk/debian/changelog
   kde-extras/digikam-doc/trunk/debian/compat
   kde-extras/digikam-doc/trunk/debian/control
   kde-extras/digikam-doc/trunk/debian/rules
Log:
New Upstream Release (Closes: #527825, #514513, #547230, #529077) 

Modified: kde-extras/digikam-doc/trunk/debian/README.Debian
===================================================================
--- kde-extras/digikam-doc/trunk/debian/README.Debian	2010-01-04 17:32:36 UTC (rev 16533)
+++ kde-extras/digikam-doc/trunk/debian/README.Debian	2010-01-05 11:38:54 UTC (rev 16534)
@@ -138,7 +138,7 @@
 ---------------------------------------------------------------------
 
 Achim, Please add some text in here to document when it is necessary and
-how we update the build enviroment for a package.
+how we update the build environment for a package.
 
 -(snip)-
 

Modified: kde-extras/digikam-doc/trunk/debian/changelog
===================================================================
--- kde-extras/digikam-doc/trunk/debian/changelog	2010-01-04 17:32:36 UTC (rev 16533)
+++ kde-extras/digikam-doc/trunk/debian/changelog	2010-01-05 11:38:54 UTC (rev 16534)
@@ -1,3 +1,9 @@
+digikam-doc (0.10.0~svn1056455-1) unstable; urgency=low
+
+  * New Upstream Release (Closes: #527825, #514513, #547230, #529077) 
+
+ -- Mark Purcell <msp at debian.org>  Tue, 05 Jan 2010 22:37:57 +1100
+
 digikam-doc (0.9.5-1) unstable; urgency=low
 
   * New upstream release

Modified: kde-extras/digikam-doc/trunk/debian/compat
===================================================================
--- kde-extras/digikam-doc/trunk/debian/compat	2010-01-04 17:32:36 UTC (rev 16533)
+++ kde-extras/digikam-doc/trunk/debian/compat	2010-01-05 11:38:54 UTC (rev 16534)
@@ -1 +1 @@
-4
+7

Modified: kde-extras/digikam-doc/trunk/debian/control
===================================================================
--- kde-extras/digikam-doc/trunk/debian/control	2010-01-04 17:32:36 UTC (rev 16533)
+++ kde-extras/digikam-doc/trunk/debian/control	2010-01-05 11:38:54 UTC (rev 16534)
@@ -2,20 +2,17 @@
 Section: doc
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Mark Purcell <msp at debian.org>, Paul Telford <pxt at debian.org>, Achim Bohnet <ach at mpe.mpg.de>
-Build-Depends: debhelper (>> 4.1), cdbs
-Build-Depends-Indep: kdelibs4-dev
-Standards-Version: 3.8.0
+Uploaders: Mark Purcell <msp at debian.org>
+Build-Depends: debhelper (>= 7), cdbs, cmake, kdelibs5-dev
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/digikam-doc/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/digikam-doc/?op=log
 Homepage: http://www.digikam.org
 
 Package: digikam-doc
 Architecture: all
-Depends: ${misc:Depends}, khelpcenter
+Depends: ${misc:Depends}, khelpcenter4
 Recommends: digikam
-Conflicts: digikamimageplugins-doc
-Replaces: digikamimageplugins-doc
 Description: handbook for digikam and showfoto in several languages
  Digikam is an easy to use and powerful digital photo management
  application.
@@ -24,15 +21,3 @@
  digikam package. The handbooks are available for the following languages:
  .
     o English       (en)
-    o Danish        (da)
-    o German        (de)
-    o Spanish       (es)
-    o Estonian      (et)
-    o Italian       (it)
-    o Dutch         (nl)
-    o Brazilian [1] (pt_BR)
-    o Russian [1]   (ru)
-    o Swedish       (sv)
- .
- [1] only digikam handbook translation available
- [2] only showfoto handbook translation available

Modified: kde-extras/digikam-doc/trunk/debian/rules
===================================================================
--- kde-extras/digikam-doc/trunk/debian/rules	2010-01-04 17:32:36 UTC (rev 16533)
+++ kde-extras/digikam-doc/trunk/debian/rules	2010-01-05 11:38:54 UTC (rev 16534)
@@ -1,10 +1,20 @@
 #!/usr/bin/make -f
 
+include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/class/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
--include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
-TARBALL_EXT=tar.bz2
-SF_PROJECT=digikam
+REV = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/^.*svn//')
+
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo 'Checking out for repacking (might take 15 min) ... REV: ' $(REV) $(DEB_UPSTREAM_VERSION)
+	@@svn export svn://anonsvn.kde.org/home/kde/trunk/extragear/graphics/doc/digikam/@$(REV) ../tarballs/digikam-doc-$(REV).tmp
+	@@echo 'Getting the changelog (might take 15 min) ...'
+	@@cd ../tarballs/digikam-doc-$(REV).tmp; svn2cl -o changelog svn://anonsvn.kde.org/home/kde/trunk/extragear/graphics/doc/digikam/@$(REV)
+	@@echo Creating the tarball ...
+	@@cd ../tarballs/digikam-doc-$(REV).tmp; tar zcf ../digikam-doc_$(DEB_UPSTREAM_VERSION).orig.tar.gz *
+	@@rm -fR ../tarballs/digikam-doc-$(REV).tmp
+	@@echo Ready for packaging.
+