Merge pull request #226 from ubuntu/fix-desktop-launchers

Switch to new style desktop launcher format without slash
ubuntu · Aug 29, 2016 · 6addb4d · 6addb4d
2 parents 544896f + 88a0831
commit 6addb4d
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 16 deletions.
diff --git a/2048/snapcraft.yaml b/2048/snapcraft.yaml
@@ -21,4 +21,4 @@ parts:
       - qmlscene
     stage:
       - -usr/share/pkgconfig
-    after: [desktop/qt5]
+    after: [desktop-qt5]
diff --git a/galculator/snapcraft.yaml b/galculator/snapcraft.yaml
@@ -33,7 +33,7 @@ parts:
       - libquadmath0
       - librsvg2-common
       - libwmf0.2-7-gtk
-    after: [desktop/gtk3]
+    after: [desktop-gtk3]
   integration:
     plugin: nil
     stage-packages:

diff --git a/gitter-im/snapcraft.yaml b/gitter-im/snapcraft.yaml
@@ -24,5 +24,5 @@ parts:
     stage-packages:
       - libgl1-mesa-glx
       - libnss3
-    after: [desktop/gtk3, download]
+    after: [desktop-gtk3, download]
 
diff --git a/hexchat/snapcraft.yaml b/hexchat/snapcraft.yaml
@@ -27,4 +27,4 @@ parts:
       - libperl-dev
       - liblua5.3-dev
     after:
-      - desktop/gtk2
+      - desktop-gtk2
diff --git a/idea/snapcraft.yaml b/idea/snapcraft.yaml
@@ -15,4 +15,4 @@ parts:
     plugin: antIntellij
     build-packages: [openjdk-8-jdk, openjfx]
     stage-packages: [openjdk-8-jdk, openjfx]
-    after: [desktop/gtk2]
+    after: [desktop-gtk2]
diff --git a/keepassx/snapcraft.yaml b/keepassx/snapcraft.yaml
@@ -25,4 +25,4 @@ parts:
       - qttools5-dev-tools
       - libgcrypt20-dev
       - zlib1g-dev
-    after: [desktop/qt5]
+    after: [desktop-qt5]
diff --git a/leafpad/README.md b/leafpad/README.md
@@ -3,7 +3,7 @@
 This project creates a working snap of `leafpad`.
 
 To get this done, we need to do the following:
- - uses the launcher from the `desktop/gtk2` part.
+ - uses the launcher from the `desktop-gtk2` part.
  - use the `leafpad` git tree (https://github.com/oluc/leafpad)
 
 ## Current state

diff --git a/leafpad/snapcraft.yaml b/leafpad/snapcraft.yaml
@@ -21,5 +21,5 @@ parts:
     build-packages:
       - build-essential
       - intltool
-    after: [desktop/gtk2]
+    after: [desktop-gtk2]
 
diff --git a/openttd/snapcraft.yaml b/openttd/snapcraft.yaml
@@ -23,4 +23,4 @@ parts:
     plugin: copy
     files:
       '*': './'
-    after: [desktop/qt5]
+    after: [desktop-qt5]
diff --git a/qcomicbook/snapcraft.yaml b/qcomicbook/snapcraft.yaml
@@ -29,5 +29,5 @@ parts:
         - unace
         - tar
         - p7zip
-    after: [desktop/qt5]
+    after: [desktop-qt5]
 
diff --git a/qdriverstation/snapcraft.yaml b/qdriverstation/snapcraft.yaml
@@ -21,7 +21,7 @@ parts:
       - qtmultimedia5-dev
       - qtdeclarative5-dev 
       - qttools5-dev-tools 
-    after: [desktop/qt5]
+    after: [desktop-qt5]
   env:
     plugin: nil
     stage-packages:

diff --git a/qownnotes/snapcraft.yaml b/qownnotes/snapcraft.yaml
@@ -28,7 +28,7 @@ parts:
       - qtdeclarative5-dev
       - libqt5svg5-dev
       - qttools5-dev-tools
-    after: [desktop/qt5]
+    after: [desktop-qt5]
   env:
     plugin: nil
     stage-packages:

diff --git a/ristretto/snapcraft.yaml b/ristretto/snapcraft.yaml
@@ -27,4 +27,4 @@ parts:
       - xfce4-dev-tools
     stage-packages:
       - tumbler
-    after: [desktop/gtk2]
+    after: [desktop-gtk2]
diff --git a/smplayer/snapcraft.yaml b/smplayer/snapcraft.yaml
@@ -57,4 +57,4 @@ parts:
       - libxinerama1
       - libxpm4
       - zlib1g
-    after: [desktop/qt5]
+    after: [desktop-qt5]
diff --git a/ubuntukylin-icon-theme/snapcraft.yaml b/ubuntukylin-icon-theme/snapcraft.yaml
@@ -33,4 +33,4 @@ parts:
         "Name=.*$": "Name=ubuntukylin-icon-theme-snap"
     stage-packages:
       - gsettings-desktop-schemas
-    after: [desktop/glib-only]
+    after: [desktop-glib-only]
diff --git a/vlc/snapcraft.yaml b/vlc/snapcraft.yaml
@@ -136,7 +136,7 @@ parts:
       - qtbase5-dev
       - zlib1g-dev
       - zsh
-    after: [desktop/qt5]
+    after: [desktop-qt5]
 
   env:
     plugin: nil
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,5 +29,5 @@ parts: @@
             - unace
             - tar
             - p7zip
-        after: [desktop/qt5]
+        after: [desktop-qt5]