Auto stash before merge of "master" and "origin/master"

diff --git a/alter-stable/any/alterlinux-calamares/.SRCINFO b/alter-stable/any/alterlinux-calamares/.SRCINFO
index bf89c59..2957c8a 100644 (file)
--- a/alter-stable/any/alterlinux-calamares/.SRCINFO
+++ b/alter-stable/any/alterlinux-calamares/.SRCINFO
@@ -34,6 +34,9 @@ pkgbase = alterlinux-calamares
        backup = usr/share/calamares/modules/displaymanager.conf
        backup = usr/share/calamares/modules/initcpio.conf
        backup = usr/share/calamares/modules/unpackfs.conf
+       backup = usr/share/calamares/modules/removeuser.conf
+       backup = usr/share/calamares/modules/users.conf
+       backup = usr/share/calamares/branding/alter/branding.desc
        source = https://github.com/SereneTeam/alterlinux-calamares/archive/3.2.35-2.tar.gz
        sha256sums = SKIP
 

diff --git a/alter-stable/any/alterlinux-calamares/PKGBUILD b/alter-stable/any/alterlinux-calamares/PKGBUILD
index 255b4d9..405063d 100755 (executable)
--- a/alter-stable/any/alterlinux-calamares/PKGBUILD
+++ b/alter-stable/any/alterlinux-calamares/PKGBUILD
@@ -13,10 +13,15 @@ depends=('kconfig' 'kcoreaddons' 'kiconthemes' 'ki18n' 'kio' 'solid' 'yaml-cpp'
          'boost-libs' 'hwinfo' 'qt5-svg' 'polkit-qt5' 'gtk-update-icon-cache' 'plasma-framework'
          'qt5-xmlpatterns' 'squashfs-tools' 'ckbcomp' 'libffi')
 makedepends=('extra-cmake-modules' 'qt5-tools' 'qt5-translations' 'git' 'boost' 'ninja')
-backup=('usr/share/calamares/modules/bootloader.conf'
+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')
+        'usr/share/calamares/modules/unpackfs.conf'
+        'usr/share/calamares/modules/removeuser.conf'
+        'usr/share/calamares/modules/users.conf'
+        'usr/share/calamares/branding/alter/branding.desc'
+)
 
 source+=("$url/archive/$pkgver-$pkgrel.tar.gz")
 #source+=("$url/archive/$pkgver-$_pkgrel.tar.gz")

diff --git a/alter-stable/any/alterlinux-xfce-conf/.SRCINFO b/alter-stable/any/alterlinux-xfce-conf/.SRCINFO
index b330004..c7594e3 100644 (file)
--- a/alter-stable/any/alterlinux-xfce-conf/.SRCINFO
+++ b/alter-stable/any/alterlinux-xfce-conf/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = alterlinux-xfce-conf
        pkgdesc = AlterLinux Xfce Settings
-       pkgver = 1.7
+       pkgver = 1.8
        pkgrel = 1
        url = https:/fascode.net
        arch = any
        depends = alterlinux-wallpapers
        conflicts = alterlinux-xfce-conf-git
-       source = https://github.com/FascodeNet/alterlinux-xfce-conf/archive/v1.7.zip
-       md5sums = c5410c3e83c7b36c2196a6c395c030ba
+       source = https://github.com/FascodeNet/alterlinux-xfce-conf/archive/v1.8.zip
+       md5sums = 00219f29c12f81df3b91cc394863abd9
 
 pkgname = alterlinux-xfce-conf
 

diff --git a/alter-stable/any/alterlinux-xfce-conf/PKGBUILD b/alter-stable/any/alterlinux-xfce-conf/PKGBUILD
index b83e1a5..728dd1e 100644 (file)
--- a/alter-stable/any/alterlinux-xfce-conf/PKGBUILD
+++ b/alter-stable/any/alterlinux-xfce-conf/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer : lap1sid <development@fascode.net>
 
 pkgname=alterlinux-xfce-conf
-pkgver=1.7
+pkgver=1.8
 pkgrel=1
 pkgdesc='AlterLinux Xfce Settings'
 arch=('any')
@@ -10,7 +10,7 @@ url='https:/fascode.net'
 source=("https://github.com/FascodeNet/${pkgname}/archive/v${pkgver}.zip")
 depends=('alterlinux-wallpapers')
 conflicts=("alterlinux-xfce-conf-git")
-md5sums=('c5410c3e83c7b36c2196a6c395c030ba')
+md5sums=('00219f29c12f81df3b91cc394863abd9')
 
 
 build () {