diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..128de05 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*~ +.*.swp +build +image.in/files/* diff --git a/bld/.gitignore b/bld/.gitignore new file mode 100644 index 0000000..b20547c --- /dev/null +++ b/bld/.gitignore @@ -0,0 +1,3 @@ +build.log +reports +out diff --git a/bld/files/.disk/date b/bld/files/.disk/date index f22e11e..577fe0f 100644 --- a/bld/files/.disk/date +++ b/bld/files/.disk/date @@ -1 +1 @@ -20220211 +20220218 diff --git a/bld/files/.disk/info b/bld/files/.disk/info index 94e5dc5..f4fefac 100644 --- a/bld/files/.disk/info +++ b/bld/files/.disk/info @@ -1 +1 @@ -KOMETA p10 kde5/x86_64 build 2022-02-11 +KOMETA p10 kde5/x86_64 build 2022-02-18 diff --git a/bld/files/Metadata/pkg-groups.tar b/bld/files/Metadata/pkg-groups.tar index 0173513..9f0427c 100644 Binary files a/bld/files/Metadata/pkg-groups.tar and b/bld/files/Metadata/pkg-groups.tar differ diff --git a/bld/pkg/lists/.base b/bld/pkg/lists/.base index a246b3e..bfd4511 100644 --- a/bld/pkg/lists/.base +++ b/bld/pkg/lists/.base @@ -378,7 +378,8 @@ kde5-edu kde5-printing kde5-scanning kde5-dolphin-plugins -plasma5-discover-maxi +#plasma5-discover +#plasma5-discover-maxi xorg-conf-synaptics @@ -406,25 +407,31 @@ kometa-icons-theme-classic polkit-rule-gparted-as-root eepm-add-r7-office -####R7 -fonts-ttf-dejavu -fonts-ttf-google-crosextra-carlito -fonts-ttf-liberation -glibc -gst-libav -gst-plugins-ugly1.0 -libX11 -libXScrnSaver -libcairo -libgcc1 -libgtk+2 -libgtkglext -r7-office +#### R7 +#fonts-ttf-dejavu +#fonts-ttf-google-crosextra-carlito +#fonts-ttf-liberation +#glibc gst-libav +#gst-plugins-ugly1.0 +#libX11 +#libXScrnSaver +#libcairo +#libgcc1 +#libgtk+2 +#libgtkglext +#r7-office -####МойОфис -myoffice-standard-documents +#### МойОфис +#myoffice-standard-documents -####Fonts +#### Убираем для установки офисов +darktable +wxMaxima +kdenlive +qt-creator +openshot + +#### Fonts fonts-ttf-ms fonts-ttf-PT fonts-console-terminus @@ -434,10 +441,10 @@ fonts-ttf-unifont fonts-ttf-google-crosextra-carlito fonts-ttf-PTAstra -####Lang +#### Lang hunspell-ru-lebedev -####soft +#### soft gimp gimp-help-ru xsane @@ -461,9 +468,7 @@ kde5-menu-new-odf-files cheese kamoso guvcview -#kdenlive shotcut -#openshot avidemux-qt lmms scribus @@ -472,7 +477,6 @@ scribus tesseract-langpack-ru gimagereader-qt5 eepm -#darktable ksnip v4l-utils @@ -486,10 +490,8 @@ audacity-manual blender scratch-full scratch-help-en -#wxMaxima #bluefish lazarus -qt-creator klatexformula krita gcompris-qt @@ -508,7 +510,7 @@ python3-tools-pep8 sympy python3-module-sympy python3-module-sympy-examples -#ipython3 +ipython3 alterator-update-kernel ###touchegg hplip-hpcups-PPDs @@ -517,10 +519,11 @@ hplip-PPDs hplip-ps-PPDs hplip-recommends -#Для ноутбуков HP у которых не работает микрофон +#### Для ноутбуков HP у которых не работает микрофон firmware-alsa-sof appinstall +xmlstarlet xorg-drv-cirrus xorg-drv-mga xorg-drv-qxl diff --git a/bld/pkg/lists/tagged/base+kde5 b/bld/pkg/lists/tagged/base+kde5 index e27ec9c..269e738 100644 --- a/bld/pkg/lists/tagged/base+kde5 +++ b/bld/pkg/lists/tagged/base+kde5 @@ -75,7 +75,8 @@ kde5-edu kde5-printing kde5-scanning kde5-dolphin-plugins -plasma5-discover-maxi +#plasma5-discover +#plasma5-discover-maxi xorg-conf-synaptics diff --git a/bld/pkg/lists/tagged/base+kometa b/bld/pkg/lists/tagged/base+kometa index 860dc6a..53e7baf 100644 --- a/bld/pkg/lists/tagged/base+kometa +++ b/bld/pkg/lists/tagged/base+kometa @@ -11,7 +11,7 @@ kometa-icons-theme-classic polkit-rule-gparted-as-root eepm-add-r7-office -####R7 +#### R7 #fonts-ttf-dejavu #fonts-ttf-google-crosextra-carlito #fonts-ttf-liberation @@ -25,10 +25,17 @@ eepm-add-r7-office #libgtkglext #r7-office -####МойОфис +#### МойОфис #myoffice-standard-documents -####Fonts +#### Убираем для установки офисов +darktable +wxMaxima +kdenlive +qt-creator +openshot + +#### Fonts fonts-ttf-ms fonts-ttf-PT fonts-console-terminus @@ -38,10 +45,10 @@ fonts-ttf-unifont fonts-ttf-google-crosextra-carlito fonts-ttf-PTAstra -####Lang +#### Lang hunspell-ru-lebedev -####soft +#### soft gimp gimp-help-ru xsane @@ -65,9 +72,7 @@ kde5-menu-new-odf-files cheese kamoso guvcview -kdenlive shotcut -#openshot avidemux-qt lmms scribus @@ -76,7 +81,6 @@ scribus tesseract-langpack-ru gimagereader-qt5 eepm -darktable ksnip v4l-utils @@ -90,10 +94,8 @@ audacity-manual blender scratch-full scratch-help-en -#wxMaxima #bluefish lazarus -qt-creator klatexformula krita gcompris-qt @@ -121,7 +123,8 @@ hplip-PPDs hplip-ps-PPDs hplip-recommends -#Для ноутбуков HP у которых не работает микрофон +#### Для ноутбуков HP у которых не работает микрофон firmware-alsa-sof appinstall +xmlstarlet