diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-07-10 03:01:31 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-07-10 03:02:00 +0200 |
| commit | 072cf6f0c854389f3304edb39ed8ea7987e16c63 (patch) | |
| tree | eb541d55886b112319fa80bc45be6d6c116c3620 | |
| parent | da06c0d91246b7e65e69b40356233ab9a941ea6f (diff) | |
| download | tde-packaging-072cf6f0c854389f3304edb39ed8ea7987e16c63.tar.gz tde-packaging-072cf6f0c854389f3304edb39ed8ea7987e16c63.zip | |
Fix basket mime magic file path on Debian and Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 3691b7f09c6fe434f1fedec711520e4b8dab37a0)
6 files changed, 6 insertions, 6 deletions
diff --git a/debian/lenny/applications/basket/debian/basket-trinity.install b/debian/lenny/applications/basket/debian/basket-trinity.install index 0a4f95868..e93c3f169 100644 --- a/debian/lenny/applications/basket/debian/basket-trinity.install +++ b/debian/lenny/applications/basket/debian/basket-trinity.install @@ -1,3 +1,4 @@ +etc/trinity/magic/basket.magic opt/trinity/share/applications/tde/basket.desktop opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_excelent.png opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_for_later.png @@ -118,7 +119,6 @@ opt/trinity/share/locale/cs/LC_MESSAGES/basket.mo opt/trinity/share/locale/nn/LC_MESSAGES/basket.mo opt/trinity/share/locale/it/LC_MESSAGES/basket.mo opt/trinity/share/locale/nl/LC_MESSAGES/basket.mo -opt/trinity/share/config/magic/basket.magic opt/trinity/share/doc/tde/HTML/en/basket/index.cache.bz2 opt/trinity/share/doc/tde/HTML/en/basket/index.docbook opt/trinity/bin/basket diff --git a/debian/lenny/applications/basket/debian/rules b/debian/lenny/applications/basket/debian/rules index 9513fe081..e28ee7171 100755 --- a/debian/lenny/applications/basket/debian/rules +++ b/debian/lenny/applications/basket/debian/rules @@ -39,7 +39,7 @@ config.status: post-patches cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -f admin/Makefile.common dist; - CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + CFLAGS="$(CFLAGS)" kde_confdir=/etc/trinity ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --with-qt-dir=/usr/share/qt3 \ --with-qt-includes=/usr/include/qt3 \ --with-qt-libraries=/usr/share/qt3/lib \ diff --git a/debian/squeeze/applications/basket/debian/basket-trinity.install b/debian/squeeze/applications/basket/debian/basket-trinity.install index 0a4f95868..e93c3f169 100644 --- a/debian/squeeze/applications/basket/debian/basket-trinity.install +++ b/debian/squeeze/applications/basket/debian/basket-trinity.install @@ -1,3 +1,4 @@ +etc/trinity/magic/basket.magic opt/trinity/share/applications/tde/basket.desktop opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_excelent.png opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_for_later.png @@ -118,7 +119,6 @@ opt/trinity/share/locale/cs/LC_MESSAGES/basket.mo opt/trinity/share/locale/nn/LC_MESSAGES/basket.mo opt/trinity/share/locale/it/LC_MESSAGES/basket.mo opt/trinity/share/locale/nl/LC_MESSAGES/basket.mo -opt/trinity/share/config/magic/basket.magic opt/trinity/share/doc/tde/HTML/en/basket/index.cache.bz2 opt/trinity/share/doc/tde/HTML/en/basket/index.docbook opt/trinity/bin/basket diff --git a/debian/squeeze/applications/basket/debian/rules b/debian/squeeze/applications/basket/debian/rules index f1e6a0465..910f14149 100755 --- a/debian/squeeze/applications/basket/debian/rules +++ b/debian/squeeze/applications/basket/debian/rules @@ -39,7 +39,7 @@ config.status: post-patches cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -f admin/Makefile.common dist; - CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + CFLAGS="$(CFLAGS)" kde_confdir=/etc/trinity ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --with-qt-dir=/usr/share/qt3 \ --with-qt-includes=/usr/include/qt3 \ --with-qt-libraries=/usr/share/qt3/lib \ diff --git a/ubuntu/maverick/applications/basket/debian/basket-trinity.install b/ubuntu/maverick/applications/basket/debian/basket-trinity.install index 0a4f95868..e93c3f169 100644 --- a/ubuntu/maverick/applications/basket/debian/basket-trinity.install +++ b/ubuntu/maverick/applications/basket/debian/basket-trinity.install @@ -1,3 +1,4 @@ +etc/trinity/magic/basket.magic opt/trinity/share/applications/tde/basket.desktop opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_excelent.png opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_for_later.png @@ -118,7 +119,6 @@ opt/trinity/share/locale/cs/LC_MESSAGES/basket.mo opt/trinity/share/locale/nn/LC_MESSAGES/basket.mo opt/trinity/share/locale/it/LC_MESSAGES/basket.mo opt/trinity/share/locale/nl/LC_MESSAGES/basket.mo -opt/trinity/share/config/magic/basket.magic opt/trinity/share/doc/tde/HTML/en/basket/index.cache.bz2 opt/trinity/share/doc/tde/HTML/en/basket/index.docbook opt/trinity/bin/basket diff --git a/ubuntu/maverick/applications/basket/debian/rules b/ubuntu/maverick/applications/basket/debian/rules index f1e6a0465..910f14149 100755 --- a/ubuntu/maverick/applications/basket/debian/rules +++ b/ubuntu/maverick/applications/basket/debian/rules @@ -39,7 +39,7 @@ config.status: post-patches cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -f admin/Makefile.common dist; - CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + CFLAGS="$(CFLAGS)" kde_confdir=/etc/trinity ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --with-qt-dir=/usr/share/qt3 \ --with-qt-includes=/usr/include/qt3 \ --with-qt-libraries=/usr/share/qt3/lib \ |