rev 15084 - in kde-extras/kipi-plugins/trunk/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2009-07-03 20:21:46 +0000 (Fri, 03 Jul 2009)
New Revision: 15084

Added:
   kde-extras/kipi-plugins/trunk/debian/patches/series
Modified:
   kde-extras/kipi-plugins/trunk/debian/changelog
   kde-extras/kipi-plugins/trunk/debian/control
   kde-extras/kipi-plugins/trunk/debian/kipi-plugins.install
   kde-extras/kipi-plugins/trunk/debian/rules
Log:
Update debian/control:
 - Add quilt and pkg-kde-tools build dependencies.
 - Remove cdbs build dependency.
Update debian/kipi-plugins.install: more verbose.
Rewrite debian/rules: use dh.
(debhelper 7.3 will come soon with cmake support \o/)


Modified: kde-extras/kipi-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/changelog	2009-07-03 16:08:16 UTC (rev 15083)
+++ kde-extras/kipi-plugins/trunk/debian/changelog	2009-07-03 20:21:46 UTC (rev 15084)
@@ -1,7 +1,12 @@
-kipi-plugins (0.4.0-1) UNRELEASED; urgency=low
+kipi-plugins (0.4.0-1) unstable; urgency=low
 
   * New upstream release.
-  * Bump Standards-Version to 3.8.2 (no changes needed).
+  * Update debian/control:
+    - Add quilt and pkg-kde-tools build dependencies.
+    - Remove cdbs build dependency.
+    - Bump Standards-Version to 3.8.2 (no changes needed).
+  * Update debian/kipi-plugins.install: more verbose.
+  * Rewrite debian/rules: use dh.
 
  -- Fathi Boudra <fabo at debian.org>  Fri, 03 Jul 2009 15:30:11 +0200
 

Modified: kde-extras/kipi-plugins/trunk/debian/control
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/control	2009-07-03 16:08:16 UTC (rev 15083)
+++ kde-extras/kipi-plugins/trunk/debian/control	2009-07-03 20:21:46 UTC (rev 15084)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Achim Bohnet <ach at mpe.mpg.de>, Fathi Boudra <fabo at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), pkg-config,
+Build-Depends: debhelper (>= 7), quilt, pkg-kde-tools, pkg-config,
  libgphoto2-2-dev,
  kdelibs5-dev,
  kdepimlibs5-dev,
@@ -13,7 +13,7 @@
  libcv-dev,
  libxrandr-dev, libexpat1-dev,
  libgpod-dev,
- libsane-dev, libksane-dev (>= 4:4.1.85), libqt4-opengl-dev
+ libsane-dev, libksane-dev (>= 4:4.2.0), libqt4-opengl-dev
 Standards-Version: 3.8.2
 Homepage: http://www.kipi-plugins.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kipi-plugins/branches/kde4/?op=log
@@ -23,7 +23,7 @@
 Replaces: digikamplugins
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), konqueror
+Recommends: graphicsmagick-imagemagick-compat (>= 1.1.7) | imagemagick (>= 5.4.8), konqueror
 Suggests: gallery, gimp, kmail, vorbis-tools
 Enhances: digikam, gwenview, kphotoalbum, showimg
 Description: image manipulation/handling plugins for KIPI aware programs

Modified: kde-extras/kipi-plugins/trunk/debian/kipi-plugins.install
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/kipi-plugins.install	2009-07-03 16:08:16 UTC (rev 15083)
+++ kde-extras/kipi-plugins/trunk/debian/kipi-plugins.install	2009-07-03 20:21:46 UTC (rev 15084)
@@ -1 +1,10 @@
-usr
+usr/bin/dngconverter
+usr/lib/kde4/kipiplugin_*.so
+usr/lib/libkipiplugins.so.*
+usr/share/applications/kde4/dngconverter.desktop
+usr/share/applications/kde4/kipiplugins.desktop
+usr/share/icons/hicolor
+usr/share/icons/oxygen
+usr/share/kde4/apps/kipiplugin_*
+usr/share/kde4/services/kipiplugin_*.desktop
+usr/share/locale

Added: kde-extras/kipi-plugins/trunk/debian/patches/series
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/kipi-plugins/trunk/debian/patches/series	2009-07-03 20:21:46 UTC (rev 15084)
@@ -0,0 +1 @@
+fix_endian_detection.diff

Modified: kde-extras/kipi-plugins/trunk/debian/rules
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/rules	2009-07-03 16:08:16 UTC (rev 15083)
+++ kde-extras/kipi-plugins/trunk/debian/rules	2009-07-03 20:21:46 UTC (rev 15084)
@@ -1,15 +1,26 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.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/pkg-kde-tools/makefiles/1/variables.mk
 
-SF_PROJECT = kipi
-SF_MIRRORS = heanet optusnet
-TARBALL_EXT = tar.bz2
+%:
+	dh --with quilt $@
 
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
+override_dh_auto_configure:
+	mkdir 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)
 
-clean ::
-	rm -f po/*/*.gmo
+override_dh_auto_build:
+	$(MAKE) -C builddir
+
+override_dh_auto_clean:
+	rm -rf builddir
+
+override_dh_auto_install:
+	$(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/tmp install