From ad93b360417f984c466e42abd6599d6ae786692e Mon Sep 17 00:00:00 2001 From: pommicket Date: Fri, 27 Jun 2025 12:54:28 -0400 Subject: bump version, fix deb permissions issue --- Makefile | 28 +++++++++++++++------------- README.md | 1 + ted.h | 2 +- windows_installer/ted/ted.vdproj | 6 +++--- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 75009d1..1323daa 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ GLOBAL_DATA_DIR?=/usr/share/ted LOCAL_DATA_DIR?=~/.local/share/ted INSTALL_BIN_DIR?=/usr/bin +DEBTMP=deb-tmp ALL_CFLAGS=$(CFLAGS) -Wall -Wextra -Wshadow -Wconversion -Wpedantic -pedantic -std=gnu11 \ -Wno-unused-function -Wno-fixed-enum-extension -Wimplicit-fallthrough -Wno-format-truncation -Wno-unknown-warning-option \ @@ -51,16 +52,17 @@ pcre-lib: keywords.h: keywords.py python3 keywords.py ted.deb: release - rm -rf /tmp/ted - mkdir -p /tmp/ted/DEBIAN - mkdir -p /tmp/ted$(INSTALL_BIN_DIR) - mkdir -p /tmp/ted$(GLOBAL_DATA_DIR) - mkdir -p /tmp/ted/usr/share/icons/hicolor/48x48/apps/ - convert assets/icon.bmp -resize 48x48 /tmp/ted/usr/share/icons/hicolor/48x48/apps/ted.png - mkdir -p /tmp/ted/usr/share/applications - cp ted.desktop /tmp/ted/usr/share/applications - cp ted /tmp/ted$(INSTALL_BIN_DIR)/ - cp -r assets themes ted.cfg /tmp/ted$(GLOBAL_DATA_DIR)/ - ./control.sh /tmp/ted > /tmp/ted/DEBIAN/control - dpkg-deb --build /tmp/ted - mv /tmp/ted.deb ./ + rm -rf $(DEBTMP) + mkdir -p $(DEBTMP)/ted/DEBIAN + mkdir -p $(DEBTMP)/ted$(INSTALL_BIN_DIR) + mkdir -p $(DEBTMP)/ted$(GLOBAL_DATA_DIR) + mkdir -p $(DEBTMP)/ted/usr/share/icons/hicolor/48x48/apps/ + convert assets/icon.bmp -resize 48x48 $(DEBTMP)/ted/usr/share/icons/hicolor/48x48/apps/ted.png + mkdir -p $(DEBTMP)/ted/usr/share/applications + cp ted.desktop $(DEBTMP)/ted/usr/share/applications + cp ted $(DEBTMP)/ted$(INSTALL_BIN_DIR)/ + cp -r assets themes ted.cfg $(DEBTMP)/ted$(GLOBAL_DATA_DIR)/ + ./control.sh $(DEBTMP)/ted > $(DEBTMP)/ted/DEBIAN/control + dpkg-deb --root-owner-group --build $(DEBTMP)/ted + mv $(DEBTMP)/ted.deb ./ + rm -rf $(DEBTMP) diff --git a/README.md b/README.md index f6cd698..ed75390 100644 --- a/README.md +++ b/README.md @@ -364,6 +364,7 @@ Then run `make.bat release`. 2.7.8 Fix occasional crash (bad settings pointer) 2025 Mar 23 2.8.0 Add syntax highlighting for C#; improvements to other languages 2025 Jun 12 2.8.1 Better handling of automatic file reloading 2025 Jun 16 +2.8.2 Fix syntax highlighting bug 2025 Jun 27 ## License diff --git a/ted.h b/ted.h index cccda79..6d0b21f 100644 --- a/ted.h +++ b/ted.h @@ -22,7 +22,7 @@ extern "C" { #include "command.h" /// Version number -#define TED_VERSION "2.8.1" +#define TED_VERSION "2.8.2" /// Maximum path size ted handles. #define TED_PATH_MAX 1024 /// Config filename diff --git a/windows_installer/ted/ted.vdproj b/windows_installer/ted/ted.vdproj index 039380f..f3ae279 100644 --- a/windows_installer/ted/ted.vdproj +++ b/windows_installer/ted/ted.vdproj @@ -620,15 +620,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:ted" - "ProductCode" = "8:{B853F9A9-8D0B-43C2-A35D-A5A5E303047D}" - "PackageCode" = "8:{A7D9E08D-5BC7-43D6-A37E-A681B997A6A6}" + "ProductCode" = "8:{D6D63F83-7A28-42FD-B89C-AE13AA38979F}" + "PackageCode" = "8:{72A5260E-5A7F-41D9-985E-CC64FA366969}" "UpgradeCode" = "8:{844F6C2B-DF3B-4A81-9BD5-603401BBA651}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:FALSE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:25.06.1600" + "ProductVersion" = "8:25.06.2700" "Manufacturer" = "8:ted" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" -- cgit v1.2.3