From 574e89b968b671662c78bf5ae4a6dec9d4cdf3ff Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sat, 23 Jan 2021 08:48:39 +0100 Subject: Bump version numbers & changelog after 1.0.4 release This commit imports the changes to the CHANGELOG.md in the backports branch after the 1.0.4 release and updates the package scripts to point to the new release. In addition, the version numbers in configure.ac are update to more closeley reflect reality, i.e. set the current so version and set the package version to 1.1.0 which will be the next release from master. The unreleased changes in master are also added to the CHANGELOG.md. Signed-off-by: David Oberhollenzer --- packages/APKBUILD | 4 ++-- packages/Dockerfile | 4 ++-- packages/PKGBUILD | 16 ++++++++-------- packages/README.md | 10 +++++----- packages/debian/changelog | 13 +++++++++++++ packages/squashfs-tools-ng.spec | 4 +++- 6 files changed, 33 insertions(+), 18 deletions(-) (limited to 'packages') diff --git a/packages/APKBUILD b/packages/APKBUILD index 7eceb9f..ac9fda4 100644 --- a/packages/APKBUILD +++ b/packages/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Sébastien Gross pkgname=squashfs-tools-ng -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="New set of tools for working with SquashFS images." url="https://github.com/AgentD/squashfs-tools-ng" @@ -43,4 +43,4 @@ doc() { } -sha512sums="3d9a160421bd093daf6fa8a6730137d2c1fee8b8969176e540fa21e9f85ac936546a2011d6b469e7408fabad75627225ba747ca1173272eada8331b0735a93fd squashfs-tools-ng-1.0.3.tar.gz" +sha512sums="3c9f3bea73becaf026bfe22fdc5da28de05d7b5fa7e17230a74f7cc9d08efefda59c004113b6d1aaa59d0e586fc379bc6d0f6e178ddab794bfe9c5966602204c squashfs-tools-ng-1.0.4.tar.gz" diff --git a/packages/Dockerfile b/packages/Dockerfile index d2fb35d..39fbe89 100644 --- a/packages/Dockerfile +++ b/packages/Dockerfile @@ -12,13 +12,13 @@ ARG vendor ARG release -ARG version=1.0.3 +ARG version=1.0.4 FROM $vendor:$release # Args are not globaly scoped ARG vendor ARG release -ARG version=1.0.3 +ARG version=1.0.4 # Install tools required to build a package for several distributions. # diff --git a/packages/PKGBUILD b/packages/PKGBUILD index 4f98401..adc9222 100644 --- a/packages/PKGBUILD +++ b/packages/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: pkgname=('squashfs-tools-ng' 'squashfs-tools-ng-doc') -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 epoch= pkgdesc="New set of tools for working with SquashFS images." @@ -39,13 +39,13 @@ source=("https://github.com/AgentD/squashfs-tools-ng/archive/v$pkgver/$pkgname-$ noextract=() ## Generated using: makepkg -g PKGBUILD -md5sums=('ffa870d5204ea1dbadc943e1a45a6ef9') -sha1sums=('c0fe57ebb25bd25bccfec99773f21f8f3f9e25d7') -sha224sums=('c0a931a23f859745d264fab80ea084ab80d6d9822f211d5d2a0082b8') -sha256sums=('7b1f198d6b1f49f253954e6108ab3e86a6a763b4dbf97758c31ff176bf694362') -sha384sums=('fd466e2f2969d9c07e1a3059f9124b4f3be9068307e341eb7c8993dd305eff7756c8e34ff9e1a513c52632b6b1911f01') -sha512sums=('3d9a160421bd093daf6fa8a6730137d2c1fee8b8969176e540fa21e9f85ac936546a2011d6b469e7408fabad75627225ba747ca1173272eada8331b0735a93fd') -b2sums=('61706a71e918086794cc5edf5763a62789b8120897db97051a7205d1e65a2ef1c2337dac2f8cbf892f759717a5c2fcec85563e556177eb8d18c4bce978ddcb5e') +md5sums=('6f0a153a3438fa333771759e70d5fd41') +sha1sums=('8996e3f4560eb99bb536f49aa3d43ef7d74386da') +sha224sums=('a1abb8bcdc13c497f4be40866c0ac3425018af6e64fb866604614146') +sha256sums=('addcd60f94971b7f7d7f65a973efa19714d273515a4f4bfc90138b0db0a4c9e9') +sha384sums=('09adeae3321bbf61d4a40c26297892300da2074fbb83ca49a9002e3ab0d775ab6ea4f4945f075e65d18c32a5979b18a9') +sha512sums=('3c9f3bea73becaf026bfe22fdc5da28de05d7b5fa7e17230a74f7cc9d08efefda59c004113b6d1aaa59d0e586fc379bc6d0f6e178ddab794bfe9c5966602204c') +b2sums=('4ad4a36d10580c035b4af7c09ec2d4794fd1a054579d0427971debbb2dbb859b486dfc1d27ac56136d85b78e2e3787f4330917bf1c8c5bca0e1da028add55cf9') validpgpkeys=() diff --git a/packages/README.md b/packages/README.md index 0e094e0..341a63c 100644 --- a/packages/README.md +++ b/packages/README.md @@ -51,16 +51,16 @@ Package building for Debian like distibutions is a bit tricky. In this case we want to add the codename to the version number in order to differentiate builds. -To build package for version 1.0.2, run following commands: +To build package for version 1.0.4, run following commands: ``` apt-get install devscripts build-essential wget source /etc/os-release -wget https://github.com/AgentD/squashfs-tools-ng/archive/v1.0.2/squashfs-tools-ng-1.0.2.tar.gz -O squashfs-tools-ng_1.0.2+$VERSION_CODENAME.orig.tar.gz -tar xfz squashfs-tools-ng_1.0.2+$VERSION_CODENAME.orig.tar.gz -cd squashfs-tools-ng-1.0.2 +wget https://github.com/AgentD/squashfs-tools-ng/archive/v1.0.4/squashfs-tools-ng-1.0.4.tar.gz -O squashfs-tools-ng_1.0.4+$VERSION_CODENAME.orig.tar.gz +tar xfz squashfs-tools-ng_1.0.4+$VERSION_CODENAME.orig.tar.gz +cd squashfs-tools-ng-1.0.4 ln -s packages/debian -DEBFULLNAME="$USER" DEBEMAIL="$USER@localhost" dch -v 1.0.2+$VERSION_CODENAME-1 -D $VERSION_CODENAME "Build 1.0.2 for $VERSION_CODENAME." +DEBFULLNAME="$USER" DEBEMAIL="$USER@localhost" dch -v 1.0.4+$VERSION_CODENAME-1 -D $VERSION_CODENAME "Build 1.0.4 for $VERSION_CODENAME." mk-build-deps --install --tool='apt-get --no-install-recommends --yes' debian/control rm *.deb debuild diff --git a/packages/debian/changelog b/packages/debian/changelog index be28a0e..ff9051d 100644 --- a/packages/debian/changelog +++ b/packages/debian/changelog @@ -1,3 +1,16 @@ +squashfs-tools-ng (1.0.3-2) unstable; urgency=medium + + * Backport upstream fix for normalization of slashes in filenames + (closes: #979595). + + -- Laszlo Boszormenyi (GCS) Fri, 08 Jan 2021 20:57:22 +0100 + +squashfs-tools-ng (1.0.3-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) Thu, 12 Nov 2020 22:19:55 +0100 + squashfs-tools-ng (1.0.2-1) unstable; urgency=medium * New upstream release. diff --git a/packages/squashfs-tools-ng.spec b/packages/squashfs-tools-ng.spec index b5deb57..00f0d97 100644 --- a/packages/squashfs-tools-ng.spec +++ b/packages/squashfs-tools-ng.spec @@ -6,7 +6,7 @@ %endif Name: squashfs-tools-ng -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} License: GPLv3+ URL: https://github.com/AgentD/squashfs-tools-ng @@ -141,6 +141,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 23 2021 David Oberhollenzer - 1.0.4-1 +- Bump to version 1.0.4. * Wed Nov 05 2020 David Oberhollenzer - 1.0.3-1 - Bump to version 1.0.3. * Thu Oct 01 2020 Sébastien Gross - 1.0.2-1 -- cgit v1.2.3