Skip to content

Commit bff246c

Browse files
poddmopoddmo
authored
Synchronise repo with 2.9.4-DEV and update docs
Update docs with latest changes and standardise version numbers in all files Initial upload of files from original project repo https://git.einval.com/git/abcde.git in prep for generating debian installation (.deb) packages
1 parent 832ccdc commit bff246c

27 files changed

+3880
-5
lines changed

‎COPYING

Lines changed: 339 additions & 0 deletions
Large diffs are not rendered by default.

‎FAQ

Lines changed: 557 additions & 0 deletions
Large diffs are not rendered by default.

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
abcde_version = abcde-2.10.1-DEV1
1+
abcde_version = abcde-2.11.0-RC1
22
INSTALL = /usr/bin/install -c
33

44
prefix = /usr/local

‎README

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ MAJOR CHANGES
2727

2828
(see changelog for more details)
2929

30+
Changes in 2.11.0-RC1
31+
32+
* Updates to FLAC comment tags - Comments are being seperated to User, Disc
33+
and Track comments and CDDB extended data is used where available
34+
* Update config example for FLAC version 1.5
35+
3036
Changes in 2.10.1-RC1
3137
* Set FLAC ALBUMARTIST metadata tag for multi-artist CDs
3238
* New munge helper function: munge_simplify_punctuation, to help standardise

‎README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ My ripping objective is to create lossless music tracks (flac) for listening and
1616
- Improved handling of CD sets:
1717
- The -W option is expanded to optionally add the total number of discs in the set. These details are recorded in the FLAC metadata tags DISCNUMBER and DISCTOTAL
1818
- Create playlist defaults to append instead of erase when the disc number is greater than 1
19-
- Improved handling of metadata: CDDB extended info (EXT*) are added passed through to FLAC tags
19+
- Improved handling of FLAC COMMENT metadata:
20+
- comments added on the command line with the -w option are designated as USERCOMMENTS and added to every track
21+
- CDDB extended data (EXTD) are passed through to FLAC COMMENT tags and added to every track
22+
- CDDB extended track data (EXTTn) is passed through to FLAC COMMENT tags for the relevant track
23+
- see https://gnudb.org/gnudbformat.php for Gnudb xmcd file format
2024
- Set the FLAC ALBUMARTIST="Various Artists" metadata tag for multi-artist CDs
2125
- Define a default local album art directory/file location. If the album artwork download fails or the user chooses to overide the downloaded art, abcde will look for ALBUMARTDIR/ALBUMARTFILE before asking the user to manually enter the filename.
2226
- Created munge helper functions:

‎abcde

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# with this program; if not, write to the Free Software Foundation, Inc.,
1212
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1313

14-
VERSION='2.10.1-RC2'
14+
VERSION='2.11.0-RC1'
1515

1616
usage ()
1717
{

‎abcde.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH abcde 1 "25 August 2024" "abcde 2.10.1-RC1"
1+
.TH abcde 1 "13 April 2025" "abcde 2.11.0-RC1"
22
.SH NAME
33
abcde \- Grab an entire CD and compress it to Ogg/Vorbis, MP3, FLAC, Ogg/Speex, AAC,
44
WavPack, Monkey's Audio (ape), MPP/MP+(Musepack), True Audio (tta), MP2 format

‎abcde.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# System defaults for abcde version 2.10.1-RC2
1+
# System defaults for abcde version 2.11.0-RC1
22
# Nothing in this file is uncommented by default.
33
#
44
# If you wish to override these system-wide settings, create your own

‎changelog

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
abcde 2.11.0-RC1
2+
* New feature:
3+
+ CDDB extended info is passed into FLAC tags
4+
* Config and doc update:
5+
+ example config for multi-threaded FLAC encoding using new FLAC version 1.5
6+
* Packaging: pull in all files from upstream 2.9.4-DEV to make this project
7+
an up to date and complete repository for abcde
8+
9+
-- poddmo <https://github.com/poddmo/abcde> Mon 17 Mar 2025 18:00:00
10+
11+
abcde 2.10.1-RC2
12+
* doc and config tweaks
13+
14+
-- poddmo <https://github.com/poddmo/abcde> Sat 26 Oct 2024 18:00:00
15+
116
abcde 2.10.1-RC1
217

318
* New features:

‎debian/changelog

Lines changed: 1857 additions & 0 deletions
Large diffs are not rendered by default.

‎debian/compat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
10

‎debian/control

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Source: abcde
2+
Section: sound
3+
Priority: optional
4+
Maintainer: Steve McIntyre <[email protected]>
5+
Homepage: https://abcde.einval.com/
6+
Standards-Version: 4.3.0
7+
Build-Depends: debhelper (>= 10)
8+
Vcs-Browser: https://git.einval.com/cgi-bin/gitweb.cgi?p=abcde.git;a=summary
9+
Vcs-Git: https://git.einval.com/git/abcde.git
10+
11+
Package: abcde
12+
Architecture: all
13+
Depends: ${misc:Depends}, cd-discid, wget, cdparanoia | icedax, vorbis-tools (>= 1.0beta4-1) | lame | flac | speex | musepack-tools | opus-tools, libmusicbrainz-discid-perl, libwebservice-musicbrainz-perl (>= 1.0.4-1.1), sensible-utils
14+
Recommends: vorbis-tools, libdigest-sha-perl, bsd-mailx, glyrc, imagemagick
15+
Suggests: eject, distmp3, id3 (>= 0.12), id3v2, eyed3 (<< 0.7~),
16+
normalize-audio, vorbisgain, mkcue, mp3gain, atomicparsley
17+
Description: A Better CD Encoder
18+
frontend program to cdparanoia, wget, cd-discid, id3, and your
19+
favorite Ogg/Vorbis, MP3, FLAC, Ogg/Speex, M4A, Opus, WavPack,
20+
Monkey's Audio (ape), MPP/MP+(Musepack) and/or AIFF format encoder
21+
(defaults to oggenc). Grabs an entire CD and converts each track to
22+
the specified formats and then comments or tags each file, with
23+
one command.
24+
.
25+
With abcde you can encode several formats with one single command,
26+
using a single CD read operation. It also allows you to read and
27+
encode while not on the internet, and later query a CDDB or
28+
Musicbrainz server to lookup metadata and tag your files.

‎debian/copyright

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
The software was originally developed by Robert Woodcock <[email protected]>.
2+
It was also debianized by Robert Woodcock on Sun, 21 Feb 1999 18:50:34 -0800.
3+
4+
It is available at: https://abcde.einval.com/wiki/
5+
6+
Copyright:
7+
8+
Copyright (c) 1998-2001 Robert Woodcock <[email protected]>
9+
Copyright (c) 2003-2009 Jesus Climent <[email protected]>
10+
Copyright (c) 2009-2012 Colin Tuckley <[email protected]>
11+
Copyright (c) 2012- Steve McIntyre <[email protected]>
12+
Copyright (c) 2015- Andrew Strong <[email protected]>
13+
14+
and many other contributors
15+
16+
This code is hereby licensed for public consumption under either the
17+
GNU GPL v2 or greater, or Larry Wall's Artistic license - your choice.
18+
19+
You should have received a copy of the GNU General Public License
20+
along with this program; if not, write to the Free Software
21+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
22+
23+
An earlier abcde copyright included the text:
24+
25+
Copyright for this work is to expire January 1, 2010, after which it
26+
shall be public domain.
27+
28+
However, later versions (2.6 onwards) have been developed solely using
29+
the GPL. Earlier versions are still available in various places if
30+
you'd rather have the public domain code.
31+
32+
See /usr/share/common-licenses/GPL-2
33+

‎debian/dirs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
etc
2+
usr/bin

‎debian/docs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
README
2+
changelog
3+
FAQ

‎debian/preinst

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/sh -e
2+
# If:
3+
# * this isn't an upgrade (a fresh install)
4+
# * and /etc/cdgrab.conf exists
5+
# * and /etc/abcde.conf doesn't
6+
# copy /etc/cdgrab.conf to /etc/abcde.conf
7+
8+
if [ "$1" != "install" ]
9+
then
10+
exit 0
11+
fi
12+
if [ "$2" != "" ]
13+
then
14+
exit 0
15+
fi
16+
if [ -f /etc/abcde.conf ]
17+
then
18+
exit 0
19+
fi
20+
if [ -r /etc/cdgrab.conf ]
21+
then
22+
echo Copying old /etc/cdgrab.conf to /etc/abcde.conf...
23+
cp -a /etc/cdgrab.conf /etc/abcde.conf
24+
exit 0
25+
fi
26+
#DEBHELPER#

‎debian/rules

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
#!/usr/bin/make -f
2+
# Made with the aid of dh_make, by Craig Small
3+
# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
4+
# Some lines taken from debmake, by Cristoph Lameter.
5+
6+
# Uncomment this to turn on verbose mode.
7+
#export DH_VERBOSE=1
8+
9+
build: build-arch build-indep
10+
build-arch: build-stamp
11+
build-indep: build-stamp
12+
build-stamp:
13+
dh_testdir
14+
15+
# Add here commands to compile the package.
16+
$(MAKE)
17+
18+
touch build-stamp
19+
20+
clean:
21+
dh_testdir
22+
dh_testroot
23+
rm -f build-stamp install-stamp
24+
25+
# Add here commands to clean up after the build process.
26+
[ ! -f Makefile ] || $(MAKE) clean
27+
28+
dh_clean
29+
30+
install: install-stamp
31+
install-stamp: build-stamp
32+
dh_testdir
33+
dh_testroot
34+
dh_prep
35+
dh_installdirs
36+
37+
# Add here commands to install the package into debian/abcde.
38+
$(MAKE) install DESTDIR=`pwd`/debian/abcde prefix=/usr sysconfdir=/etc docdir=/usr/share/doc/abcde
39+
rm -f `pwd`/debian/abcde/usr/share/doc/abcde/COPYING*
40+
install -d `pwd`/debian/abcde/usr/share/doc/abcde/examples
41+
install -m 644 examples/* `pwd`/debian/abcde/usr/share/doc/abcde/examples
42+
43+
touch install-stamp
44+
45+
# Build architecture-independent files here.
46+
binary-indep: build install
47+
# dh_testversion
48+
dh_testdir
49+
dh_testroot
50+
dh_installdocs
51+
dh_installexamples
52+
dh_installmenu
53+
dh_installman
54+
dh_installchangelogs
55+
dh_link
56+
dh_strip
57+
dh_compress
58+
dh_fixperms
59+
dh_installdeb
60+
dh_shlibdeps
61+
dh_gencontrol
62+
# dh_makeshlibs
63+
dh_md5sums
64+
dh_builddeb
65+
66+
# Build architecture-dependent files here.
67+
binary-arch: build install
68+
# We have nothing to do by default.
69+
70+
source diff:
71+
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
72+
73+
binary: binary-indep binary-arch
74+
.PHONY: build clean binary-indep binary-arch binary

‎debian/source/format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0 (quilt)

‎debian/source/lintian-overrides

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
abcde source: description-synopsis-starts-with-article
2+
# The description is an expansion of the package name, which just
3+
# happens to begin with an "article"

‎debian/watch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
version=3
2+
https://abcde.einval.com/download/abcde-([0-9.]+).tar.gz

‎examples/abcde.init

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#!/bin/sh
2+
3+
##########
4+
# The first argument tells what to do.
5+
##########
6+
7+
RUNNING=`ps -ef|grep [a]bcded|awk '{ print $2 }'`
8+
9+
state=$1
10+
11+
case $state in
12+
start)
13+
14+
if [ -n "$RUNNING" ]; then
15+
echo "abcde daemon already running."
16+
exit 0
17+
fi
18+
19+
echo "Starting abcde daemon"
20+
abcded &
21+
echo "Done."
22+
;;
23+
stop)
24+
if [ -n "$RUNNING" ]; then
25+
/bin/kill -9 $RUNNING > /dev/null
26+
if [ $? = 0 ]; then
27+
echo "abcde daemon killed"
28+
fi
29+
fi
30+
;;
31+
restart)
32+
$0 stop
33+
$0 start
34+
;;
35+
*)
36+
echo "Usage: $0 {start|stop|restart}"
37+
exit 1
38+
esac
39+

0 commit comments

Comments
 (0)