From af689bc026e0c596e48747d8f18f630eff3385fb Mon Sep 17 00:00:00 2001 From: Roman Demidov Date: Wed, 27 Sep 2023 15:34:45 +0300 Subject: [PATCH] Add changelog for DEB and RPM (#965) * Add changelog for DEB and RPM * Small changes * Small changes * Small changes * Small changes * Small changes * Small changes --- .github/workflows/init-changelogs.yaml | 6 +- .gitignore | 2 + common/changes/7.0.0/changes.html | 38 ++++++++++ common/changes/7.0.0/changes_ru.html | 38 ++++++++++ common/changes/7.0.1/changes.html | 33 ++++++++ common/changes/7.0.1/changes_ru.html | 33 ++++++++ common/changes/7.1.0/changes.html | 52 +++++++++++++ common/changes/7.1.0/changes_ru.html | 53 +++++++++++++ common/changes/7.1.1/changes.html | 31 ++++++++ common/changes/7.1.1/changes_ru.html | 31 ++++++++ common/changes/7.2.0/changes.html | 59 +++++++++++++++ common/changes/7.2.0/changes_ru.html | 59 +++++++++++++++ common/changes/7.2.1/changes.html | 75 +++++++++++++++++++ common/changes/7.2.1/changes_ru.html | 65 ++++++++++++++++ common/changes/7.3.0/changes.html | 70 +++++++++++++++++ common/changes/7.3.0/changes_ru.html | 70 +++++++++++++++++ common/changes/7.3.3/changes.html | 37 +++++++++ common/changes/7.3.3/changes_ru.html | 37 +++++++++ common/changes/7.4.0/changes.html | 69 +++++++++++++++++ common/changes/7.4.0/changes_ru.html | 69 +++++++++++++++++ common/changes/7.4.1/changes.html | 33 ++++++++ common/changes/7.4.1/changes_ru.html | 33 ++++++++ common/changes/7.5.0/changes.html | 47 ++++++++++++ common/changes/7.5.0/changes_ru.html | 47 ++++++++++++ common/changes/template/changes.html | 47 ++++++++++++ common/changes/template/changes_ru.html | 47 ++++++++++++ win-linux/package/linux/Makefile | 57 +++++++++++++- .../linux/common/usr/share/doc/NEWS.m4 | 3 + .../package/linux/deb/template/changelog.m4 | 7 +- win-linux/package/linux/rpm/common.spec | 3 + 30 files changed, 1243 insertions(+), 8 deletions(-) create mode 100644 common/changes/7.0.0/changes.html create mode 100644 common/changes/7.0.0/changes_ru.html create mode 100644 common/changes/7.0.1/changes.html create mode 100644 common/changes/7.0.1/changes_ru.html create mode 100644 common/changes/7.1.0/changes.html create mode 100644 common/changes/7.1.0/changes_ru.html create mode 100644 common/changes/7.1.1/changes.html create mode 100644 common/changes/7.1.1/changes_ru.html create mode 100644 common/changes/7.2.0/changes.html create mode 100644 common/changes/7.2.0/changes_ru.html create mode 100644 common/changes/7.2.1/changes.html create mode 100644 common/changes/7.2.1/changes_ru.html create mode 100644 common/changes/7.3.0/changes.html create mode 100644 common/changes/7.3.0/changes_ru.html create mode 100644 common/changes/7.3.3/changes.html create mode 100644 common/changes/7.3.3/changes_ru.html create mode 100644 common/changes/7.4.0/changes.html create mode 100644 common/changes/7.4.0/changes_ru.html create mode 100644 common/changes/7.4.1/changes.html create mode 100644 common/changes/7.4.1/changes_ru.html create mode 100644 common/changes/7.5.0/changes.html create mode 100644 common/changes/7.5.0/changes_ru.html create mode 100644 common/changes/template/changes.html create mode 100644 common/changes/template/changes_ru.html create mode 100644 win-linux/package/linux/common/usr/share/doc/NEWS.m4 diff --git a/.github/workflows/init-changelogs.yaml b/.github/workflows/init-changelogs.yaml index 0a0650927..b545c81a2 100644 --- a/.github/workflows/init-changelogs.yaml +++ b/.github/workflows/init-changelogs.yaml @@ -24,11 +24,13 @@ jobs: run: | CHANGES_WIN=win-linux/package/windows/update/changes CHANGES_MAC=macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes + CHANGES_LINUX=common/changes - rm -rfv $CHANGES_WIN/$VERSION $CHANGES_MAC/$VERSION + rm -rfv $CHANGES_WIN/$VERSION $CHANGES_MAC/$VERSION $CHANGES_LINUX/$VERSION cp -fRTv $CHANGES_WIN/0.0.0 $CHANGES_WIN/$VERSION cp -fRTv $CHANGES_MAC/0.0.0 $CHANGES_MAC/$VERSION - find $CHANGES_WIN/$VERSION $CHANGES_MAC/$VERSION -name "*.html" -print \ + cp -fRTv $CHANGES_LINUX/template $CHANGES_LINUX/$VERSION + find $CHANGES_WIN/$VERSION $CHANGES_MAC/$VERSION $CHANGES_LINUX/$VERSION -name "*.html" -print \ -exec sed -e 's/0.0.0/'${VERSION}'/g' -e 's/000/'${VERSION//./}'/g' -i {} \; - name: Commit changes diff --git a/.gitignore b/.gitignore index 3575b07cb..be9e64c6a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ win-linux/package/windows/index.html win-linux/package/linux/common/opt win-linux/package/linux/common/usr/share/applications/variables.m4 win-linux/package/linux/common/usr/share/flyfm/templates/desktopeditors.*.desktop +win-linux/package/linux/common/usr/share/doc/*/* win-linux/package/linux/common/help /win-linux/package/linux/deb*/build /win-linux/package/linux/deb*/*.buildinfo @@ -31,6 +32,7 @@ common/loginpage/build/node_modules/* common/loginpage/deploy/* common/loginpage/src/dlglogin.min.js common/converter/* +common/changes/*/changes_??? */.svn/* .DS_Store diff --git a/common/changes/7.0.0/changes.html b/common/changes/7.0.0/changes.html new file mode 100644 index 000000000..8e50d3de9 --- /dev/null +++ b/common/changes/7.0.0/changes.html @@ -0,0 +1,38 @@ +

ONLYOFFICE Desktop Editors 7.2.1 - 2022-01-17

+

New Features

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

Fixes

+ \ No newline at end of file diff --git a/common/changes/7.0.0/changes_ru.html b/common/changes/7.0.0/changes_ru.html new file mode 100644 index 000000000..2a36fb28c --- /dev/null +++ b/common/changes/7.0.0/changes_ru.html @@ -0,0 +1,38 @@ +

ONLYOFFICE Desktop Editors 7.2.1 - 2022-01-17

+

Новые функции

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Исправления

+ diff --git a/common/changes/7.0.1/changes.html b/common/changes/7.0.1/changes.html new file mode 100644 index 000000000..02480b9f5 --- /dev/null +++ b/common/changes/7.0.1/changes.html @@ -0,0 +1,33 @@ +

ONLYOFFICE Desktop Editors 7.2.1 - 2022-02-22

+

New Features

+

All Editors

+ +

Spreadsheet Editor

+ +

Fixes

+

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ diff --git a/common/changes/7.0.1/changes_ru.html b/common/changes/7.0.1/changes_ru.html new file mode 100644 index 000000000..cabd16231 --- /dev/null +++ b/common/changes/7.0.1/changes_ru.html @@ -0,0 +1,33 @@ +

ONLYOFFICE Desktop Editors 7.2.1 - 2022-02-22

+

Новые функции

+

Все редакторы

+ +

Редактор таблиц

+ +

Исправления

+

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ diff --git a/common/changes/7.1.0/changes.html b/common/changes/7.1.0/changes.html new file mode 100644 index 000000000..faacaa9be --- /dev/null +++ b/common/changes/7.1.0/changes.html @@ -0,0 +1,52 @@ +

ONLYOFFICE Desktop Editors 7.2.1 - 2022-05-13

+

New Features

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

Forms

+ +

Fixes

+ \ No newline at end of file diff --git a/common/changes/7.1.0/changes_ru.html b/common/changes/7.1.0/changes_ru.html new file mode 100644 index 000000000..eff784aa6 --- /dev/null +++ b/common/changes/7.1.0/changes_ru.html @@ -0,0 +1,53 @@ +

ONLYOFFICE Desktop Editors 7.2.1 - 2022-05-13

+

Новые функции

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Формы

+ +

Исправления

+ diff --git a/common/changes/7.1.1/changes.html b/common/changes/7.1.1/changes.html new file mode 100644 index 000000000..93eecbb7b --- /dev/null +++ b/common/changes/7.1.1/changes.html @@ -0,0 +1,31 @@ +

ONLYOFFICE Desktop Editors 7.2.1 - 2022-07-13

+

Fixes

+

All Editors

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ diff --git a/common/changes/7.1.1/changes_ru.html b/common/changes/7.1.1/changes_ru.html new file mode 100644 index 000000000..c3e2aeb91 --- /dev/null +++ b/common/changes/7.1.1/changes_ru.html @@ -0,0 +1,31 @@ +

ONLYOFFICE Desktop Editors 7.2.1 - 2022-07-13

+

Исправления

+

Все редакторы

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ diff --git a/common/changes/7.2.0/changes.html b/common/changes/7.2.0/changes.html new file mode 100644 index 000000000..e27d4d632 --- /dev/null +++ b/common/changes/7.2.0/changes.html @@ -0,0 +1,59 @@ +

ONLYOFFICE Desktop Editors 7.2.1 - 2022-09-23

+

New Features

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

Forms

+ +

Fixes

+ \ No newline at end of file diff --git a/common/changes/7.2.0/changes_ru.html b/common/changes/7.2.0/changes_ru.html new file mode 100644 index 000000000..c0c0af2ec --- /dev/null +++ b/common/changes/7.2.0/changes_ru.html @@ -0,0 +1,59 @@ +

ONLYOFFICE Desktop Editors 7.2.1 - 2022-09-23

+

Новые функции

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Формы

+ +

Исправления

+ diff --git a/common/changes/7.2.1/changes.html b/common/changes/7.2.1/changes.html new file mode 100644 index 000000000..a0b15635e --- /dev/null +++ b/common/changes/7.2.1/changes.html @@ -0,0 +1,75 @@ +

ONLYOFFICE Desktop Editors 7.2.1 - 2022-10-21

+

New Features

+ +

Fixes

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

PDF Viewer

+ +

Forms

+ diff --git a/common/changes/7.2.1/changes_ru.html b/common/changes/7.2.1/changes_ru.html new file mode 100644 index 000000000..0e1c50989 --- /dev/null +++ b/common/changes/7.2.1/changes_ru.html @@ -0,0 +1,65 @@ +

ONLYOFFICE Desktop Editors 7.2.1 - 2022-10-21

+

Новые функции

+ +

Исправления

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Формы

+ diff --git a/common/changes/7.3.0/changes.html b/common/changes/7.3.0/changes.html new file mode 100644 index 000000000..c880bb35a --- /dev/null +++ b/common/changes/7.3.0/changes.html @@ -0,0 +1,70 @@ +

ONLYOFFICE Desktop Editors 7.3.0 - 2023-01-31

+

New Features

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

Forms

+ +

Fixes

+ \ No newline at end of file diff --git a/common/changes/7.3.0/changes_ru.html b/common/changes/7.3.0/changes_ru.html new file mode 100644 index 000000000..6992f719e --- /dev/null +++ b/common/changes/7.3.0/changes_ru.html @@ -0,0 +1,70 @@ +

ONLYOFFICE Desktop Editors 7.3.0 - 2023-01-31

+

Новые функции

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Формы

+ +

Исправления

+ diff --git a/common/changes/7.3.3/changes.html b/common/changes/7.3.3/changes.html new file mode 100644 index 000000000..0ed894f97 --- /dev/null +++ b/common/changes/7.3.3/changes.html @@ -0,0 +1,37 @@ +

ONLYOFFICE Desktop Editors 7.3.3 - 2023-03-16

+

Fixes

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

PDF Viewer

+ +

Forms

+ diff --git a/common/changes/7.3.3/changes_ru.html b/common/changes/7.3.3/changes_ru.html new file mode 100644 index 000000000..b8790039c --- /dev/null +++ b/common/changes/7.3.3/changes_ru.html @@ -0,0 +1,37 @@ +

ONLYOFFICE Desktop Editors 7.3.3 - 2023-03-16

+

Исправления

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Формы

+ +

PDF

+ diff --git a/common/changes/7.4.0/changes.html b/common/changes/7.4.0/changes.html new file mode 100644 index 000000000..61ca113a9 --- /dev/null +++ b/common/changes/7.4.0/changes.html @@ -0,0 +1,69 @@ +

ONLYOFFICE Desktop Editors 7.4.0 - 2023-06-14

+ +

New Features

+ +

All Editors

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

Forms

+ + +

Fixes

+ +

All Editors

+ diff --git a/common/changes/7.4.0/changes_ru.html b/common/changes/7.4.0/changes_ru.html new file mode 100644 index 000000000..3b13b2081 --- /dev/null +++ b/common/changes/7.4.0/changes_ru.html @@ -0,0 +1,69 @@ +

ONLYOFFICE Desktop Editors 7.4.0 - 2023-06-14

+ +

Новые функции

+ +

Все редакторы

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Формы

+ + +

Исправления

+ +

Все редакторы

+ diff --git a/common/changes/7.4.1/changes.html b/common/changes/7.4.1/changes.html new file mode 100644 index 000000000..74a774f76 --- /dev/null +++ b/common/changes/7.4.1/changes.html @@ -0,0 +1,33 @@ +

ONLYOFFICE Desktop Editors 7.4.1 - 2023-07-31

+ +

Fixes

+ +

All Editors

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ diff --git a/common/changes/7.4.1/changes_ru.html b/common/changes/7.4.1/changes_ru.html new file mode 100644 index 000000000..7f6be93b4 --- /dev/null +++ b/common/changes/7.4.1/changes_ru.html @@ -0,0 +1,33 @@ +

ONLYOFFICE Desktop Editors 7.4.1 - 2023-07-31

+ +

Исправления

+ +

Все редакторы

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ diff --git a/common/changes/7.5.0/changes.html b/common/changes/7.5.0/changes.html new file mode 100644 index 000000000..49758ab9a --- /dev/null +++ b/common/changes/7.5.0/changes.html @@ -0,0 +1,47 @@ +

ONLYOFFICE Desktop Editors 7.5.0 - {{DATE}}

+ +

New Features

+ +

All Editors

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

Forms

+ + +

Fixes

+ +

All Editors

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

Forms

+ diff --git a/common/changes/7.5.0/changes_ru.html b/common/changes/7.5.0/changes_ru.html new file mode 100644 index 000000000..858ab7bd3 --- /dev/null +++ b/common/changes/7.5.0/changes_ru.html @@ -0,0 +1,47 @@ +

ONLYOFFICE Desktop Editors 7.5.0 - {{DATE}}

+ +

Новые функции

+ +

Все редакторы

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Формы

+ + +

Исправления

+ +

Все редакторы

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Формы

+ diff --git a/common/changes/template/changes.html b/common/changes/template/changes.html new file mode 100644 index 000000000..cac6d44d9 --- /dev/null +++ b/common/changes/template/changes.html @@ -0,0 +1,47 @@ +

ONLYOFFICE Desktop Editors 0.0.0 - {{DATE}}

+ +

New Features

+ +

All Editors

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

Forms

+ + +

Fixes

+ +

All Editors

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

Forms

+ diff --git a/common/changes/template/changes_ru.html b/common/changes/template/changes_ru.html new file mode 100644 index 000000000..8c008b477 --- /dev/null +++ b/common/changes/template/changes_ru.html @@ -0,0 +1,47 @@ +

ONLYOFFICE Desktop Editors 0.0.0 - {{DATE}}

+ +

Новые функции

+ +

Все редакторы

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Формы

+ + +

Исправления

+ +

Все редакторы

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Формы

+ diff --git a/win-linux/package/linux/Makefile b/win-linux/package/linux/Makefile index 1f662e894..6f66ec215 100644 --- a/win-linux/package/linux/Makefile +++ b/win-linux/package/linux/Makefile @@ -72,6 +72,12 @@ DEB_ASTRA = deb-astra/$(PACKAGE_NAME)_$(PACKAGE_VERSION)$(DEB_ASTRA_RELEASE_SUFF TAR = $(TAR_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(TAR_RELEASE_SUFFIX)-$(TAR_ARCH).tar.xz HELP_TAR = $(TAR_PACKAGE_DIR)/$(PACKAGE_NAME)-help-$(PACKAGE_VERSION)$(TAR_RELEASE_SUFFIX)-any.tar.xz +CHANGELOG_RPM = common/usr/share/doc/$(PACKAGE_NAME)/NEWS +CHANGELOG_RPM_M4 = common/usr/share/doc/NEWS.m4 +CHANGELOG_DEB = deb/build/debian/changelog +CHANGELOG_DEB_M4 = deb/template/changelog.m4 +CHANGELOG_DEB_ASTRA = deb-astra/build/debian/changelog + ifeq ($(COMPANY_NAME), ONLYOFFICE) DESKTOPEDITORS_PREFIX := $(COMPANY_NAME_LOW)/$(PRODUCT_NAME_LOW) DESKTOPEDITORS_EXEC := $(PACKAGE_NAME) @@ -101,8 +107,9 @@ endif LINUX_DEPS += $(BIN_FILES) LINUX_DEPS += $(DESKTOP_FILES) LINUX_DEPS += $(SYMLINK) +LINUX_DEPS += $(CHANGELOG_RPM) -DEB_DEPS += deb/build/debian/changelog +DEB_DEPS += $(CHANGELOG_DEB) DEB_DEPS += deb/build/debian/compat DEB_DEPS += deb/build/debian/control DEB_DEPS += deb/build/debian/postinst @@ -115,7 +122,7 @@ DEB_DEPS += deb/build/debian/$(PACKAGE_NAME).install DEB_DEPS += deb/build/debian/$(PACKAGE_NAME).links DEB_DEPS += deb/build/debian/$(PACKAGE_NAME)-help.install -DEB_ASTRA_DEPS += deb-astra/build/debian/changelog +DEB_ASTRA_DEPS += $(CHANGELOG_DEB_ASTRA) DEB_ASTRA_DEPS += deb-astra/build/debian/compat DEB_ASTRA_DEPS += deb-astra/build/debian/control DEB_ASTRA_DEPS += deb-astra/build/debian/postinst @@ -192,6 +199,14 @@ else endif RPM_PARAMS += --define '_binary_payload w7.xzdio' +CHANGES_DIR = ../../../common/changes +ifeq ($(COMPANY_NAME), ONLYOFFICE) + CHANGES_HTML = changes.html +else + CHANGES_HTML = changes_ru.html +endif +CHANGES_DIR_LIST = $(shell ls -r $(CHANGES_DIR) | grep -v template) + .PHONY: all clean branding packages rpm deb deb-astra apt-rpm suse-rpm tar desktopeditor qt-redist libstdc++-addon libc-addon all: rpm deb apt-rpm urpmi suse-rpm tar @@ -249,6 +264,8 @@ clean: apt-rpm/$(PACKAGE_NAME).spec \ urpmi/$(PACKAGE_NAME).spec \ suse-rpm/$(PACKAGE_NAME).spec \ + $(shell dirname $(CHANGELOG_RPM)) \ + $(CHANGES_DIR)/*/changes_??? \ $(INSTALLER) branding: $(BRANDING_DIR) @@ -310,6 +327,42 @@ deb/build/debian/% : deb/template/% deb/build/debian/% : deb/template/%.m4 mkdir -pv $(@D) && m4 $(M4_DEB_PARAMS) $< > $@ +$(CHANGELOG_DEB_ASTRA) : $(CHANGELOG_DEB) + mkdir -p $(shell dirname $(CHANGELOG_DEB_ASTRA)) + cp $(CHANGELOG_DEB) $(CHANGELOG_DEB_ASTRA) + +$(CHANGELOG_DEB) : $(CHANGELOG_DEB_M4) $(CHANGELOG_RPM) + $(foreach dir, \ + $(CHANGES_DIR_LIST), \ + $(shell \ + sed 's/^[^ *]/* &/' $(CHANGES_DIR)/$(dir)/changes_rpm | \ + sed 's/^/ /' \ + > $(CHANGES_DIR)/$(dir)/changes_deb; \ + mkdir -p deb/build/debian; \ + m4 $(M4_DEB_PARAMS) -D M4_PACKAGE_VERSION='$(dir)' -D M4_DATE='$(shell date -d "$(shell grep \"releasedate\" $(CHANGES_DIR)/$(dir)/$(CHANGES_HTML) | sed 's/.* - //' | sed 's/<\/span>.*//' | sed 's/{{DATE}}/$(shell date -R)/')" -R)' $(CHANGELOG_DEB_M4) | sed '2r $(CHANGES_DIR)/$(dir)/changes_deb' >> $(CHANGELOG_DEB))) + +$(CHANGELOG_RPM) : + $(foreach dir, \ + $(CHANGES_DIR_LIST), \ + $(shell \ + sed '/DOCTYPE/,/div class/d' $(CHANGES_DIR)/$(dir)/$(CHANGES_HTML) | \ + sed '/div class/,/html/d' | \ + sed 's/<\/li>//g' | \ + sed 's/<\/h4>//g' | \ + sed 's/<\/h2>/:/g' | \ + sed 's///g' | \ + sed 's/<\/code>//g' | \ + sed 's/ \{,\}
  • / - /g' | \ + sed 's/ \{,\}

    /* /g' | \ + sed 's/ \{,\}

    //g' | \ + sed '/
      /d' | \ + sed '/<\/ul>/d' | \ + sed '/

      /d' | \ + sed '/^$$/d' \ + > $(CHANGES_DIR)/$(dir)/changes_rpm; \ + mkdir -p $(shell dirname $(CHANGELOG_RPM)); \ + m4 $(M4_PARAMS) -D M4_VERSION='$(dir)' -D M4_DATE_SHORT='$(shell date -d "$(shell grep \"releasedate\" $(CHANGES_DIR)/$(dir)/$(CHANGES_HTML) | sed 's/.* - //' | sed 's/<\/span>.*//' | sed 's/{{DATE}}/$(shell date -R)/')" -I)' $(CHANGELOG_RPM_M4) | sed '2r $(CHANGES_DIR)/$(dir)/changes_rpm' >> $(CHANGELOG_RPM))) + deb/build/debian/$(PACKAGE_NAME).% : deb/template/package.%.m4 mkdir -pv $(@D) && m4 $(M4_DEB_PARAMS) $< > $@ diff --git a/win-linux/package/linux/common/usr/share/doc/NEWS.m4 b/win-linux/package/linux/common/usr/share/doc/NEWS.m4 new file mode 100644 index 000000000..4e5b036bb --- /dev/null +++ b/win-linux/package/linux/common/usr/share/doc/NEWS.m4 @@ -0,0 +1,3 @@ +News in M4_VERSION, M4_DATE_SHORT +------------------------- + diff --git a/win-linux/package/linux/deb/template/changelog.m4 b/win-linux/package/linux/deb/template/changelog.m4 index 6cb73bd67..791f9157f 100644 --- a/win-linux/package/linux/deb/template/changelog.m4 +++ b/win-linux/package/linux/deb/template/changelog.m4 @@ -1,6 +1,5 @@ -M4_PACKAGE_NAME (M4_PACKAGE_VERSION) stable; urgency=low +M4_PACKAGE_NAME (M4_PACKAGE_VERSION) stable; urgency=medium - * Initial release. - -- M4_PUBLISHER_NAME Wed, 21 Sep 2016 09:50:00 +0000 - \ No newline at end of file + -- M4_PUBLISHER_NAME M4_DATE + diff --git a/win-linux/package/linux/rpm/common.spec b/win-linux/package/linux/rpm/common.spec index 1a3c778c6..f24701e62 100644 --- a/win-linux/package/linux/rpm/common.spec +++ b/win-linux/package/linux/rpm/common.spec @@ -44,6 +44,8 @@ cp -r $COMMON/opt/desktopeditors/* $DESKTOPEDITORS_PREFIX cp -t $BIN_DIR $COMMON/usr/bin/%{_desktopeditors_exec} cp -t $DATA_DIR/applications $COMMON/usr/share/applications/%{_desktopeditors_exec}.desktop echo "package = rpm" > $DESKTOPEDITORS_PREFIX/converter/package.config +mkdir -p $DATA_DIR/doc/%{_desktopeditors_exec} +cp $COMMON/usr/share/doc/%{_desktopeditors_exec}/NEWS $DATA_DIR/doc/%{_desktopeditors_exec} %if "%{_company_name}" == "ONLYOFFICE" # help @@ -72,6 +74,7 @@ rm -rf "%{buildroot}" %files %attr(-, root, root) /opt/* %attr(-, root, root) %{_datadir}/applications/* +%attr(-, root, root) %{_datadir}/doc/* %attr(755, root, root) %{_bindir}/%{_desktopeditors_exec} %if "%{_company_name}" == "ONLYOFFICE" %attr(-, root, root) %{_bindir}/desktopeditors