[geany/geany-osx] f2ebcd: Simplify bundler paths

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Mon, 16 Oct 2017 22:56:42 UTC
Commit:      f2ebcd2d64427ff32216b188ec4bb26252a6dee0
             https://github.com/geany/geany-osx/commit/f2ebcd2d64427ff32216b188ec4bb26252a6dee0

Log Message:
-----------
Simplify bundler paths


Modified Paths:
--------------
    geany-gtk2.bundle
    geany-gtk3.bundle

Modified: geany-gtk2.bundle
14 lines changed, 7 insertions(+), 7 deletions(-)
===================================================================
@@ -132,35 +132,35 @@
   -->
 
   <!-- Geany's data files; glade, fildefs, default tags, etc. -->
-  <data dest="${bundle}/Contents/Resources/share/geany">
+  <data>
     ${prefix}/share/geany
   </data>
   <!-- Geany plugin's data files -->
-  <data dest="${bundle}/Contents/Resources/share/geany-plugins">
+  <data>
     ${prefix}/share/geany-plugins
   </data>
   <!-- Geany documentation -->
-  <data dest="${bundle}/Contents/Resources/share/doc/geany">
+  <data>
     ${prefix}/share/doc/geany
   </data>
   <!-- Geany plugin documentation -->
-  <data dest="${bundle}/Contents/Resources/share/doc/geany-plugins">
+  <data>
     ${prefix}/share/doc/geany-plugins
   </data>
   <!-- VTE config -->
-  <data dest="${bundle}/Contents/Resources/share/vte">
+  <data>
     ${prefix}/share/vte
   </data>
   <!-- mime data -->
-  <data dest="${bundle}/Contents/Resources/share/mime">
+  <data>
     ${prefix}/share/mime
   </data>
 
   <!-- Copy in the themes data. You may want to trim this to save space
        in your bundle. -->
 
   <!-- This theme contains the right key mappings for OS X -->
-  <data dest="${bundle}/Contents/Resources/share/themes/Mac">
+  <data>
     ${prefix}/share/themes/Mac
   </data>
 


Modified: geany-gtk3.bundle
18 lines changed, 9 insertions(+), 9 deletions(-)
===================================================================
@@ -112,23 +112,23 @@
   -->
 
   <!-- Geany's data files; glade, fildefs, default tags, etc. -->
-  <data dest="${bundle}/Contents/Resources/share/geany">
+  <data>
     ${prefix}/share/geany
   </data>
   <!-- Geany plugin's data files -->
-  <data dest="${bundle}/Contents/Resources/share/geany-plugins">
+  <data>
     ${prefix}/share/geany-plugins
   </data>
   <!-- Geany documentation -->
-  <data dest="${bundle}/Contents/Resources/share/doc/geany">
+  <data>
     ${prefix}/share/doc/geany
   </data>
   <!-- Geany plugin documentation -->
-  <data dest="${bundle}/Contents/Resources/share/doc/geany-plugins">
+  <data>
     ${prefix}/share/doc/geany-plugins
   </data>
   <!-- mime data -->
-  <data dest="${bundle}/Contents/Resources/share/mime">
+  <data>
     ${prefix}/share/mime
   </data>
 
@@ -140,8 +140,8 @@
     ${prefix}/share/themes/Mac
   </data>
 
-  <data>
-    ${prefix}/share/themes/Arc
+  <data dest="${bundle}/Contents/Resources/share/themes/Arc">
+    ${project}/Arc
   </data>
 
   <!-- Copy icons. Note that the .icns file is an Apple format which
@@ -156,8 +156,8 @@
     ${prefix}/share/icons/hicolor
   </data>
 
-  <data>
-    ${prefix}/share/icons/Papirus
+  <data dest="${bundle}/Contents/Resources/share/icons/Papirus">
+    ${project}/Papirus
   </data>
 
 </app-bundle>



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).