diff -Nru qdigidoc-0.4.0/debian/changelog qdigidoc-0.4.0/debian/changelog --- qdigidoc-0.4.0/debian/changelog 2012-03-11 09:59:55.000000000 +0000 +++ qdigidoc-0.4.0/debian/changelog 2012-03-28 16:18:44.000000000 +0000 @@ -1,3 +1,15 @@ +qdigidoc (0.4.0-0ubuntu4) precise; urgency=low + + * Fixed the Nautilus plug-in: + = 01_nautilus-newversion.patch: updated with correct install dir. + = debian/nautilus-qdigidoc.install: updated with correct install dir. + - 02_nautilus_cmake.patch: deleted. + - debian/rules: removed nautilus-qdigidoc post-install mingling. + - debian/rules: removed DEB_DESTDIR. + + debian/qdigidoc.install: created. + + -- Martin-Éric Racine Wed, 28 Mar 2012 19:18:05 +0300 + qdigidoc (0.4.0-0ubuntu3) precise; urgency=low * debian/rules: diff -Nru qdigidoc-0.4.0/debian/nautilus-qdigidoc.install qdigidoc-0.4.0/debian/nautilus-qdigidoc.install --- qdigidoc-0.4.0/debian/nautilus-qdigidoc.install 2012-01-13 11:08:49.000000000 +0000 +++ qdigidoc-0.4.0/debian/nautilus-qdigidoc.install 2012-03-28 16:01:51.000000000 +0000 @@ -1 +1,2 @@ -client/nautilus/nautilus-qdigidoc.py usr/share/nautilus-python/extensions +usr/share/locale +usr/share/nautilus-python diff -Nru qdigidoc-0.4.0/debian/patches/01_nautilus-newversion.patch qdigidoc-0.4.0/debian/patches/01_nautilus-newversion.patch --- qdigidoc-0.4.0/debian/patches/01_nautilus-newversion.patch 2012-01-13 11:17:44.000000000 +0000 +++ qdigidoc-0.4.0/debian/patches/01_nautilus-newversion.patch 2012-03-28 15:43:31.000000000 +0000 @@ -44,3 +44,11 @@ item.set_property('icon', 'qdigidoc-client') item.connect('activate', self.menu_activate_cb, paths) +--- qdigidoc-0.4.0/client/nautilus/CMakeLists.txt ++++ qdigidoc-0.4.0/client/nautilus/CMakeLists.txt +@@ -6,4 +6,4 @@ find_package(Gettext) + file(GLOB PO_FILES po/*.po) + gettext_create_translations(po/nautilus-qdigidoc.pot ALL ${PO_FILES}) + +-install(FILES nautilus-qdigidoc.py DESTINATION ${LIB_INSTALL_DIR}/nautilus/extensions-2.0/python/) ++install(FILES nautilus-qdigidoc.py DESTINATION ${SHARE_INSTALL_PREFIX}/nautilus-python/extensions/) diff -Nru qdigidoc-0.4.0/debian/patches/02_nautilus_cmake.patch qdigidoc-0.4.0/debian/patches/02_nautilus_cmake.patch --- qdigidoc-0.4.0/debian/patches/02_nautilus_cmake.patch 2012-01-13 11:35:08.000000000 +0000 +++ qdigidoc-0.4.0/debian/patches/02_nautilus_cmake.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Description: disables installing nautilus-qdigidoc and translations from cmake -Author: Guido Tabbernuk ---- qdigidoc-0.4.0.orig/client/CMakeLists.txt -+++ qdigidoc-0.4.0/client/CMakeLists.txt -@@ -165,7 +165,7 @@ if (ENABLE_KDE) - add_subdirectory(kde) - endif() - --option(ENABLE_NAUTILUS_EXTENSION "Install Nautilus extension (default: TRUE)" TRUE) -+option(ENABLE_NAUTILUS_EXTENSION "Install Nautilus extension (default: FALSE)" FALSE) - if (ENABLE_NAUTILUS_EXTENSION) - add_subdirectory(nautilus) - endif() diff -Nru qdigidoc-0.4.0/debian/patches/03_desktop_strip_encoding_key.patch qdigidoc-0.4.0/debian/patches/03_desktop_strip_encoding_key.patch --- qdigidoc-0.4.0/debian/patches/03_desktop_strip_encoding_key.patch 1970-01-01 00:00:00.000000000 +0000 +++ qdigidoc-0.4.0/debian/patches/03_desktop_strip_encoding_key.patch 2012-01-14 04:10:09.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Remove the UTF-8 encoding key since Lintian reports it as deprecated. +Author: Martin-Éric Racine +--- qdigidoc-0.4.0.orig/crypto/qdigidoc-crypto.desktop ++++ qdigidoc-0.4.0/crypto/qdigidoc-crypto.desktop +@@ -1,5 +1,4 @@ + [Desktop Entry] +-Encoding=UTF-8 + Type=Application + + Exec=qdigidoccrypto %F +--- qdigidoc-0.4.0.orig/client/qdigidoc-client.desktop ++++ qdigidoc-0.4.0/client/qdigidoc-client.desktop +@@ -1,5 +1,4 @@ + [Desktop Entry] +-Encoding=UTF-8 + Type=Application + + Exec=qdigidocclient %F +--- qdigidoc-0.4.0.orig/client/kde/qdigidoc-signer.desktop ++++ qdigidoc-0.4.0/client/kde/qdigidoc-signer.desktop +@@ -1,7 +1,6 @@ + [Desktop Entry] + X-KDE-ServiceTypes=KonqPopupMenu/Plugin,all/allfiles + Actions=sign; +-Encoding=UTF-8 + Type=Service + X-KDE-Priority=TopLevel + X-KDE-PluginInfo-Name=digidoc-signer diff -Nru qdigidoc-0.4.0/debian/patches/03_desktop_strip_encondig_key.patch qdigidoc-0.4.0/debian/patches/03_desktop_strip_encondig_key.patch --- qdigidoc-0.4.0/debian/patches/03_desktop_strip_encondig_key.patch 2012-01-14 04:10:09.000000000 +0000 +++ qdigidoc-0.4.0/debian/patches/03_desktop_strip_encondig_key.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -Description: Remove the UTF-8 encoding key since Lintian reports it as deprecated. -Author: Martin-Éric Racine ---- qdigidoc-0.4.0.orig/crypto/qdigidoc-crypto.desktop -+++ qdigidoc-0.4.0/crypto/qdigidoc-crypto.desktop -@@ -1,5 +1,4 @@ - [Desktop Entry] --Encoding=UTF-8 - Type=Application - - Exec=qdigidoccrypto %F ---- qdigidoc-0.4.0.orig/client/qdigidoc-client.desktop -+++ qdigidoc-0.4.0/client/qdigidoc-client.desktop -@@ -1,5 +1,4 @@ - [Desktop Entry] --Encoding=UTF-8 - Type=Application - - Exec=qdigidocclient %F ---- qdigidoc-0.4.0.orig/client/kde/qdigidoc-signer.desktop -+++ qdigidoc-0.4.0/client/kde/qdigidoc-signer.desktop -@@ -1,7 +1,6 @@ - [Desktop Entry] - X-KDE-ServiceTypes=KonqPopupMenu/Plugin,all/allfiles - Actions=sign; --Encoding=UTF-8 - Type=Service - X-KDE-Priority=TopLevel - X-KDE-PluginInfo-Name=digidoc-signer diff -Nru qdigidoc-0.4.0/debian/patches/series qdigidoc-0.4.0/debian/patches/series --- qdigidoc-0.4.0/debian/patches/series 2012-01-14 04:28:23.000000000 +0000 +++ qdigidoc-0.4.0/debian/patches/series 2012-03-28 15:48:32.000000000 +0000 @@ -1,4 +1,3 @@ 01_nautilus-newversion.patch -02_nautilus_cmake.patch -03_desktop_strip_encondig_key.patch +03_desktop_strip_encoding_key.patch 04_typo_fixes.patch diff -Nru qdigidoc-0.4.0/debian/qdigidoc.install qdigidoc-0.4.0/debian/qdigidoc.install --- qdigidoc-0.4.0/debian/qdigidoc.install 1970-01-01 00:00:00.000000000 +0000 +++ qdigidoc-0.4.0/debian/qdigidoc.install 2012-03-28 15:15:33.000000000 +0000 @@ -0,0 +1,5 @@ +usr/bin +usr/share/applications +usr/share/icons +usr/share/kde4 +usr/share/mime diff -Nru qdigidoc-0.4.0/debian/rules qdigidoc-0.4.0/debian/rules --- qdigidoc-0.4.0/debian/rules 2012-03-11 09:59:10.000000000 +0000 +++ qdigidoc-0.4.0/debian/rules 2012-03-28 15:30:16.000000000 +0000 @@ -4,7 +4,7 @@ # COPYRIGHT © 2012 Guido Tabbernuk # # LICENSE -# This library is free software; you can redistribute it and/or +# This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either # version 2.1 of the License, or (at your option) any later version. @@ -13,15 +13,10 @@ include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/cmake.mk -DEB_DESTDIR := $(CURDIR)/debian/qdigidoc - binary-install/qdigidoc:: dh_installmime -pqdigidoc dh_icons -pqdigidoc -binary-install/nautilus-qdigidoc:: - for file in $$(cd client/nautilus/po; ls *.po; cd ..); do echo debian/nautilus-qdigidoc/usr/share/locale/$${file%.po}/LC_MESSAGES; mkdir -p debian/nautilus-qdigidoc/usr/share/locale/$${file%.po}/LC_MESSAGES; msgfmt -f -o debian/nautilus-qdigidoc/usr/share/locale/$${file%.po}/LC_MESSAGES/nautilus-qdigidoc.mo client/nautilus/po/$$file; done - -common-binary-post-install-arch common-binary-post-install-indep:: list-missing +common-binary-post-install-arch:: list-missing #EOF