rev 19028 - in kde-extras/skrooge/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Sat Dec 31 10:12:36 UTC 2011
Author: fabo
Date: 2011-12-31 10:12:36 +0000 (Sat, 31 Dec 2011)
New Revision: 19028
Added:
kde-extras/skrooge/trunk/debian/patches/
kde-extras/skrooge/trunk/debian/patches/BUG288683_arch-dependent-file-in-usr-share.patch
kde-extras/skrooge/trunk/debian/patches/series
Modified:
kde-extras/skrooge/trunk/debian/changelog
kde-extras/skrooge/trunk/debian/compat
kde-extras/skrooge/trunk/debian/control
kde-extras/skrooge/trunk/debian/skrooge-common.install
Log:
* Add BUG288683_arch-dependent-file-in-usr-share.patch from upstream.
* wrap and sort
* bump debian/compat to 8.
Modified: kde-extras/skrooge/trunk/debian/changelog
===================================================================
--- kde-extras/skrooge/trunk/debian/changelog 2011-12-31 09:52:10 UTC (rev 19027)
+++ kde-extras/skrooge/trunk/debian/changelog 2011-12-31 10:12:36 UTC (rev 19028)
@@ -1,15 +1,10 @@
skrooge (1.1.1-1) unstable; urgency=low
- * New Upstream Release
+ * New upstream release.
+ * Add BUG288683_arch-dependent-file-in-usr-share.patch from upstream.
- -- Mark Purcell <msp at debian.org> Mon, 28 Nov 2011 16:19:51 +1100
+ -- Fathi Boudra <fabo at debian.org> Sat, 31 Dec 2011 12:00:02 +0200
-skrooge (1.1.0-1) unstable; urgency=low
-
- * New upstream release
-
- -- Mark Purcell <msp at debian.org> Wed, 23 Nov 2011 20:26:56 +1100
-
skrooge (1.0.0-1) unstable; urgency=low
* New upstream release (LP: #869529)
Modified: kde-extras/skrooge/trunk/debian/compat
===================================================================
--- kde-extras/skrooge/trunk/debian/compat 2011-12-31 09:52:10 UTC (rev 19027)
+++ kde-extras/skrooge/trunk/debian/compat 2011-12-31 10:12:36 UTC (rev 19028)
@@ -1 +1 @@
-7
+8
Modified: kde-extras/skrooge/trunk/debian/control
===================================================================
--- kde-extras/skrooge/trunk/debian/control 2011-12-31 09:52:10 UTC (rev 19027)
+++ kde-extras/skrooge/trunk/debian/control 2011-12-31 10:12:36 UTC (rev 19028)
@@ -3,19 +3,29 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 7.4.15), cmake (>= 2.8.0), pkg-kde-tools (>= 0.9.0),
- kdelibs5-dev (>= 4:4.4.4), libofx-dev, libqca2-dev, libsqlite3-dev, libqtwebkit-dev,
- libgrantlee-dev,
- pkg-config, shared-mime-info
-Standards-Version: 3.8.4
+Build-Depends: cmake (>= 2.8.0),
+ debhelper (>= 7.4.15),
+ kdelibs5-dev (>= 4:4.4.4),
+ libgrantlee-dev,
+ libofx-dev,
+ libqca2-dev,
+ libqtwebkit-dev,
+ libsqlite3-dev,
+ pkg-config,
+ pkg-kde-tools (>= 0.9.0),
+ shared-mime-info
+Standards-Version: 3.9.2
Homepage: http://skrooge.org/
Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/skrooge/trunk
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-kde/kde-extras/skrooge/
Package: skrooge
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libqca2-plugin-ossl, libqt4-sql-sqlite, skrooge-common (= ${source:Version})
+Depends: libqca2-plugin-ossl,
+ libqt4-sql-sqlite,
+ skrooge-common (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: personal finance manager for KDE
Skrooge allows you to manage your personal finances. It is intended to be used
by individuals who want to keep track of their incomes, expenses and
@@ -38,7 +48,7 @@
Package: skrooge-common
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Skrooge architecture independent files
Skrooge allows you to manage your personal finances. It is intended to be used
by individuals who want to keep track of their incomes, expenses and
Added: kde-extras/skrooge/trunk/debian/patches/BUG288683_arch-dependent-file-in-usr-share.patch
===================================================================
--- kde-extras/skrooge/trunk/debian/patches/BUG288683_arch-dependent-file-in-usr-share.patch (rev 0)
+++ kde-extras/skrooge/trunk/debian/patches/BUG288683_arch-dependent-file-in-usr-share.patch 2011-12-31 10:12:36 UTC (rev 19028)
@@ -0,0 +1,37 @@
+commit 8eb59377b9742b3c0bbf6d1c66bc48cff7db0e6e
+Author: Stephane Mankowski <stephane at mankowski.fr>
+Date: Sun Dec 11 09:52:29 2011 +0100
+
+ BUG: 288683: E: skrooge-common: arch-dependent-file-in-usr-share usr/share/kde4/apps/skrooge/plugins/grantlee/0.2/grantlee_skroogefilters.so
+
+---
+ plugins/skrooge/skrooge_monthly/grantlee_filters/CMakeLists.txt | 4 ++--
+ plugins/skrooge/skrooge_monthly/skgmonthlypluginwidget.cpp | 4 ----
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+--- a/plugins/skrooge/skrooge_monthly/grantlee_filters/CMakeLists.txt
++++ b/plugins/skrooge/skrooge_monthly/grantlee_filters/CMakeLists.txt
+@@ -13,7 +13,7 @@ TARGET_LINK_LIBRARIES(grantlee_skroogefi
+
+ ########### install files ###############
+ IF(WIN32)
+- INSTALL(TARGETS grantlee_skroogefilters ARCHIVE DESTINATION ${DATA_INSTALL_DIR}/skrooge/plugins/grantlee/${Grantlee_VERSION_MAJOR}.${Grantlee_VERSION_MINOR} )
++ INSTALL(TARGETS grantlee_skroogefilters ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/grantlee/${Grantlee_VERSION_MAJOR}.${Grantlee_VERSION_MINOR} )
+ ELSE(WIN32)
+- INSTALL(TARGETS grantlee_skroogefilters LIBRARY DESTINATION ${DATA_INSTALL_DIR}/skrooge/plugins/grantlee/${Grantlee_VERSION_MAJOR}.${Grantlee_VERSION_MINOR} )
++ INSTALL(TARGETS grantlee_skroogefilters LIBRARY DESTINATION ${LIB_INSTALL_DIR}/grantlee/${Grantlee_VERSION_MAJOR}.${Grantlee_VERSION_MINOR} )
+ ENDIF(WIN32)
+\ No newline at end of file
+--- a/plugins/skrooge/skrooge_monthly/skgmonthlypluginwidget.cpp
++++ b/plugins/skrooge/skrooge_monthly/skgmonthlypluginwidget.cpp
+@@ -653,10 +653,6 @@ QString SKGMonthlyPluginWidget::getRepor
+
+ //Prepare grantlee engine
+ Grantlee::Engine gEngine(this);
+- QStringList kdeDataDirs = KGlobal::dirs()->findDirs("data", "skrooge/plugins/");
+- foreach(const QString & path, kdeDataDirs) {
+- gEngine.addPluginPath(path);
+- }
+ gEngine.addDefaultLibrary("grantlee_skroogefilters");
+
+ Grantlee::FileSystemTemplateLoader::Ptr gLoader = Grantlee::FileSystemTemplateLoader::Ptr(new Grantlee::FileSystemTemplateLoader());
Added: kde-extras/skrooge/trunk/debian/patches/series
===================================================================
--- kde-extras/skrooge/trunk/debian/patches/series (rev 0)
+++ kde-extras/skrooge/trunk/debian/patches/series 2011-12-31 10:12:36 UTC (rev 19028)
@@ -0,0 +1 @@
+BUG288683_arch-dependent-file-in-usr-share.patch
Modified: kde-extras/skrooge/trunk/debian/skrooge-common.install
===================================================================
--- kde-extras/skrooge/trunk/debian/skrooge-common.install 2011-12-31 09:52:10 UTC (rev 19027)
+++ kde-extras/skrooge/trunk/debian/skrooge-common.install 2011-12-31 10:12:36 UTC (rev 19028)
@@ -1,5 +1,5 @@
usr/share/doc/
+usr/share/icons/
usr/share/kde4/apps/
usr/share/kde4/config/
-usr/share/icons/
usr/share/locale/
More information about the pkg-kde-commits
mailing list