[Pkg-privacy-commits] [ricochet-im] 01/02: Rename desktop config file to avoid filename conflict

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository ricochet-im.

commit 5ae244d6feeaa7a355bc1426873e35dd0ca51454
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sun Oct 18 05:33:26 2015 +0200

    Rename desktop config file to avoid filename conflict
---
 debian/changelog                         |  7 +++++++
 debian/patches/rename-desktop-file.patch | 19 +++++++++++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  5 -----
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7ad3246..28e8bc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ricochet-im (1.1.1-2) UNRELEASED; urgency=medium
+
+  * Rename desktop config file to avoid conflict with ricochet package.
+    (Closes: #802096)
+
+ -- Ximin Luo <infinity0 at debian.org>  Sun, 18 Oct 2015 05:29:28 +0200
+
 ricochet-im (1.1.1-1) unstable; urgency=medium
 
   * Initial release. (Closes: #762430)
diff --git a/debian/patches/rename-desktop-file.patch b/debian/patches/rename-desktop-file.patch
new file mode 100644
index 0000000..6b26943
--- /dev/null
+++ b/debian/patches/rename-desktop-file.patch
@@ -0,0 +1,19 @@
+Description: Rename desktop config file to avoid naming conflict
+ The ricochet package already has ricochet.desktop
+Author: Ximin Luo <infinity0 at debian.org>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/ricochet.pro
++++ b/ricochet.pro
+@@ -54,7 +54,9 @@
+     unix:!macx {
+         target.path = /usr/bin
+         shortcut.path = /usr/share/applications
+-        shortcut.files = src/ricochet.desktop
++        system(cp -f src/ricochet.desktop src/ricochet-im.desktop)
++        QMAKE_CLEAN += src/ricochet-im.desktop
++        shortcut.files = src/ricochet-im.desktop
+         icon.path = /usr/share/icons/hicolor/48x48/apps/
+         icon.files = icons/ricochet.png
+         scalable_icon.path = /usr/share/icons/hicolor/scalable/apps/
diff --git a/debian/patches/series b/debian/patches/series
index 98840b8..611dcb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable-nonworking-flag.patch
+rename-desktop-file.patch
diff --git a/debian/rules b/debian/rules
index 31f432f..ab9cd62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,11 +27,6 @@ export QT_SELECT = qt5
 override_dh_auto_configure:
 	dh_auto_configure -- CONFIG+=release DEFINES+=RICOCHET_NO_PORTABLE
 
-override_dh_auto_test:
-	dh_auto_test
-#	find config.tests tests -name Makefile -print0 | \
-#	  xargs -r0 -n1 sh -c 'make -C "$$(dirname "$$1")" test' make
-
 override_dh_auto_clean:
 	dh_auto_clean
 	find config.tests tests -name Makefile -print0 | \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/ricochet-im.git