Skip to content

Commit d8dae7e

Browse files
committed
Merge branch 'dev-3.1.0'
2 parents 4e02bd8 + 151aaac commit d8dae7e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+94
-91
lines changed

build/anigif-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
3+
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

build/anigif-create.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
3+
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

build/anigif-rename.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
3+
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

build/arch/update-pkgconfig-sha256-on-repo-change.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
3+
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

build/debian/aptly-add-deb.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (C) 2016-2023 Martin Dvorak <[email protected]>
3+
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
44
#
55
# This program is free software; you can redistribute it and/or
66
# modify it under the terms of the GNU General Public License
@@ -34,16 +34,16 @@ echo "See 'MindForger Release Guide#Debian and my PPA' notebook for detailed ste
3434
#aptly repo show -with-packages mindforger-com-ppa
3535

3636
# show snapshots
37-
#aptly snapshot list
37+
#aptly snapshot list
3838

3939
# delete snapshot(s) ONLY if needed - publish must be deleted first!
4040
#aptly snapshot drop hstr-2.0.0-snapshot
4141

42-
# create snapshot in the time of release - note release NAME
42+
# create snapshot in the time of release - note release NAME
4343
#aptly snapshot create hstr-2.0.0-snapshot from repo mindforger-com-ppa
4444

4545
# show published snapshots
46-
#aptly publish list
46+
#aptly publish list
4747

4848
# delete published snapshot(s) ONLY if needed
4949
#aptly publish drop stretch

build/debian/make-deb.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
3+
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -33,9 +33,9 @@
3333
# ############################################################################
3434

3535
function createChangelog() {
36-
# Debian tooling changelog hints:
36+
# Debian tooling changelog hints:
3737
# - signature line MUST have one whitespace prefix
38-
# - signature line MUST have double space between email and timestamp
38+
# - signature line MUST have double space between email and timestamp
3939
# - traling lines must have exactly one space
4040

4141
export MYTS=`date "+%a, %d %b %Y %H:%M:%S"`
@@ -78,7 +78,7 @@ function buildDebPackage() {
7878
export NOW=`date +%Y-%m-%d--%H-%M-%S`
7979
export HSTRBUILD=hstr-${NOW}
8080
export DEBIANVERSION=unstable
81-
81+
8282
#
8383
# 1) create upstream tarball
8484
#
@@ -91,18 +91,18 @@ function buildDebPackage() {
9191

9292
# 1.x) generate makefiles
9393
cd build/tarball && ./tarball-automake.sh && cd ../.. && ./configure
94-
94+
9595
# 1.2) prune HSTR project source: tests, *.o/... build files, ...
9696
echo -e "\n# HSTR project cleanup ########################################"
9797
rm -vrf ./.git ./hstr ./build ./test ./hstr.pro ./doc ./pad.xml ./snap
9898
find . -type f \( -name "*.a" -or -name "*.o" -or -name "*.*~" -or -name ".gitignore" -or -name ".git" \) | while read F; do rm -vf $F; done
99-
99+
100100
# 1.4) create tar archive
101101
createTarball
102102

103103
#
104104
# 2) create source deb
105-
#
105+
#
106106
# 2.a) add Debian control files
107107
cp -rvf ${HSTRSRC}/build/debian/debian .
108108
createChangelog ./debian/changelog
@@ -113,7 +113,7 @@ function buildDebPackage() {
113113
echo "OK: GPG agent running."
114114
else
115115
gpg-agent --daemon
116-
fi
116+
fi
117117

118118
DEBEMAIL="[email protected]"
119119
DEBFULLNAME="Martin Dvorak"
@@ -126,7 +126,7 @@ function buildDebPackage() {
126126
pushd .. && mkdir -v deb-binary && cp -vf *.dsc *.changes *.deb deb-binary && popd
127127

128128
# 3) create source deb
129-
#
129+
#
130130
# 3.a) build deb
131131
# build SOURCE deb package
132132
#debuild -S

build/debian/upload-to-mentors.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
3+
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

build/fedora/rpm-from-deb.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
3+
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
44
#
55
# This program is free software; you can redistribute it and/or
66
# modify it under the terms of the GNU General Public License
@@ -50,10 +50,10 @@ function decompose() {
5050
function compose() {
5151
# recreate RPM
5252
cd ${MFPRJNAME}
53-
export MFRPMROOT=`pwd`
54-
53+
export MFRPMROOT=`pwd`
54+
5555
# bin build
56-
# --target=x86_64
56+
# --target=x86_64
5757
# --target=i386
5858
rpmbuild --target=x86_64 --buildroot ${MFRPMROOT}/ -bb ${MFPRJNAME}-2.spec
5959
# noarch would be for SOURCE deb

build/tarball/tarball-automake.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
3+
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ function tarballClean() {
3232
rm -rvf atom5te.cache src/.deps
3333
rm -vf Makefile Makefile.in aclocal.m4 config.log config.status configure depcomp install-sh missing
3434
rm -vf man/Makefile man/Makefile.in
35-
rm -vf src/Makefile src/Makefile.in src/hstr src/hh *.o src/*.o
35+
rm -vf src/Makefile src/Makefile.in src/hstr src/hh *.o src/*.o
3636
}
3737

3838
function tarballBuildUsingAutomake() {
@@ -52,7 +52,7 @@ function tarballBuildUsingAutomake() {
5252
# platform specific detection in configure.ac
5353
cp -vf ${AUTOMAKE_LIB}/config.sub .
5454
cp -vf ${AUTOMAKE_LIB}/config.guess .
55-
else
55+
else
5656
echo "ERROR: automake ${AUTOMAKE_LIB} not found!"
5757
exit 1
5858
fi

build/tarball/tarball-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
3+
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)