From b1787ce4c7bd24f07b3e32feba6583cef8b0793f Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Sun, 22 Feb 2026 15:43:37 +0100 Subject: [PATCH] New upstream snapshot; fix watch and use full aa.b.c.d version --- changelog | 21 +++++++++++++++++++++ rules | 2 +- watch | 41 +---------------------------------------- watch.alpha-and-betas | 17 +++++++++++++++++ watch.rcs | 17 +++++++++++++++++ 5 files changed, 57 insertions(+), 41 deletions(-) mode change 100644 => 120000 watch create mode 100644 watch.alpha-and-betas create mode 100644 watch.rcs diff --git a/changelog b/changelog index a32a0c16e..3be99beae 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,24 @@ +libreoffice (4:26.2.2.1~git20260214-1) UNRELEASED; urgency=medium + + * New upstream snapshot + + * change Debian package version to include the complete (internal) version (as + e.g. Fedora and Gentoo and openSUSE do already) to make debian/watch work + correctly with (stable) releases and rcs with + https://orig-check.debian.net/upstream2orig/ in mind, also use full + alpha/beta versions (see below) + + * debian/watch.stable-and-rcs, debian/watch/alpha-and-betas: split files + * debian/watch/*: update to v5 + * debian/watch/stable-and-rcs: watch libreoffice-aa.b.c.d completely so that + we are able to get the upstream tarball correctly (see above); use + http://downloadarchive.documentfoundation.org/@PACKAGE@/old//src/ + which despite the name also gets uptodate releases/rcs (thanks cacin) + * debian/watch/alpha-and-betas: watch libreoffice-aa.b.c.0.(alpha|beta)d; + as above + + -- Rene Engelhard Fri, 06 Feb 2026 17:20:45 +0100 + libreoffice (4:26.2.1~rc1-2) UNRELEASED; urgency=medium * debian/rules: diff --git a/rules b/rules index 757d5208d..ac6ca6790 100755 --- a/rules +++ b/rules @@ -83,7 +83,7 @@ lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentf # NOT in proper libreoffice-3-6 branch # use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1 GIT_TAG=libreoffice-$(lo_sources_ver) -GIT_BRANCH=libreoffice-26-2-1 +GIT_BRANCH=libreoffice-26-2 endif ifeq "$(USE_SOURCE_TARBALLS)" "y" lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2) diff --git a/watch b/watch deleted file mode 100644 index e0f575eac..000000000 --- a/watch +++ /dev/null @@ -1,40 +0,0 @@ -version=4 - -# only releases (and the final rc before the release. The last rc simply get renamed -# so e.g. 6.4.3 final is 6.4.3 rc2 which is 6.4.3.2) -# FIXME: -# Unfortunately it seems that download.documentfoundation.org/libreoffice/src gets the rcs too. But -# download.documentfoundation.org/stable((\d.\d.\d) doesn't work since we then get no tarball information -# as that doesn't ship the source... And I fail getting parsing of www.libreoffice.org/download to work -opts="compression=xz,pgpsigurlmangle=s/$/.asc/,uversionmangle=s/(\d\d.\d.\d).(\d)/$1/" \ - http://download.documentfoundation.org/libreoffice/src/(\d\d.\d.\d)/@PACKAGE@-(\d\d.\d.\d).(\d).tar.xz debian - -opts="pgpsigurlmangle=s/$/.asc/,component=helpcontent2,uversionmangle=s/(\d\d.\d.\d).(\d)/$1/" \ - http://download.documentfoundation.org/libreoffice/src/(\d\d.\d.\d)/@PACKAGE@-help-(\d\d.\d.\d).(\d).tar.xz same - -opts="pgpsigurlmangle=s/$/.asc/,component=translations,uversionmangle=s/(\d\d.\d.\d).(\d)/$1/" \ - http://download.documentfoundation.org/libreoffice/src/(\d\d.\d.\d)/@PACKAGE@-translations-(\d\d.\d.\d).(\d).tar.xz same - -# FIXME: Combine those to one part? -# Problem: 6.4.3.2 -> 6.4.3~rc2 (rc added manually) -# 7.0.0.0.alpha1 -> 7.0.0~alpha1 (.0. stripped and following value taken as-is) - -# rcs (and the last rc which will become final, see above) -#opts="compression=xz,pgpsigurlmangle=s/$/.asc/,versionmangle=s/(\d\d.\d.\d).(\d)/$1~rc$2/" \ -# https://dev-builds.libreoffice.org/pre-releases/src/@PACKAGE@-(\d\d.\d.\d).(\d).tar.xz debian -# -#opts="pgpsigurlmangle=s/$/.asc/,component=helpcontent2,versionmangle=s/(\d\d.\d.\d).(\d)/$1~rc$2/" \ -# https://dev-builds.libreoffice.org/pre-releases/src/@PACKAGE@-help-(\d\d.\d.\d).(\d).tar.xz same -# -#opts="pgpsigurlmangle=s/$/.asc/,component=translations,versionmangle=s/(\d\d.\d.\d).(\d)/$1~rc$2/" \ -# https://dev-builds.libreoffice.org/pre-releases/src/@PACKAGE@-translations-(\d\d.\d.\d).(\d).tar.xz same - -# alpha, beta -#opts="compression=xz,pgpsigurlmangle=s/$/.asc/,versionmangle=s/(\d\d.\d.\d).(alpha|beta).(\d)/$1~$2$3/" \ -# https://dev-builds.libreoffice.org/pre-releases/src/@PACKAGE@-(\d\d.\d.\d).0.(alpha|beta)(\d).tar.xz debian -# -#opts="pgpsigurlmangle=s/$/.asc/,versionmangle=s/(\d\d.\d.\d).(alpha|beta).(\d)/$1~$2$3/" \ -# https://dev-builds.libreoffice.org/pre-releases/src/@PACKAGE@-help-(\d\d.\d.\d).0.(alpha|beta)(\d).tar.xz same -# -#opts="pgpsigurlmangle=s/$/.asc/,versionmangle=s/(\d\d.\d.\d).(alpha|beta).(\d)/$1~$2$3/" \ -# https://dev-builds.libreoffice.org/pre-releases/src/@PACKAGE@-translations-(\d\d.\d.\d).0.(alpha|beta)(\d).tar.xz same diff --git a/watch b/watch new file mode 120000 index 000000000..8dad0466c --- /dev/null +++ b/watch @@ -0,0 +1 @@ +watch.rcs \ No newline at end of file diff --git a/watch.alpha-and-betas b/watch.alpha-and-betas new file mode 100644 index 000000000..36f77aae6 --- /dev/null +++ b/watch.alpha-and-betas @@ -0,0 +1,17 @@ +Version: 5 + +Source: https://dev-builds.libreoffice.org/pre-releases/src/ +Matching-Pattern: libreoffice-(\d\d\.\d\.\d\.0\..*\d).tar.xz +Pgp-mode: auto + +Source: https://dev-builds.libreoffice.org/pre-releases/src/ +Component: helpcontent2 +Matching-Pattern: libreoffice-help-(\d\d\.\d\.\d\.0\..*\d).tar.xz +Version-Constraint: same +Pgp-mode: auto + +Source: https://dev-builds.libreoffice.org/pre-releases/src/ +Component: translations +Matching-Pattern: libreoffice-@COMPONENT@-(\d\d\.\d\.\d\.0\..*\d).tar.xz +Version-Constraint: same +Pgp-mode: auto diff --git a/watch.rcs b/watch.rcs new file mode 100644 index 000000000..033f9c015 --- /dev/null +++ b/watch.rcs @@ -0,0 +1,17 @@ +Version: 5 + +Source: http://downloadarchive.documentfoundation.org/libreoffice/old/(\d\d\.\d\.\d\.\d)/src/ +Matching-Pattern: libreoffice-(\d\d\.\d\.\d\.\d).tar.xz +Pgp-mode: auto + +Source: http://downloadarchive.documentfoundation.org/libreoffice/old/(\d\d\.\d\.\d\.\d)/src/ +Component: helpcontent2 +Matching-Pattern: libreoffice-help-(\d\d\.\d\.\d\.\d).tar.xz +Version-Constraint: same +Pgp-mode: auto + +Source: http://downloadarchive.documentfoundation.org/libreoffice/old/(\d\d\.\d\.\d\.\d)/src/ +Component: translations +Matching-Pattern: libreoffice-translations-(\d\d\.\d\.\d\.\d).tar.xz +Version-Constraint: same +Pgp-mode: auto -- 2.47.3