rev 14884 - krap/qedje/trunk/debian

[George Kiagiadakis]

Author: gkiagia-guest
Date: 2009-06-05 14:23:20 +0000 (Fri, 05 Jun 2009)
New Revision: 14884

Removed:
   krap/qedje/trunk/debian/patches/
Modified:
   krap/qedje/trunk/debian/changelog
   krap/qedje/trunk/debian/compat
   krap/qedje/trunk/debian/control
   krap/qedje/trunk/debian/libqedje-dev.install
   krap/qedje/trunk/debian/rules
Log:
Update qedje.


Modified: krap/qedje/trunk/debian/changelog
===================================================================
--- krap/qedje/trunk/debian/changelog	2009-06-05 13:52:04 UTC (rev 14883)
+++ krap/qedje/trunk/debian/changelog	2009-06-05 14:23:20 UTC (rev 14884)
@@ -1,9 +1,21 @@
 qedje (0.4.0-1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * New upstream release. (Closes: #526853)
+
+  +++ Changes by Fathi Boudra:
+
   * Update homepage.
   * Bump Standards-Version from 3.8.0 to 3.8.1 (no changes needed).
 
+  +++ Changes by George Kiagiadakis:
+
+  * Switch to cmake.
+  * Update installed files.
+  * Update compat to 7.
+  * Update (build-)dependency on libqzion-dev to version 0.4.0.
+  * Remove patch no_public_eet.h_needed.diff (applied upstream).
+  * Remove build dependency on quilt as there are no patches to apply.
+
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Mon, 04 May 2009 10:59:14 +0200
 
 qedje (0.3.0-2) unstable; urgency=low

Modified: krap/qedje/trunk/debian/compat
===================================================================
--- krap/qedje/trunk/debian/compat	2009-06-05 13:52:04 UTC (rev 14883)
+++ krap/qedje/trunk/debian/compat	2009-06-05 14:23:20 UTC (rev 14884)
@@ -1 +1 @@
-5
+7

Modified: krap/qedje/trunk/debian/control
===================================================================
--- krap/qedje/trunk/debian/control	2009-06-05 13:52:04 UTC (rev 14883)
+++ krap/qedje/trunk/debian/control	2009-06-05 14:23:20 UTC (rev 14884)
@@ -3,15 +3,15 @@
 Priority: optional
 Maintainer: Debian Krap Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Jonathan Riddell <jriddell at ubuntu.com>, Sune Vuorela <debian at pusling.com>, George Kiagiadakis <gkiagiad at csd.uoc.gr>
-Build-Depends: cdbs, debhelper (>= 5), quilt,
- libqt4-dev, libqzion-dev, libeet-dev
+Build-Depends: cdbs, debhelper (>= 7), cmake,
+ libqt4-dev, libqzion-dev (>= 0.4.0), libeet-dev
 Standards-Version: 3.8.1
 Homepage: http://code.openbossa.org/projects/qedje
 
 Package: libqedje-dev
 Section: libdevel
 Architecture: any
-Depends: libqedje0 (= ${binary:Version}), libqzion-dev, ${misc:Depends}
+Depends: libqedje0 (= ${binary:Version}), libqzion-dev (>= 0.4.0), ${misc:Depends}
 Description: UI interface library which separates design from logic
  QEdje extends the Qt toolkit with the flexibility of the Edje
  declarative language.

Modified: krap/qedje/trunk/debian/libqedje-dev.install
===================================================================
--- krap/qedje/trunk/debian/libqedje-dev.install	2009-06-05 13:52:04 UTC (rev 14883)
+++ krap/qedje/trunk/debian/libqedje-dev.install	2009-06-05 14:23:20 UTC (rev 14884)
@@ -1,4 +1,3 @@
 usr/include/*
 usr/lib/lib*.so
-usr/lib/libqedje.prl
 usr/lib/pkgconfig/qedje.pc

Modified: krap/qedje/trunk/debian/rules
===================================================================
--- krap/qedje/trunk/debian/rules	2009-06-05 13:52:04 UTC (rev 14883)
+++ krap/qedje/trunk/debian/rules	2009-06-05 14:23:20 UTC (rev 14884)
@@ -1,25 +1,9 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/qmake.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/cmake.mk
 
-QMAKE := qmake-qt4
-DEB_QMAKE_ARGS += PREFIX=/usr
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-
-clean::
-	rm -rf debian/tmp
-	rm -f src/libqedje.prl
-	rm -rf src/pkgconfig/
-
 common-install-arch::
 # Fix wrong path in pkgconfig files
 	find $(DEB_DESTDIR)/usr/lib/pkgconfig -type f -name '*.pc' \
 		-exec perl -pi -e "s, -L$(CURDIR)/?\S+,,g" {} \;
-# Fix wrong path in prl files
-	find $(DEB_DESTDIR)/usr/lib -type f -name '*.prl' \
-		-exec perl -pi -e "s, -L$(CURDIR)/\S+,,g" {} \;
-	find $(DEB_DESTDIR)/usr/lib -type f -name '*.prl' \
-		-exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/" {} \;
-