stash - okv3.1.0-parabola-alpha2

32 files changed, 29 insertions, 28 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 128e9e3c1..19955c982 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,6 +256,13 @@ install(
       ${CMAKE_INSTALL_DATADIR}/applications
 )
 
+install(
+  DIRECTORY
+      ${CMAKE_SOURCE_DIR}/data/skel/
+  DESTINATION
+      ${CMAKE_INSTALL_DATADIR}/calamares/
+)
+
 # uninstall target
 configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
diff --git a/PKGBUILD b/PKGBUILD
index 62c8f59d3..e4533cb8e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,32 +3,26 @@
 
 pkgname=calamares
 pkgver=3.1.0
-pkgrel=1
-pkgdesc='Distribution-independent installer framework'
+pkgrel=2
+pkgdesc='Distribution-independent installer framework - Parabola edition'
 arch=('i686' 'x86_64')
-license=(GPL)
-url="https://github.com/calamares"
-license=('LGPL')
+license=('GPL')
+url="https://calamares.io/"
 
-depends=( 'boost-libs' 'dmidecode' 'gptfdisk' 'hwinfo' 'kconfig' 'kcoreaddons' 'ki18n'
-          'kparts' 'kpmcore' 'polkit-qt5' 'python' 'squashfs-tools' 'solid' 'qt5ct'
-          'qt5-styleplugins' 'qt5-svg' 'yaml-cpp' )
-makedepends=( 'extra-cmake-modules' 'qt5-tools' 'git' 'boost' )
-backup=( 'usr/share/calamares/modules/bootloader.conf'
-         'usr/share/calamares/modules/displaymanager.conf'
-         'usr/share/calamares/modules/initcpio.conf'
-         'usr/share/calamares/modules/unpackfs.conf' )
+depends=('boost-libs' 'dmidecode' 'gptfdisk' 'hwinfo' 'kconfig' 'kcoreaddons' 'ki18n'
+         'kparts' 'kpmcore' 'polkit-qt5' 'python' 'squashfs-tools' 'solid' 'qt5ct'
+         'qt5-styleplugins' 'qt5-svg' 'yaml-cpp')
+makedepends=('boost' 'extra-cmake-modules' 'git' 'qt5-tools')
 
-_git_tag="${pkgver}-parabola-alpha1"
+_git_tag="${pkgver}-parabola-alpha${pkgrel}"
 source=("https://notabug.org/bill-auger/calamares/archive/v${_git_tag}.tar.gz")
-sha256sums=('6ae55f567d5eafdb781dc84988dec184637fa7cf8bd55d7a2157b2d920880d52')
+# sha256sums=('6ae55f567d5eafdb781dc84988dec184637fa7cf8bd55d7a2157b2d920880d52') # alpha1
+sha256sums=('f914857c5f5bbafca0f48f123e34c667b2010b7115b38b2fcee45122e3e41d27') # alpha2
 
 
 build() {
-  cd ${srcdir}/calamares
-
-  mkdir -p build
-  cd build
+  mkdir -p ${srcdir}/calamares/build
+  cd ${srcdir}/calamares/build
   cmake -DCMAKE_BUILD_TYPE=Debug                                               \
         -DCMAKE_INSTALL_PREFIX=/usr                                            \
         -DCMAKE_INSTALL_LIBDIR=lib                                             \
@@ -42,7 +36,4 @@ build() {
 package() {
   cd ${srcdir}/calamares/build
   make DESTDIR="$pkgdir" install
-
-#  install -Dm644 "branding/parabola/squid.png" "$pkgdir/usr/share/icons/hicolor/scalable/apps/calamares.svg"
-#  install -Dm644 "../data/calamares.desktop"   "$pkgdir/usr/share/applications/calamares.desktop"
 }
diff --git a/calamares.desktop b/calamares.desktop
index 88cb71e20..105469f06 100644
--- a/calamares.desktop
+++ b/calamares.desktop
@@ -1,12 +1,15 @@
 [Desktop Entry]
 Type=Application
 Version=1.0
-Name=Calamares
+Name=Install Parabola
+Name[es_ES]=Instalador de Parabola
+Name[gl_ES]=Instalador de Parabola
+Name[pt_BR]=Instalador do Parabola
 GenericName=System Installer
 Keywords=calamares;system;installer
 TryExec=calamares
 Exec=pkexec /usr/bin/calamares
-Comment=Calamares — System Installer
+Comment=Install the Parabola GNU/Linux-Libre operating system
 Icon=calamares
 Terminal=false
 StartupNotify=true
diff --git a/src/modules/desktop/skel/mate/.ICEauthority b/data/skel/mate/.ICEauthority
index b959e6a56..b959e6a56 100644
--- a/src/modules/desktop/skel/mate/.ICEauthority
+++ b/data/skel/mate/.ICEauthority
diff --git a/src/modules/desktop/skel/mate/.Xauthority b/data/skel/mate/.Xauthority
index 132220db6..132220db6 100644
--- a/src/modules/desktop/skel/mate/.Xauthority
+++ b/data/skel/mate/.Xauthority
diff --git a/src/modules/desktop/skel/mate/.bash_logout b/data/skel/mate/.bash_logout
index 0e4e4f184..0e4e4f184 100644
--- a/src/modules/desktop/skel/mate/.bash_logout
+++ b/data/skel/mate/.bash_logout
diff --git a/src/modules/desktop/skel/mate/.bash_profile b/data/skel/mate/.bash_profile
index 5545f007e..5545f007e 100644
--- a/src/modules/desktop/skel/mate/.bash_profile
+++ b/data/skel/mate/.bash_profile
diff --git a/src/modules/desktop/skel/mate/.bashrc b/data/skel/mate/.bashrc
index a355b0cd3..a355b0cd3 100644
--- a/src/modules/desktop/skel/mate/.bashrc
+++ b/data/skel/mate/.bashrc
diff --git a/src/modules/desktop/skel/mate/.cache/mate/background/0_1_1024_768_6fb1a8398fc17d5268aa5ccdd628a9a1 b/data/skel/mate/.cache/mate/background/0_1_1024_768_6fb1a8398fc17d5268aa5ccdd628a9a1
index 5163123b8..5163123b8 100644
--- a/src/modules/desktop/skel/mate/.cache/mate/background/0_1_1024_768_6fb1a8398fc17d5268aa5ccdd628a9a1
+++ b/data/skel/mate/.cache/mate/background/0_1_1024_768_6fb1a8398fc17d5268aa5ccdd628a9a1
diff --git a/src/modules/desktop/skel/mate/.config/caja/accels b/data/skel/mate/.config/caja/accels
index b3731d8ce..b3731d8ce 100644
--- a/src/modules/desktop/skel/mate/.config/caja/accels
+++ b/data/skel/mate/.config/caja/accels
diff --git a/src/modules/desktop/skel/mate/.config/caja/desktop-metadata b/data/skel/mate/.config/caja/desktop-metadata
index d80c2893a..d80c2893a 100644
--- a/src/modules/desktop/skel/mate/.config/caja/desktop-metadata
+++ b/data/skel/mate/.config/caja/desktop-metadata
diff --git a/src/modules/desktop/skel/mate/.config/dconf/user b/data/skel/mate/.config/dconf/user
index b43802624..b43802624 100644
--- a/src/modules/desktop/skel/mate/.config/dconf/user
+++ b/data/skel/mate/.config/dconf/user
diff --git a/src/modules/desktop/skel/mate/.config/gtk-2.0/gtkfilechooser.ini b/data/skel/mate/.config/gtk-2.0/gtkfilechooser.ini
index c6b458dfa..c6b458dfa 100644
--- a/src/modules/desktop/skel/mate/.config/gtk-2.0/gtkfilechooser.ini
+++ b/data/skel/mate/.config/gtk-2.0/gtkfilechooser.ini
diff --git a/src/modules/desktop/skel/mate/.config/octopi/octopi.conf b/data/skel/mate/.config/octopi/octopi.conf
index 58dfdac11..58dfdac11 100644
--- a/src/modules/desktop/skel/mate/.config/octopi/octopi.conf
+++ b/data/skel/mate/.config/octopi/octopi.conf
diff --git a/src/modules/desktop/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-card-database.tdb b/data/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-card-database.tdb
index 323f375d6..323f375d6 100644
--- a/src/modules/desktop/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-card-database.tdb
+++ b/data/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-card-database.tdb
diff --git a/src/modules/desktop/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-default-sink b/data/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-default-sink
index 8b1378917..8b1378917 100644
--- a/src/modules/desktop/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-default-sink
+++ b/data/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-default-sink
diff --git a/src/modules/desktop/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-default-source b/data/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-default-source
index 8b1378917..8b1378917 100644
--- a/src/modules/desktop/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-default-source
+++ b/data/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-default-source
diff --git a/src/modules/desktop/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-device-volumes.tdb b/data/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-device-volumes.tdb
index ec6b6956c..ec6b6956c 100644
--- a/src/modules/desktop/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-device-volumes.tdb
+++ b/data/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-device-volumes.tdb
diff --git a/src/modules/desktop/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-stream-volumes.tdb b/data/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-stream-volumes.tdb
index b768866fb..b768866fb 100644
--- a/src/modules/desktop/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-stream-volumes.tdb
+++ b/data/skel/mate/.config/pulse/82b0568e94d14a1ea892086635b342fc-stream-volumes.tdb
diff --git a/src/modules/desktop/skel/mate/.config/pulse/cookie b/data/skel/mate/.config/pulse/cookie
index 4170e4612..4170e4612 100644
--- a/src/modules/desktop/skel/mate/.config/pulse/cookie
+++ b/data/skel/mate/.config/pulse/cookie
diff --git a/src/modules/desktop/skel/mate/.config/volumeicon/volumeicon b/data/skel/mate/.config/volumeicon/volumeicon
index 588b9dda4..588b9dda4 100644
--- a/src/modules/desktop/skel/mate/.config/volumeicon/volumeicon
+++ b/data/skel/mate/.config/volumeicon/volumeicon
diff --git a/src/modules/desktop/skel/mate/.directory b/data/skel/mate/.directory
index 07c52ff02..07c52ff02 100644
--- a/src/modules/desktop/skel/mate/.directory
+++ b/data/skel/mate/.directory
diff --git a/src/modules/desktop/skel/mate/.dmrc b/data/skel/mate/.dmrc
index 7083a13ef..7083a13ef 100644
--- a/src/modules/desktop/skel/mate/.dmrc
+++ b/data/skel/mate/.dmrc
diff --git a/src/modules/desktop/skel/mate/.esd_auth b/data/skel/mate/.esd_auth
index 619c476d7..619c476d7 100644
--- a/src/modules/desktop/skel/mate/.esd_auth
+++ b/data/skel/mate/.esd_auth
diff --git a/src/modules/desktop/skel/mate/.local/share/keyrings/login.keyring b/data/skel/mate/.local/share/keyrings/login.keyring
index 09e423571..09e423571 100644
--- a/src/modules/desktop/skel/mate/.local/share/keyrings/login.keyring
+++ b/data/skel/mate/.local/share/keyrings/login.keyring
diff --git a/src/modules/desktop/skel/mate/.local/share/keyrings/user.keystore b/data/skel/mate/.local/share/keyrings/user.keystore
index 2d41c7f72..2d41c7f72 100644
--- a/src/modules/desktop/skel/mate/.local/share/keyrings/user.keystore
+++ b/data/skel/mate/.local/share/keyrings/user.keystore
diff --git a/src/modules/desktop/skel/mate/.local/share/recently-used.xbel b/data/skel/mate/.local/share/recently-used.xbel
index 03854a71e..03854a71e 100644
--- a/src/modules/desktop/skel/mate/.local/share/recently-used.xbel
+++ b/data/skel/mate/.local/share/recently-used.xbel
diff --git a/src/modules/desktop/skel/mate/.xsession-errors b/data/skel/mate/.xsession-errors
index 3023b8a71..3023b8a71 100644
--- a/src/modules/desktop/skel/mate/.xsession-errors
+++ b/data/skel/mate/.xsession-errors
diff --git a/src/modules/desktop/skel/mate/.zshrc b/data/skel/mate/.zshrc
index 8695b4dbe..8695b4dbe 100644
--- a/src/modules/desktop/skel/mate/.zshrc
+++ b/data/skel/mate/.zshrc
diff --git a/mk b/mk
index b2d25c6d6..2332d894e 100755
--- a/mk
+++ b/mk
@@ -32,7 +32,7 @@ cmake -DCMAKE_BUILD_TYPE=Debug                                               \
                       interactiveterminal license luksbootkeyfile            \
                       luksopenswaphookcfg plymouthcfg removeuser webview" ..
 [ -f Makefile  ] && make ; (($?)) && cd .. && exit
-#sudo make uninstall
+sudo make uninstall
 sudo make install
 cd ..
 
diff --git a/src/branding/parabola/branding.desc b/src/branding/parabola/branding.desc
index eaa2920eb..4838fb92e 100644
--- a/src/branding/parabola/branding.desc
+++ b/src/branding/parabola/branding.desc
@@ -4,8 +4,8 @@ componentName: parabola
 strings:
   productName:         Parabola GNU/Linux-Libre
   shortProductName:    Parabola
-  version:             2017-06
-  shortVersion:        2017-06
+  version:             2017-09
+  shortVersion:        2017-09
   versionedName:       Parabola GNU/Linux-Libre
   shortVersionedName:  Parabola
   productUrl:          http://www.parabola.nu/
diff --git a/src/modules/users/CreateUserJob.cpp b/src/modules/users/CreateUserJob.cpp
index 98e51228b..8f46ff6c3 100644
--- a/src/modules/users/CreateUserJob.cpp
+++ b/src/modules/users/CreateUserJob.cpp
@@ -265,7 +265,7 @@ cDebug() << QString("[CREATEUSER]: CreateUserJob::exec() ls -al /home/%1/ - targ
 */
 
 // const QString SKELS_DIR = "/usr/lib/calamares/modules/desktop/skel" ;
-const QString SKELS_DIR = "/home/bill/calamares/git/src/modules/desktop/skel" ;
+const QString SKELS_DIR = "/home/bill/calamares/git/data/skel" ;
 //     QString dotfiles_cmd = QString("cp -r /home/parabola/.* %1/home/%2/").arg(destDir.absolutePath() , m_userName) ;
     QString dotfiles_cmd = QString("cp -a %1/%2/.??* %3/home/%4/").arg(SKELS_DIR              ,
                                                                        default_desktop        ,