From afcef00afe30374790ff8b2494ed46e7ffa3b19e Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 24 Jan 2021 14:38:25 +0000 Subject: prepare next release --- .version | 2 +- Makefile | 14 +----- README.pod | 2 +- changelog | 101 ++++++++++++++++++++++++++++++++++++++++ debian/README | 7 --- debian/changelog | 95 ------------------------------------- debian/compat | 1 - debian/control | 15 ------ debian/copyright | 28 ----------- debian/photoalbum.debhelper.log | 45 ------------------ debian/photoalbum.manpages | 1 - debian/rules | 13 ------ docs/photoalbum.1 | 35 ++++++++------ docs/photoalbum.txt | 3 +- 14 files changed, 129 insertions(+), 233 deletions(-) create mode 100644 changelog delete mode 100644 debian/README delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/photoalbum.debhelper.log delete mode 100644 debian/photoalbum.manpages delete mode 100755 debian/rules diff --git a/.version b/.version index 6f2743d..0bfccb0 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -0.4.4 +0.4.5 diff --git a/Makefile b/Makefile index 958d056..ad5131e 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ clean: test -d ./bin && rm -Rf ./bin || exit 0 test -d ./debian/photoalbum && rm -Rf ./debian/photoalbum || exit 0 version: - cut -d' ' -f2 debian/changelog | head -n 1 | sed 's/(//;s/)//' > .version + cut -d' ' -f2 changelog | head -n 1 | sed 's/(//;s/)//' > .version # Builds the documentation into a manpage documentation: pod2man --release="$(NAME) $$(cat .version)" \ @@ -27,21 +27,11 @@ documentation: pod2text ./docs/$(NAME).pod > ./docs/$(NAME).txt # For github page cp ./docs/$(NAME).pod README.pod -deb: all - dpkg-buildpackage -dch: - dch -i -dput: - dput -u wheezy-buetowdotorg ../$(NAME)_$$(cat ./.version)_amd64.changes - dput -u jessie-buetowdotorg ../$(NAME)_$$(cat ./.version)_amd64.changes -release: all dch deb dput +release: all bash -c "git tag $$(cat .version)" git push --tags git commit -a -m 'New release' git push origin master clean-top: rm ../$(NAME)_*.tar.gz - rm ../$(NAME)_*.dsc rm ../$(NAME)_*.changes - rm ../$(NAME)_*.deb - diff --git a/README.pod b/README.pod index 242860f..829b6b9 100644 --- a/README.pod +++ b/README.pod @@ -4,7 +4,7 @@ photoalbum - photoalbum is a minimal bash script for linux to generate static we =head1 SYNOPSIS -photoalbum clean|version|generate [rcfile] +photoalbum clean|generate|version|recursive:DIR [rcfile] photoalbum makemake =over diff --git a/changelog b/changelog new file mode 100644 index 0000000..a7a8ee6 --- /dev/null +++ b/changelog @@ -0,0 +1,101 @@ +photoalbum (0.4.5) stable; urgency=low + + * Remove all dependencies to Debian - it's a stand alone script now + + -- Paul Buetow Sun, 24 Jan 2021 14:37:01 +0000 + +photoalbum (0.4.4) stable; urgency=low + + * Add README.pod for Github page + + -- Paul Buetow Sun, 22 Jun 2014 11:38:14 +0200 + +photoalbum (0.4.3) stable; urgency=low + + * Merge + + -- Paul Buetow Sat, 14 Jun 2014 14:46:53 +0200 + +photoalbum (0.4.2) stable; urgency=low + + * Add Package for Debian Jessie + + -- Paul Buetow Sat, 14 Jun 2014 14:45:57 +0200 + +photoalbum (0.4.1) stable; urgency=low + + * Fix the version string + + -- Paul Buetow Tue, 13 May 2014 22:16:57 +0200 + +photoalbum (0.4.0) stable; urgency=low + + * Support of sub-albums including album overview page + * Add makemake argument + * Remove all argument + * Dont scale image if destination already exists + * Major refactoring of the bash code + + -- Paul Buetow Tue, 13 May 2014 22:09:28 +0200 + +photoalbum (0.3.1develop) stable; urgency=low + + * Dev version + + -- Paul Buetow Wed, 07 May 2014 14:58:51 +0200 + +photoalbum (0.3.0) stable; urgency=low + + * Add another template set: minimal + * Add possibility to specify a custom config file (rcfile) path + * Minor bugfixing + + -- Paul Buetow Sun, 16 Feb 2014 12:34:45 +0100 + +photoalbum (0.2.3) stable; urgency=low + + * Tarballs do have the extension .tar and not ..tar + * Images do have the file name $NAME.$TYPE and not just $NAME$TYPE + * Fix the version string + + -- Paul Buetow Sat, 11 Jan 2014 13:42:44 +0100 + +photoalbum (0.2.2) stable; urgency=low + + * Some cosmetic source code fixes + + -- Paul Buetow Sat, 11 Jan 2014 13:22:15 +0100 + +photoalbum (0.2.1) stable; urgency=low + + * Re-tagging due to some irritation + + -- Paul Buetow Sat, 11 Jan 2014 12:35:16 +0100 + +photoalbum (0.2.0) stable; urgency=low + + * Add support for tarball-inclusion + + * Bugfix: Remove the __ prefix from the image files + + -- Paul Buetow Fri, 03 Jan 2014 23:14:47 +0100 + +photoalbum (0.1.2) stable; urgency=low + + * add copyright header + + * remove obsolete changelog entry + + -- Paul Buetow Sun, 29 Dec 2013 17:39:32 +0100 + +photoalbum (0.1.1) stable; urgency=low + + * fix the version string + + -- Paul Buetow Sun, 29 Dec 2013 15:39:32 +0100 + +photoalbum (0.1.0) stable; urgency=low + + * initial version with a debian package which actually works. + + -- Paul Buetow Sun, 29 Dec 2013 15:19:49 +0100 diff --git a/debian/README b/debian/README deleted file mode 100644 index b0eda5d..0000000 --- a/debian/README +++ /dev/null @@ -1,7 +0,0 @@ -The Debian Package photoalbum ----------------------------- - -This is just a hobby project. Not sure if everything meets the debian -policy though. - - -- Paul Buetow Fri, 27 Dec 2013 15:23:53 +0200 diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 39a53d6..0000000 --- a/debian/changelog +++ /dev/null @@ -1,95 +0,0 @@ -photoalbum (0.4.4) stable; urgency=low - - * Add README.pod for Github page - - -- Paul Buetow Sun, 22 Jun 2014 11:38:14 +0200 - -photoalbum (0.4.3) stable; urgency=low - - * Merge - - -- Paul Buetow Sat, 14 Jun 2014 14:46:53 +0200 - -photoalbum (0.4.2) stable; urgency=low - - * Add Package for Debian Jessie - - -- Paul Buetow Sat, 14 Jun 2014 14:45:57 +0200 - -photoalbum (0.4.1) stable; urgency=low - - * Fix the version string - - -- Paul Buetow Tue, 13 May 2014 22:16:57 +0200 - -photoalbum (0.4.0) stable; urgency=low - - * Support of sub-albums including album overview page - * Add makemake argument - * Remove all argument - * Dont scale image if destination already exists - * Major refactoring of the bash code - - -- Paul Buetow Tue, 13 May 2014 22:09:28 +0200 - -photoalbum (0.3.1develop) stable; urgency=low - - * Dev version - - -- Paul Buetow Wed, 07 May 2014 14:58:51 +0200 - -photoalbum (0.3.0) stable; urgency=low - - * Add another template set: minimal - * Add possibility to specify a custom config file (rcfile) path - * Minor bugfixing - - -- Paul Buetow Sun, 16 Feb 2014 12:34:45 +0100 - -photoalbum (0.2.3) stable; urgency=low - - * Tarballs do have the extension .tar and not ..tar - * Images do have the file name $NAME.$TYPE and not just $NAME$TYPE - * Fix the version string - - -- Paul Buetow Sat, 11 Jan 2014 13:42:44 +0100 - -photoalbum (0.2.2) stable; urgency=low - - * Some cosmetic source code fixes - - -- Paul Buetow Sat, 11 Jan 2014 13:22:15 +0100 - -photoalbum (0.2.1) stable; urgency=low - - * Re-tagging due to some irritation - - -- Paul Buetow Sat, 11 Jan 2014 12:35:16 +0100 - -photoalbum (0.2.0) stable; urgency=low - - * Add support for tarball-inclusion - - * Bugfix: Remove the __ prefix from the image files - - -- Paul Buetow Fri, 03 Jan 2014 23:14:47 +0100 - -photoalbum (0.1.2) stable; urgency=low - - * add copyright header - - * remove obsolete changelog entry - - -- Paul Buetow Sun, 29 Dec 2013 17:39:32 +0100 - -photoalbum (0.1.1) stable; urgency=low - - * fix the version string - - -- Paul Buetow Sun, 29 Dec 2013 15:39:32 +0100 - -photoalbum (0.1.0) stable; urgency=low - - * initial version with a debian package which actually works. - - -- Paul Buetow Sun, 29 Dec 2013 15:19:49 +0100 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 45a4fb7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/debian/control b/debian/control deleted file mode 100644 index 3f24573..0000000 --- a/debian/control +++ /dev/null @@ -1,15 +0,0 @@ -Source: photoalbum -Section: utils -Priority: optional -Maintainer: Paul Buetow -Build-Depends: perl, make -Standards-Version: 3.9.2 -Homepage: http://photoalbum.buetow.org -Vcs-Git: https://github.com/snonux/photoalbum.git -Vcs-Browser: https://github.com/snonux/photoalbum - -Package: photoalbum -Architecture: all -Depends: ${shlibs:Depends} -Description: A tiny Bash script to build a static photo album. - Simple. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 9f32793..0000000 --- a/debian/copyright +++ /dev/null @@ -1,28 +0,0 @@ -Format: http://dep.debian.net/deps/dep5 -Upstream-Name: photoalbum -Source: http://photoalbum.buetow.org - -Files: * -Copyright: 2012 Paul Buetow -License: GPL-3.0+ - -Files: debian/* -Copyright: 2012 Paul Buetow -License: GPL-3.0+ - -License: GPL-3.0+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/debian/photoalbum.debhelper.log b/debian/photoalbum.debhelper.log deleted file mode 100644 index 545a50f..0000000 --- a/debian/photoalbum.debhelper.log +++ /dev/null @@ -1,45 +0,0 @@ -dh_auto_configure -dh_auto_build -dh_auto_test -dh_prep -dh_installdirs -dh_auto_install -dh_install -dh_installdocs -dh_installchangelogs -dh_installexamples -dh_installman -dh_installcatalogs -dh_installcron -dh_installdebconf -dh_installemacsen -dh_installifupdown -dh_installinfo -dh_pysupport -dh_installinit -dh_installmenu -dh_installmime -dh_installmodules -dh_installlogcheck -dh_installlogrotate -dh_installpam -dh_installppp -dh_installudev -dh_installwm -dh_installxfonts -dh_installgsettings -dh_bugfiles -dh_ucf -dh_lintian -dh_gconf -dh_icons -dh_perl -dh_usrlocal -dh_link -dh_compress -dh_fixperms -dh_installdeb -dh_gencontrol -dh_md5sums -dh_builddeb -dh_builddeb diff --git a/debian/photoalbum.manpages b/debian/photoalbum.manpages deleted file mode 100644 index e232aca..0000000 --- a/debian/photoalbum.manpages +++ /dev/null @@ -1 +0,0 @@ -docs/photoalbum.1 diff --git a/debian/rules b/debian/rules deleted file mode 100755 index b760bee..0000000 --- a/debian/rules +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -%: - dh $@ diff --git a/docs/photoalbum.1 b/docs/photoalbum.1 index 1e8e618..e9878ae 100644 --- a/docs/photoalbum.1 +++ b/docs/photoalbum.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,27 +38,36 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" -.\" If the F register is turned on, we'll generate index entries on stderr for +.\" If the F register is >0, we'll generate index entries on stderr for .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{\ +. if \nF \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{\ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "PHOTOALBUM 1" -.TH PHOTOALBUM 1 "2014-05-13" "photoalbum 0.4.4" "User Commands" +.TH PHOTOALBUM 1 "2021-01-24" "photoalbum 0.4.5" "User Commands" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -133,7 +142,7 @@ photoalbum \- photoalbum is a minimal bash script for linux to generate static web photo albums. .SH "SYNOPSIS" .IX Header "SYNOPSIS" -photoalbum clean|version|generate [rcfile] +photoalbum clean|generate|version|recursive:DIR [rcfile] photoalbum makemake .IP "clean" 4 .IX Item "clean" @@ -163,7 +172,7 @@ Creates a Makefile and photoalbumrc in the current working directory. .PP It is possible to specify a custom rcfile path too. .PP -\fI\s-1HTML\s0 \s-1TEMPLATES\s0\fR +\fI\s-1HTML TEMPLATES\s0\fR .IX Subsection "HTML TEMPLATES" .PP Go to the templates directory and edit them as wished. diff --git a/docs/photoalbum.txt b/docs/photoalbum.txt index 093e3a4..c0a7a51 100644 --- a/docs/photoalbum.txt +++ b/docs/photoalbum.txt @@ -3,7 +3,8 @@ NAME static web photo albums. SYNOPSIS - photoalbum clean|version|generate [rcfile] photoalbum makemake + photoalbum clean|generate|version|recursive:DIR [rcfile] photoalbum + makemake clean Cleans up the working space -- cgit v1.2.3