diff options
author | Jani Välimaa <wally@mageia.org> | 2014-12-26 14:02:45 +0200 |
---|---|---|
committer | Jani Välimaa <wally@mageia.org> | 2014-12-26 14:02:45 +0200 |
commit | c74573439b353a26305688c33391513bbcfb03dd (patch) | |
tree | b84d07174cfc44b3f50dcdea5215744b98e8af73 | |
parent | 720ea4a23a3c91f5cda701435c06d489028ef7b9 (diff) | |
download | config-c74573439b353a26305688c33391513bbcfb03dd.tar config-c74573439b353a26305688c33391513bbcfb03dd.tar.gz config-c74573439b353a26305688c33391513bbcfb03dd.tar.bz2 config-c74573439b353a26305688c33391513bbcfb03dd.tar.xz config-c74573439b353a26305688c33391513bbcfb03dd.zip |
Move app launchers to a separate dir
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | data/Makefile.am | 36 | ||||
-rw-r--r-- | launchers/Makefile.am | 35 | ||||
-rw-r--r-- | launchers/file-manager.desktop.in (renamed from data/xfce4/panel/launcher-6/file-manager.desktop.in) | 0 | ||||
-rw-r--r-- | launchers/mcc.desktop.in (renamed from data/xfce4/panel/launcher-9/mcc.desktop.in) | 0 | ||||
-rw-r--r-- | launchers/terminal-emulator.desktop.in (renamed from data/xfce4/panel/launcher-4/terminal-emulator.desktop.in) | 0 | ||||
-rw-r--r-- | launchers/text-editor.desktop.in (renamed from data/xfce4/panel/launcher-5/text-editor.desktop.in) | 0 | ||||
-rw-r--r-- | launchers/web-browser.desktop.in (renamed from data/xfce4/panel/launcher-8/web-browser.desktop.in) | 0 | ||||
-rw-r--r-- | po/POTFILES.in | 10 | ||||
-rw-r--r-- | po/mageia-xfce-config.pot | 22 |
11 files changed, 53 insertions, 54 deletions
diff --git a/Makefile.am b/Makefile.am index 37a8125..3a44ee7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = data +SUBDIRS = data launchers po EXTRA_DIST = \ AUTHORS \ diff --git a/configure.ac b/configure.ac index 1aa6522..de0f8d1 100644 --- a/configure.ac +++ b/configure.ac @@ -18,5 +18,5 @@ AC_PROG_MKDIR_P # Checks for library functions. -AC_CONFIG_FILES([Makefile data/Makefile po/Makefile.in]) +AC_CONFIG_FILES([Makefile data/Makefile launchers/Makefile po/Makefile.in]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am index 8f6fdb8..a6e4294 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -27,39 +27,3 @@ nobase_dist_xfce_DATA = \ xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml \ xfce4/xfconf/xfce-perchannel-xml/xsettings.xml \ xfce4/Xft.xrdb - -terminaldir = $(xfcedir)/xfce4/panel/launcher-4 -terminal_in_files = xfce4/panel/launcher-4/terminal-emulator.desktop.in -terminal_DATA = $(terminal_in_files:.desktop.in=.desktop) - -textdir = $(xfcedir)/xfce4/panel/launcher-5 -text_in_files = xfce4/panel/launcher-5/text-editor.desktop.in -text_DATA = $(text_in_files:.desktop.in=.desktop) - -filedir = $(xfcedir)/xfce4/panel/launcher-6 -file_in_files = xfce4/panel/launcher-6/file-manager.desktop.in -file_DATA = $(file_in_files:.desktop.in=.desktop) - -webdir = $(xfcedir)/xfce4/panel/launcher-8 -web_in_files = xfce4/panel/launcher-8/web-browser.desktop.in -web_DATA = $(web_in_files:.desktop.in=.desktop) - -mccdir = $(xfcedir)/xfce4/panel/launcher-9 -mcc_in_files = xfce4/panel/launcher-9/mcc.desktop.in -mcc_DATA = $(mcc_in_files:.desktop.in=.desktop) - -@INTLTOOL_DESKTOP_RULE@ - -CLEANFILES = \ - $(terminal_DATA) \ - $(text_DATA) \ - $(file_DATA) \ - $(web_DATA) \ - $(mcc_DATA) - -EXTRA_DIST = \ - $(terminal_in_files) \ - $(text_in_files) \ - $(file_in_files) \ - $(web_in_files) \ - $(mcc_in_files) diff --git a/launchers/Makefile.am b/launchers/Makefile.am new file mode 100644 index 0000000..1df7059 --- /dev/null +++ b/launchers/Makefile.am @@ -0,0 +1,35 @@ +terminaldir = $(sysconfdir)/xdg/xfce4/panel/launcher-4 +terminal_in_files = terminal-emulator.desktop.in +terminal_DATA = $(terminal_in_files:.desktop.in=.desktop) + +textdir = $(sysconfdir)/xdg/xfce4/panel/launcher-5 +text_in_files = text-editor.desktop.in +text_DATA = $(text_in_files:.desktop.in=.desktop) + +filedir = $(sysconfdir)/xdg/xfce4/panel/launcher-6 +file_in_files = file-manager.desktop.in +file_DATA = $(file_in_files:.desktop.in=.desktop) + +webdir = $(sysconfdir)/xdg/xfce4/panel/launcher-8 +web_in_files = web-browser.desktop.in +web_DATA = $(web_in_files:.desktop.in=.desktop) + +mccdir = $(sysconfdir)/xdg/xfce4/panel/launcher-9 +mcc_in_files = mcc.desktop.in +mcc_DATA = $(mcc_in_files:.desktop.in=.desktop) + +@INTLTOOL_DESKTOP_RULE@ + +CLEANFILES = \ + $(terminal_DATA) \ + $(text_DATA) \ + $(file_DATA) \ + $(web_DATA) \ + $(mcc_DATA) + +EXTRA_DIST = \ + $(terminal_in_files) \ + $(text_in_files) \ + $(file_in_files) \ + $(web_in_files) \ + $(mcc_in_files) diff --git a/data/xfce4/panel/launcher-6/file-manager.desktop.in b/launchers/file-manager.desktop.in index e6c926b..e6c926b 100644 --- a/data/xfce4/panel/launcher-6/file-manager.desktop.in +++ b/launchers/file-manager.desktop.in diff --git a/data/xfce4/panel/launcher-9/mcc.desktop.in b/launchers/mcc.desktop.in index 8c4b06e..8c4b06e 100644 --- a/data/xfce4/panel/launcher-9/mcc.desktop.in +++ b/launchers/mcc.desktop.in diff --git a/data/xfce4/panel/launcher-4/terminal-emulator.desktop.in b/launchers/terminal-emulator.desktop.in index 7955529..7955529 100644 --- a/data/xfce4/panel/launcher-4/terminal-emulator.desktop.in +++ b/launchers/terminal-emulator.desktop.in diff --git a/data/xfce4/panel/launcher-5/text-editor.desktop.in b/launchers/text-editor.desktop.in index 92e8282..92e8282 100644 --- a/data/xfce4/panel/launcher-5/text-editor.desktop.in +++ b/launchers/text-editor.desktop.in diff --git a/data/xfce4/panel/launcher-8/web-browser.desktop.in b/launchers/web-browser.desktop.in index 3c1d300..3c1d300 100644 --- a/data/xfce4/panel/launcher-8/web-browser.desktop.in +++ b/launchers/web-browser.desktop.in diff --git a/po/POTFILES.in b/po/POTFILES.in index e018e19..4343e9f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,5 @@ -data/xfce4/panel/launcher-6/file-manager.desktop.in -data/xfce4/panel/launcher-5/text-editor.desktop.in -data/xfce4/panel/launcher-9/mcc.desktop.in -data/xfce4/panel/launcher-4/terminal-emulator.desktop.in -data/xfce4/panel/launcher-8/web-browser.desktop.in +launchers/file-manager.desktop.in +launchers/text-editor.desktop.in +launchers/mcc.desktop.in +launchers/terminal-emulator.desktop.in +launchers/web-browser.desktop.in diff --git a/po/mageia-xfce-config.pot b/po/mageia-xfce-config.pot index 1ee2747..900a8b6 100644 --- a/po/mageia-xfce-config.pot +++ b/po/mageia-xfce-config.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-26 10:51+0200\n" +"POT-Creation-Date: 2014-12-26 13:57+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,42 +17,42 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../data/xfce4/panel/launcher-6/file-manager.desktop.in.h:1 +#: ../launchers/file-manager.desktop.in.h:1 msgid "File Manager" msgstr "" -#: ../data/xfce4/panel/launcher-6/file-manager.desktop.in.h:2 +#: ../launchers/file-manager.desktop.in.h:2 msgid "Browse the file system" msgstr "" -#: ../data/xfce4/panel/launcher-5/text-editor.desktop.in.h:1 +#: ../launchers/text-editor.desktop.in.h:1 msgid "Mousepad" msgstr "" -#: ../data/xfce4/panel/launcher-5/text-editor.desktop.in.h:2 +#: ../launchers/text-editor.desktop.in.h:2 msgid "Simple Text Editor" msgstr "" -#: ../data/xfce4/panel/launcher-5/text-editor.desktop.in.h:3 +#: ../launchers/text-editor.desktop.in.h:3 msgid "Text Editor" msgstr "" -#: ../data/xfce4/panel/launcher-9/mcc.desktop.in.h:1 +#: ../launchers/mcc.desktop.in.h:1 msgid "Configure Your Computer" msgstr "" -#: ../data/xfce4/panel/launcher-4/terminal-emulator.desktop.in.h:1 +#: ../launchers/terminal-emulator.desktop.in.h:1 msgid "Terminal Emulator" msgstr "" -#: ../data/xfce4/panel/launcher-4/terminal-emulator.desktop.in.h:2 +#: ../launchers/terminal-emulator.desktop.in.h:2 msgid "Use the command line" msgstr "" -#: ../data/xfce4/panel/launcher-8/web-browser.desktop.in.h:1 +#: ../launchers/web-browser.desktop.in.h:1 msgid "Web Browser" msgstr "" -#: ../data/xfce4/panel/launcher-8/web-browser.desktop.in.h:2 +#: ../launchers/web-browser.desktop.in.h:2 msgid "Browse the web" msgstr "" |