Permalink
Browse files

Fix files conflict with gnome-dropbox.

  • Loading branch information...
1 parent 30332d7 commit 0f59e97468dae7ddf1a389281d488e6972c273c9 hillwood committed Feb 18, 2013
View
@@ -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
View
@@ -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
@@ -4,6 +4,6 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
EXTRA_DIST = $(icons_DATA)
@@ -4,6 +4,6 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
EXTRA_DIST = $(icons_DATA)
@@ -4,6 +4,6 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
EXTRA_DIST = $(icons_DATA)
@@ -4,6 +4,6 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
EXTRA_DIST = $(icons_DATA)
@@ -4,6 +4,6 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
EXTRA_DIST = $(icons_DATA)
@@ -4,6 +4,6 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
EXTRA_DIST = $(icons_DATA)
@@ -4,6 +4,6 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
EXTRA_DIST = $(icons_DATA)
View
@@ -3,7 +3,7 @@
# heeeheee
env = {"__name__":"__notmain__"}
-execfile("dropbox", env)
+execfile("caja-dropbox", env)
commands = env["commands"]
f = open("AUTHORS", "r")

0 comments on commit 0f59e97

Please sign in to comment.