diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-27 13:20:16 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-27 13:20:16 +0900 |
| commit | 229e7f5038cbc5f930ab50abfad3099919a4e8bb (patch) | |
| tree | 569abf2cbc4bd05a0b90ed759ccd941eaa676c01 /ubuntu/maverick/applications/kmymoney | |
| parent | 59f50d7552dacb6d27d0768a9a5320e5ba2fc23d (diff) | |
| parent | 50c481625fcb2361e0aaae71df24a40cbad056d7 (diff) | |
| download | tde-packaging-229e7f5038cbc5f930ab50abfad3099919a4e8bb.tar.gz tde-packaging-229e7f5038cbc5f930ab50abfad3099919a4e8bb.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/kmymoney')
4 files changed, 7 insertions, 7 deletions
diff --git a/ubuntu/maverick/applications/kmymoney/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kmymoney/debian/cdbs/versions.pl index 75c9add4b..1b110f7af 100644 --- a/ubuntu/maverick/applications/kmymoney/debian/cdbs/versions.pl +++ b/ubuntu/maverick/applications/kmymoney/debian/cdbs/versions.pl @@ -13,7 +13,7 @@ my ($version2, $version2_next); ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; -print "KDE-Version3=$version3\n"; -print "KDE-Version2=$version2\n"; -print "KDE-Next-Version3=$version3_next\n"; -print "KDE-Next-Version2=$version2_next\n"; +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/maverick/applications/kmymoney/debian/control b/ubuntu/maverick/applications/kmymoney/debian/control index f37e2d60c..a5b377041 100644 --- a/ubuntu/maverick/applications/kmymoney/debian/control +++ b/ubuntu/maverick/applications/kmymoney/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, chrpath, automake, libtool, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, recode, html2ps +Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, chrpath, automake, libtool, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3, recode, html2ps Standards-Version: 3.8.4 Package: kmymoney2-trinity diff --git a/ubuntu/maverick/applications/kmymoney/debian/menu b/ubuntu/maverick/applications/kmymoney/debian/menu index e30e26de9..fe92fdaa3 100644 --- a/ubuntu/maverick/applications/kmymoney/debian/menu +++ b/ubuntu/maverick/applications/kmymoney/debian/menu @@ -1,4 +1,4 @@ -?package(kmymoney2):\ +?package(kmymoney2-trinity):\ needs="x11"\ section="Applications/Office"\ hints="TDE"\ diff --git a/ubuntu/maverick/applications/kmymoney/debian/rules b/ubuntu/maverick/applications/kmymoney/debian/rules index 21ddfdb13..c80d64532 100755 --- a/ubuntu/maverick/applications/kmymoney/debian/rules +++ b/ubuntu/maverick/applications/kmymoney/debian/rules @@ -11,7 +11,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde --disable-sqlite3 --disable-pdf-docs +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include --disable-pdf-docs DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) |