Merge lp:~renatofilho/ubuntu-filemanager-app/snappy into lp:ubuntu-filemanager-app

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 578
Merged at revision: 575
Proposed branch: lp:~renatofilho/ubuntu-filemanager-app/snappy
Merge into: lp:ubuntu-filemanager-app
Diff against target: 126 lines (+108/-0)
3 files modified
setup/gui/ubuntu-filemanager-app.desktop (+47/-0)
snapcraft.yaml (+55/-0)
ubuntu-filemanager-app.wrapper (+6/-0)
To merge this branch: bzr merge lp:~renatofilho/ubuntu-filemanager-app/snappy
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+308050@code.launchpad.net

Commit message

created snappy package.

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Running snapcraft on this branch in xenial results in:-

Error downloading stage packages for part 'ubuntu-filemanager-app': no such package 'qtdeclarative5-nemo-qml-plugin-folderlistmodel'

Is this only intended to work on yakkety?

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Humm just noticed that I have this package installed from dpm repository:

apt-cache policy qtdeclarative5-nemo-qml-plugin-folderlistmodel

qtdeclarative5-nemo-qml-plugin-folderlistmodel:
  Installed: (none)
  Candidate: 0.4ubuntu1+bzr574~ubuntu16.04.1
  Version table:
     0.4ubuntu1+bzr574~ubuntu16.04.1 500
        500 http://ppa.launchpad.net/dpm/ppa/ubuntu xenial/main amd64 Packages

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

let me try to fix that. this should not be necessary.

578. By Renato Araujo Oliveira Filho

Removed built in packages from dep list.

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

> Running snapcraft on this branch in xenial results in:-
>
> Error downloading stage packages for part 'ubuntu-filemanager-app': no such
> package 'qtdeclarative5-nemo-qml-plugin-folderlistmodel'
>
> Is this only intended to work on yakkety?

Thanks for point that. These packages are builtin packages, they should not be listed on the dep list.

Fixed on Rv.578

Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'setup'
2=== added directory 'setup/gui'
3=== added file 'setup/gui/icon.png'
4Binary files setup/gui/icon.png 1970-01-01 00:00:00 +0000 and setup/gui/icon.png 2016-10-10 14:45:34 +0000 differ
5=== added file 'setup/gui/ubuntu-filemanager-app.desktop'
6--- setup/gui/ubuntu-filemanager-app.desktop 1970-01-01 00:00:00 +0000
7+++ setup/gui/ubuntu-filemanager-app.desktop 2016-10-10 14:45:34 +0000
8@@ -0,0 +1,47 @@
9+[Desktop Entry]
10+Version=1.0
11+Type=Application
12+Terminal=false
13+Exec=ubuntu-filemanager-app %u
14+Icon=/snap/ubuntu-filemanager-app/current/usr/share/filemanager/filemanager64.png
15+Name=File Manager
16+Name[am]=የ ፋይል አስተዳዳሪ
17+Name[ast]=Xestor de ficheros
18+Name[be]=Кіраўнік файлаў
19+Name[br]=Merer restroù
20+Name[bs]=Menadžer datoteka
21+Name[ca]=Gestor de fitxers
22+Name[cs]=Správce souborů
23+Name[de]=Dateiverwaltung
24+Name[el]=Διαχειριστής αρχείων
25+Name[en_GB]=File Manager
26+Name[eo]=Dosieradministrilo
27+Name[es]=Gestor de archivos
28+Name[eu]=Fitxategi-kudeatzailea
29+Name[fa]=مدیر پرونده
30+Name[fi]=Tiedostoselain
31+Name[fr]=Gestionnaire de fichiers
32+Name[fr_CA]=Gestionnaire de fichiers
33+Name[gd]=Manaidsear fhaidhlichean
34+Name[gl]=Xestor de ficheiros
35+Name[hu]=Fájlkezelő
36+Name[id]=Manajer Berkas
37+Name[it]=Gestore file
38+Name[lv]=Datņu pārvaldnieks
39+Name[nb]=Filbehandling
40+Name[pa]=ਫ਼ਾਈਲ ਮੈਨੇਜਰ
41+Name[pl]=Menedżer plików
42+Name[pt]=Gestor de ficheiros
43+Name[pt_BR]=Gerenciador de arquivos
44+Name[shn]=တူဝ်ၸတ်းၵၢၼ် ၾၢႆႇ
45+Name[sk]=Správca súborov
46+Name[sl]=Upravljalnik datotek
47+Name[sr]=Управник датотека
48+Name[tr]=Dosya Yöneticisi
49+Name[ug]=ھۆججەت باشقۇرغۇ
50+Name[zh_CN]=文件管理器
51+Name[zh_TW]=檔案管理員
52+X-Ubuntu-Touch=true
53+X-Ubuntu-Default-Department-ID=accessories
54+X-Ubuntu-Splash-Show-Header=true
55+X-Ubuntu-Splash-Color=#F5F5F5
56
57=== added file 'snapcraft.yaml'
58--- snapcraft.yaml 1970-01-01 00:00:00 +0000
59+++ snapcraft.yaml 2016-10-10 14:45:34 +0000
60@@ -0,0 +1,55 @@
61+name: ubuntu-filemanager-app
62+version: 0.4
63+summary: File Manager application
64+description: Core File Manager application
65+confinement: devmode # use "strict" to enforce system access only via declared interfaces
66+grade: devel
67+
68+apps:
69+ ubuntu-filemanager-app:
70+ command: desktop-launch $SNAP/bin/ubuntu-filemanager-app --desktop_file_hint=unity8 "$@"
71+ plugs: [unity7, opengl, home]
72+
73+parts:
74+ ubuntu-filemanager-app:
75+ plugin: cmake
76+ configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=off]
77+ source: .
78+ build-packages:
79+ - cmake
80+ - gcc
81+ - g++
82+ - intltool
83+ - qtbase5-dev
84+ - qtdeclarative5-dev
85+ - qt5-default
86+ - pkg-kde-tools
87+ - python3-all
88+ - libtag1-dev
89+ - libpam0g-dev
90+ - libsmbclient-dev
91+
92+ stage-packages:
93+ - qtdeclarative5-qtquick2-plugin
94+ - qtdeclarative5-u1db1.0
95+ - qml-module-ubuntu-components
96+ - qtdeclarative5-ubuntu-content1
97+ - libsmbclient
98+ - qtubuntu-desktop
99+ - suru-icon-theme
100+ - mir-graphics-drivers-desktop
101+ - humanity-icon-theme
102+
103+ snap:
104+ - -usr/lib/python3
105+ - -usr/share/doc
106+ - -usr/include
107+
108+ after: [desktop-qt5]
109+
110+ environment:
111+ source: .
112+ plugin: dump
113+ organize:
114+ ubuntu-filemanager-app.wrapper: bin/ubuntu-filemanager-app
115+
116
117=== added file 'ubuntu-filemanager-app.wrapper'
118--- ubuntu-filemanager-app.wrapper 1970-01-01 00:00:00 +0000
119+++ ubuntu-filemanager-app.wrapper 2016-10-10 14:45:34 +0000
120@@ -0,0 +1,6 @@
121+#!/bin/bash
122+
123+#Overwrite snappy home dir and use the real home dir
124+export HOME="/home/$USER"
125+
126+exec "$SNAP/usr/bin/filemanager" "$@"

Subscribers

People subscribed via source and target branches