From aa341bc5edcf7a316b15dc9466474c58e36d88ed Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Mon, 24 Oct 2011 13:11:40 -0400 Subject: [PATCH] Debian packaging: /usr/local/share --> /usr/share --- debian_me/dupeguru_me.desktop | 2 +- debian_me/rules | 4 ++-- debian_pe/dupeguru_pe.desktop | 2 +- debian_pe/rules | 4 ++-- debian_se/dupeguru_se.desktop | 2 +- debian_se/rules | 4 ++-- qt/base/platform_lnx.py | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/debian_me/dupeguru_me.desktop b/debian_me/dupeguru_me.desktop index 91d64f4a..8afab61b 100644 --- a/debian_me/dupeguru_me.desktop +++ b/debian_me/dupeguru_me.desktop @@ -2,7 +2,7 @@ Name=dupeGuru Music Edition Comment=Find duplicate songs in your collection. Exec=dupeguru_me -Icon=/usr/local/share/dupeguru_me/dgme_logo_128.png +Icon=/usr/share/dupeguru_me/dgme_logo_128.png Terminal=false Type=Application Categories=Utility; diff --git a/debian_me/rules b/debian_me/rules index 96cc8022..125949d2 100755 --- a/debian_me/rules +++ b/debian_me/rules @@ -42,9 +42,9 @@ install: build dh_installdirs chmod +x src/run.py - cp -R src/ $(CURDIR)/debian/dupeguru-me/usr/local/share/dupeguru_me + cp -R src/ $(CURDIR)/debian/dupeguru-me/usr/share/dupeguru_me cp $(CURDIR)/debian/dupeguru_me.desktop $(CURDIR)/debian/dupeguru-me/usr/share/applications - ln -s /usr/local/share/dupeguru_me/run.py $(CURDIR)/debian/dupeguru-me/usr/local/bin/dupeguru_me + ln -s /usr/share/dupeguru_me/run.py $(CURDIR)/debian/dupeguru-me/usr/bin/dupeguru_me # Build architecture-independent files here. diff --git a/debian_pe/dupeguru_pe.desktop b/debian_pe/dupeguru_pe.desktop index 8086c84a..50310959 100644 --- a/debian_pe/dupeguru_pe.desktop +++ b/debian_pe/dupeguru_pe.desktop @@ -2,7 +2,7 @@ Name=dupeGuru Picture Edition Comment=Find duplicate pictures in your library. Exec=dupeguru_pe -Icon=/usr/local/share/dupeguru_pe/dgpe_logo_128.png +Icon=/usr/share/dupeguru_pe/dgpe_logo_128.png Terminal=false Type=Application Categories=Utility; diff --git a/debian_pe/rules b/debian_pe/rules index f452fed8..4e0b6a48 100755 --- a/debian_pe/rules +++ b/debian_pe/rules @@ -42,9 +42,9 @@ install: build dh_installdirs chmod +x src/run.py - cp -R src/ $(CURDIR)/debian/dupeguru-pe/usr/local/share/dupeguru_pe + cp -R src/ $(CURDIR)/debian/dupeguru-pe/usr/share/dupeguru_pe cp $(CURDIR)/debian/dupeguru_pe.desktop $(CURDIR)/debian/dupeguru-pe/usr/share/applications - ln -s /usr/local/share/dupeguru_pe/run.py $(CURDIR)/debian/dupeguru-pe/usr/local/bin/dupeguru_pe + ln -s /usr/share/dupeguru_pe/run.py $(CURDIR)/debian/dupeguru-pe/usr/bin/dupeguru_pe # Build architecture-independent files here. diff --git a/debian_se/dupeguru_se.desktop b/debian_se/dupeguru_se.desktop index 9521b8bc..13f74650 100644 --- a/debian_se/dupeguru_se.desktop +++ b/debian_se/dupeguru_se.desktop @@ -2,7 +2,7 @@ Name=dupeGuru Comment=Find duplicate files. Exec=dupeguru_se -Icon=/usr/local/share/dupeguru_se/dgse_logo_128.png +Icon=/usr/share/dupeguru_se/dgse_logo_128.png Terminal=false Type=Application Categories=Utility; diff --git a/debian_se/rules b/debian_se/rules index 1b6fc4af..c6a5c7b5 100755 --- a/debian_se/rules +++ b/debian_se/rules @@ -42,9 +42,9 @@ install: build dh_installdirs chmod +x src/run.py - cp -R src/ $(CURDIR)/debian/dupeguru-se/usr/local/share/dupeguru_se + cp -R src/ $(CURDIR)/debian/dupeguru-se/usr/share/dupeguru_se cp $(CURDIR)/debian/dupeguru_se.desktop $(CURDIR)/debian/dupeguru-se/usr/share/applications - ln -s /usr/local/share/dupeguru_se/run.py $(CURDIR)/debian/dupeguru-se/usr/local/bin/dupeguru_se + ln -s /usr/share/dupeguru_se/run.py $(CURDIR)/debian/dupeguru-se/usr/bin/dupeguru_se # Build architecture-independent files here. diff --git a/qt/base/platform_lnx.py b/qt/base/platform_lnx.py index 7ce4167a..e3e54d6d 100644 --- a/qt/base/platform_lnx.py +++ b/qt/base/platform_lnx.py @@ -8,4 +8,4 @@ # http://www.hardcoded.net/licenses/bsd_license INITIAL_FOLDER_IN_DIALOGS = '/' -HELP_PATH = '/usr/local/share/dupeguru_{0}/help' +HELP_PATH = '/usr/share/dupeguru_{0}/help'