From 0f59e97468dae7ddf1a389281d488e6972c273c9 Mon Sep 17 00:00:00 2001
From: hillwood <hillwood@hillwood-opensuse.(none)>
Date: Tue, 19 Feb 2013 00:18:25 +0800
Subject: Fix files conflict with gnome-dropbox.

---
 Makefile.am                                 | 20 ++++++++++----------
 data/dropbox.desktop                        |  4 ++--
 data/icons/hicolor/16x16/apps/Makefile.am   |  2 +-
 data/icons/hicolor/22x22/apps/Makefile.am   |  2 +-
 data/icons/hicolor/24x24/apps/Makefile.am   |  2 +-
 data/icons/hicolor/256x256/apps/Makefile.am |  2 +-
 data/icons/hicolor/32x32/apps/Makefile.am   |  2 +-
 data/icons/hicolor/48x48/apps/Makefile.am   |  2 +-
 data/icons/hicolor/64x64/apps/Makefile.am   |  2 +-
 docgen.py                                   |  2 +-
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index bd79291..7f72814 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,16 @@
 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 
-bin_SCRIPTS = dropbox
-CLEANFILES = $(bin_SCRIPTS) dropbox.1 dropbox.txt
-EXTRA_DIST = dropbox.in serializeimages.py dropbox.txt.in docgen.py rst2man.py
-man_MANS = dropbox.1
+bin_SCRIPTS = caja-dropbox
+CLEANFILES = $(bin_SCRIPTS) caja-dropbox.1 caja-dropbox.txt
+EXTRA_DIST = caja-dropbox.in serializeimages.py caja-dropbox.txt.in docgen.py rst2man.py
+man_MANS = caja-dropbox.1
 
-dropbox: dropbox.in serializeimages.py
-	python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox
-	chmod +x dropbox
+caja-dropbox: caja-dropbox.in serializeimages.py
+	python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < caja-dropbox.in > caja-dropbox
+	chmod +x caja-dropbox
 
-dropbox.1: dropbox.txt.in dropbox docgen.py
-	python docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt
-	$(RST2MAN) dropbox.txt > dropbox.1
+caja-dropbox.1: caja-dropbox.txt.in caja-dropbox docgen.py
+	python docgen.py $(PACKAGE_VERSION) < caja-dropbox.txt.in > caja-dropbox.txt
+	$(RST2MAN) caja-dropbox.txt > caja-dropbox.1
 
 SUBDIRS = data src
diff --git a/data/dropbox.desktop b/data/dropbox.desktop
index 7dbc95d..7ad5369 100644
--- a/data/dropbox.desktop
+++ b/data/dropbox.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Name=Dropbox
+Name=caja-Dropbox
 GenericName=File Synchronizer
 Comment=Sync your files across computers and to the web
 Exec=dropbox start -i
 Terminal=false
 Type=Application
-Icon=dropbox
+Icon=caja-dropbox
 Categories=Network;FileTransfer;
 StartupNotify=false
diff --git a/data/icons/hicolor/16x16/apps/Makefile.am b/data/icons/hicolor/16x16/apps/Makefile.am
index 1412ea3..b2ec0da 100644
--- a/data/icons/hicolor/16x16/apps/Makefile.am
+++ b/data/icons/hicolor/16x16/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/22x22/apps/Makefile.am b/data/icons/hicolor/22x22/apps/Makefile.am
index 161ccc5..e6a228f 100644
--- a/data/icons/hicolor/22x22/apps/Makefile.am
+++ b/data/icons/hicolor/22x22/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/24x24/apps/Makefile.am b/data/icons/hicolor/24x24/apps/Makefile.am
index 6dc45f5..d782f02 100644
--- a/data/icons/hicolor/24x24/apps/Makefile.am
+++ b/data/icons/hicolor/24x24/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/256x256/apps/Makefile.am b/data/icons/hicolor/256x256/apps/Makefile.am
index ae589f9..4f4c6f3 100644
--- a/data/icons/hicolor/256x256/apps/Makefile.am
+++ b/data/icons/hicolor/256x256/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/32x32/apps/Makefile.am b/data/icons/hicolor/32x32/apps/Makefile.am
index ab29e83..30e0537 100644
--- a/data/icons/hicolor/32x32/apps/Makefile.am
+++ b/data/icons/hicolor/32x32/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/48x48/apps/Makefile.am b/data/icons/hicolor/48x48/apps/Makefile.am
index 9b99f8e..0348cbe 100644
--- a/data/icons/hicolor/48x48/apps/Makefile.am
+++ b/data/icons/hicolor/48x48/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/64x64/apps/Makefile.am b/data/icons/hicolor/64x64/apps/Makefile.am
index eba2531..dc95b97 100644
--- a/data/icons/hicolor/64x64/apps/Makefile.am
+++ b/data/icons/hicolor/64x64/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/docgen.py b/docgen.py
index a2a3912..2ed8ad9 100644
--- a/docgen.py
+++ b/docgen.py
@@ -3,7 +3,7 @@ import datetime
 
 # heeeheee
 env = {"__name__":"__notmain__"}
-execfile("dropbox", env)
+execfile("caja-dropbox", env)
 commands = env["commands"]
 
 f = open("AUTHORS", "r")
-- 
cgit v1.2.1