POM version increment to 2.0.0

luwrain · Apr 13, 2023 · 0997f0b · 0997f0b
1 parent 9544aa9
commit 0997f0b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>org.luwrain</groupId>
  <artifactId>luwrain-parent</artifactId>
- <version>1.9.3</version>
+ <version>2.0.0</version>
  </parent>
  <artifactId>luwrain-linux</artifactId>
  <name>LUWRAIN Linux utilities</name>

diff --git a/ubuntu/22.04/scripts/base.sh b/ubuntu/22.04/scripts/base.sh
@@ -1,4 +1,5 @@
 
+LWRISO_VERSION=2.0.0.0
 UBUNTU_RELEASE=jammy
 LWRISO_BOOT_VER=22.04
 LWRISO_USER=luwrain

diff --git a/ubuntu/22.04/scripts/image-pack b/ubuntu/22.04/scripts/image-pack
@@ -7,15 +7,16 @@ apt-get --yes install squashfs-tools xorriso
 mksquashfs chroot disk/casper/filesystem.squashfs -comp xz > /dev/null
 
 rm -rf disk/casper/filesystem.squashfs.gpg disk/md5sum.txt disk/pool disk/ubuntu 
-echo "LUWRAIN - Release $LWRISO_ARCH ($LWRISO_DATE)" > disk/.disk/info
+echo "LUWRAIN $LWRISO_VERSION Release $LWRISO_ARCH ($LWRISO_DATE)" > disk/.disk/info
 #sed -i -e s/'Ubuntu.*$'/'Homeros '$LWRISO_DATE' - Release '$LWRISO_ARCH/ disk/README.diskdefines
 
 cat <<EOF > disk/README.ru.txt
 LUWRAIN
 EOF
 
 pushd disk > /dev/null
-find -type f '!' -name isolinux.bin '!' -name boot.cat | while read l; do
+#find -type f '!' -name isolinux.bin '!' -name boot.cat | while read l; do
+find -type f '!' -name boot.catalog '!' -name eltorito.img | while read l; do
 md5sum "$l"
 done > ../md5sum.txt
 popd > /dev/null

diff --git a/ubuntu/22.04/scripts/scripts.d/01-cleaning-packages b/ubuntu/22.04/scripts/scripts.d/01-cleaning-packages
@@ -3,7 +3,7 @@ remove-pkg libreoffice-core libreoffice-common
 remove-pkg thunderbird firefox
 remove-pkg-prefix firefox-locale
 remove-pkg libmysqlclient21 nautilus update-manager
-remove-pkg fonts-noto-cjk pipewire
+remove-pkg fonts-noto-cjk
 remove-pkg $(apt-cache search fonts | egrep '^fonts-(tlwg|tibetan|takao|sil|nanum|lohit|lao|khmeros|guru|arphic)' | cut -f1 -d' ')
 remove-pkg $(apt-cache search mythes | grep ^mythes | cut -f1 -d' ')
 remove-pkg-prefix language-pack

diff --git a/ubuntu/22.04/scripts/scripts.d/95-pkg-clean b/ubuntu/22.04/scripts/scripts.d/95-pkg-clean
@@ -2,7 +2,7 @@
 remove-pkg-prefix ubiquity
 remove-pkg-prefix ubuntu-wallpaper
 remove-pkg aspell dictionaries-common
-remove-pkg transmission-common shotwell seahorse rhythmbox remmina reiserfsprogs language-selector-common ibus
+remove-pkg transmission-common shotwell seahorse rhythmbox remmina reiserfsprogs language-selector-common ibus pipewire
 remove-pkg gvfs-common gedit-common yelp
 remove-pkg-prefix gnome
 remove-pkg libreoffice-style-breeze libreoffice-style-colibre