Release 6.2.5

joecupano · Jun 19, 2023 · 982d39e · 982d39e
1 parent 70795a1
commit 982d39e
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # SIGpi
 
-RELEASE 6.2.4
+RELEASE 6.2.5
 
 ## Introduction
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,10 @@
 # Release Notes
 
+## Release 6.2.5: 2023-06-19
+- Maintenance Release
+- SDRangel 7.15.0 Release
+- WSJT-X 2.6.1 Release
+
 ## Release 6.2.4: 2023-05-26
 - Maintenance Release
 - SDRangel 7.14.1 Release

diff --git a/debs/sdrangel_7.15.0-1_amd64.deb b/debs/sdrangel_7.15.0-1_amd64.deb
diff --git a/debs/sdrangel_7.15.0-1_arm64.deb b/debs/sdrangel_7.15.0-1_arm64.deb
diff --git a/debs/wsjtx_2.6.1_amd64.deb b/debs/wsjtx_2.6.1_amd64.deb
diff --git a/debs/wsjtx_2.6.1_arm64.deb b/debs/wsjtx_2.6.1_arm64.deb
diff --git a/packages/pkg_sdrangel b/packages/pkg_sdrangel
@@ -222,7 +222,8 @@ case "$1" in
         #git reset --hard d67aac3  # v7.11.0
         #git reset --hard cf0489d  # v7.12.0
         #git reset --hard 3f9f81c  # v7.13.0
-        git reset --hard b12e282   # v7.14.1
+        #git reset --hard b12e282  # v7.14.1
+        git reset --hard b4847f1   # v7.15.0
         mkdir build && cd build
         cmake -Wno-dev ..
         make -j4

diff --git a/packages/pkg_wsjtx b/packages/pkg_wsjtx
@@ -13,17 +13,9 @@ case "$1" in
         echo -e "${SIGPI_BANNER_RESET}"
 
         cd $SIGPI_PACKAGES        
-        if [[ "$SIGPI_HWARCH" == "x86_64" ]]; then
-	        cd $SIGPI_DEBS
-	        sudo dpkg -r wsjtx_2.6.0_amd64.deb
-            sed -i /wsjtx/d $SIGPI_CONFIG
-        fi
-
-        if [[ "$SIGPI_HWARCH" == "aarch64" ]]; then
-	        cd $SIGPI_DEBS
-	        sudo dpkg -r wsjtx_2.6.0_arm64.deb
-            sed -i /wsjtx/d $SIGPI_CONFIG
-        fi
+        sudo dpkg -r wsjtx_2.6.0
+        sudo dpkg -r wsjtx_2.6.1
+        sed -i /wsjtx/d $SIGPI_CONFIG
 
         echo -e "${SIGPI_BANNER_COLOR}"
         echo -e "${SIGPI_BANNER_COLOR} ##   WSJT-X Removed"
@@ -35,18 +27,9 @@ case "$1" in
         echo -e "${SIGPI_BANNER_RESET}"
 
         cd $SIGPI_PACKAGES        
-        if [[ "$SIGPI_HWARCH" == "x86_64" ]]; then
-	        cd $SIGPI_DEBS
-	        sudo dpkg -P wsjtx_2.6.0_amd64.deb
-            sed -i /wsjtx/d $SIGPI_CONFIG
-        fi
-
-        if [[ "$SIGPI_HWARCH" == "aarch64" ]]; then
-	        cd $SIGPI_DEBS
-	        sudo dpkg -P wsjtx_2.6.0_arm64.deb
-            sed -i /wsjtx/d $SIGPI_CONFIG
-        fi
-
+        sudo dpkg -P wsjtx_2.6.0
+        sudo dpkg -P wsjtx_2.6.1
+
 	    rm -rf $HOME/.config/WSJT-X.INI
         sudo rm -rf $SIGPI_DESKTOP/wsjtx.desktop
         sudo rm -rf $DESKTOP_FILES/wsjtx.desktop
@@ -72,13 +55,13 @@ case "$1" in
 
         if [[ "$SIGPI_HWARCH" == "x86_64" ]]; then
 	        cd $SIGPI_DEBS
-	        sudo dpkg -i wsjtx_2.6.0_amd64.deb
+	        sudo dpkg -i wsjtx_2.6.1_amd64.deb
             echo "wsjtx" >> $SIGPI_CONFIG 
         fi
 
         if [[ "$SIGPI_HWARCH" == "aarch64" ]]; then
 	        cd $SIGPI_DEBS
-	        sudo dpkg -i wsjtx_2.6.0_arm64.deb
+	        sudo dpkg -i wsjtx_2.6.1_arm64.deb
             echo "wsjtx" >> $SIGPI_CONFIG 
         fi