summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-01 13:38:19 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-01 13:38:19 -0400
commitaf6d5c5f2198858c08960b0948d30cb384b35687 (patch)
treebcf3a58b22d99b470f1b234fc99c0abfa468773d
parent693c12e020148c3154919a939f5aed3eaa223471 (diff)
move
-rw-r--r--Build/InstallDesktopFile.hs2
-rw-r--r--Makefile2
-rw-r--r--debian/copyright2
-rw-r--r--standalone/osx/git-annex.app/Contents/Info.plist (renamed from ui-macos/git-annex.app/Contents/Info.plist)0
-rwxr-xr-xstandalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp (renamed from ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp)0
-rwxr-xr-xstandalone/osx/git-annex.app/Contents/MacOS/runshell (renamed from ui-macos/git-annex.app/Contents/MacOS/runshell)0
-rw-r--r--standalone/osx/git-annex.app/Contents/Resources/git-annex.icns (renamed from ui-macos/git-annex.app/Contents/Resources/git-annex.icns)bin52194 -> 52194 bytes
7 files changed, 3 insertions, 3 deletions
diff --git a/Build/InstallDesktopFile.hs b/Build/InstallDesktopFile.hs
index d509c3313..f39237902 100644
--- a/Build/InstallDesktopFile.hs
+++ b/Build/InstallDesktopFile.hs
@@ -87,7 +87,7 @@ writeOSXDesktop command = do
installOSXAppFile :: FilePath -> FilePath -> Maybe String -> IO ()
installOSXAppFile appdir appfile mcontent = do
- let src = "ui-macos" </> appdir </> appfile
+ let src = "standalone" </> "macos" </> appdir </> appfile
home <- myHomeDir
dest <- ifM systemwideInstall
( return $ "/Applications" </> appdir </> appfile
diff --git a/Makefile b/Makefile
index 0a1093f81..5bd4401b6 100644
--- a/Makefile
+++ b/Makefile
@@ -177,7 +177,7 @@ OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS
osxapp: $(bins)
rm -rf "$(OSXAPP_DEST)"
install -d $(GIT_ANNEX_TMP_BUILD_DIR)/build-dmg
- cp -R ui-macos/git-annex.app "$(OSXAPP_DEST)"
+ cp -R standalone/osx/git-annex.app "$(OSXAPP_DEST)"
install -d "$(OSXAPP_BASE)/bin"
cp git-annex "$(OSXAPP_BASE)/bin/"
diff --git a/debian/copyright b/debian/copyright
index 499243041..48df4854a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ Files: Assistant/WebApp.hs Assistant/WebApp/* templates/* static/*
Copyright: © 2012 Joey Hess <joey@kitenet.net>
License: AGPL-3+
-Files: doc/logo* */favicon.ico ui-macos/git-annex.app/Contents/Resources/git-annex.icns
+Files: doc/logo* */favicon.ico standalone/osx/git-annex.app/Contents/Resources/git-annex.icns
Copyright: 2007 Henrik Nyh <http://henrik.nyh.se/>
2010 Joey Hess <joey@kitenet.net>
License: other
diff --git a/ui-macos/git-annex.app/Contents/Info.plist b/standalone/osx/git-annex.app/Contents/Info.plist
index ced9948da..ced9948da 100644
--- a/ui-macos/git-annex.app/Contents/Info.plist
+++ b/standalone/osx/git-annex.app/Contents/Info.plist
diff --git a/ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp b/standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp
index 61a9bbbeb..61a9bbbeb 100755
--- a/ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp
+++ b/standalone/osx/git-annex.app/Contents/MacOS/git-annex-webapp
diff --git a/ui-macos/git-annex.app/Contents/MacOS/runshell b/standalone/osx/git-annex.app/Contents/MacOS/runshell
index 870c292eb..870c292eb 100755
--- a/ui-macos/git-annex.app/Contents/MacOS/runshell
+++ b/standalone/osx/git-annex.app/Contents/MacOS/runshell
diff --git a/ui-macos/git-annex.app/Contents/Resources/git-annex.icns b/standalone/osx/git-annex.app/Contents/Resources/git-annex.icns
index d8d36585f..d8d36585f 100644
--- a/ui-macos/git-annex.app/Contents/Resources/git-annex.icns
+++ b/standalone/osx/git-annex.app/Contents/Resources/git-annex.icns
Binary files differ