[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#959743: marked as done (flactag: diff for NMU version 2.0.4-5.1)



Your message dated Fri, 3 Sep 2021 17:20:25 +0200
with message-id <YTI9OWkTsFAowKSe@ramacher.at>
and subject line Re: Bug#959743: flactag: diff for NMU version 2.0.4-5.1
has caused the Debian Bug report #959743,
regarding flactag: diff for NMU version 2.0.4-5.1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
959743: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959743
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: flactag
Version: 2.0.4-5
Severity: normal
Tags: patch  pending


Dear maintainer,

I've prepared an NMU for flactag (versioned as 2.0.4-5.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru flactag-2.0.4/debian/changelog flactag-2.0.4/debian/changelog
--- flactag-2.0.4/debian/changelog	2015-07-09 12:33:14.000000000 +0200
+++ flactag-2.0.4/debian/changelog	2020-05-04 19:07:44.000000000 +0200
@@ -1,3 +1,16 @@
+flactag (2.0.4-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply changes from VCS.
+  * Update uploaders. (Closes: #953462)
+  * Fix "checkflac hardcodes device" by cherry-picking upstream fix.
+    (Closes: #736458)
+  * Fix "checkflac usage" by cherry-picking upstream fix. (Closes:# 800802)
+  * Use discid_read_sparse if available -- apply patch from Sebastian
+    Ramacher. (Closes: #736445)
+
+ -- Tobias Frost <tobi@debian.org>  Mon, 04 May 2020 19:07:44 +0200
+
 flactag (2.0.4-5) unstable; urgency=medium
 
   * Team upload.
diff -Nru flactag-2.0.4/debian/control flactag-2.0.4/debian/control
--- flactag-2.0.4/debian/control	2015-07-09 12:32:48.000000000 +0200
+++ flactag-2.0.4/debian/control	2020-05-04 19:07:44.000000000 +0200
@@ -1,13 +1,13 @@
 Source: flactag
 Section: sound
 Priority: optional
-Maintainer: Debian Multimedia Team <pkg-multimedia-maintainers@lists.alioth.debian.org>
-Uploaders: Daniel Pocock <daniel@pocock.pro>, Andy Hawkins <andy@gently.org.uk>
+Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
+Uploaders: Andy Hawkins <andy@gently.org.uk>
 Build-Depends: cdbs, debhelper (>=8),libmusicbrainz5-dev(>=5.1.0+git20150707),libdiscid-dev,libslang2-dev,libflac++-dev,libneon27-gnutls-dev,libjpeg-dev,libunac1-dev,asciidoc,xmlto,pkg-config,dpkg-dev(>=1.16.1~),dh-autoreconf
 Standards-Version: 3.9.6
 Homepage: http://flactag.sourceforge.net/
-Vcs-Git: git://anonscm.debian.org/pkg-multimedia/flactag.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/flactag.git
+Vcs-Git: https://salsa.debian.org/multimedia-team/flactag.git
+Vcs-Browser: https://salsa.debian.org/multimedia-team/flactag
 
 Package: flactag
 Architecture: any
diff -Nru flactag-2.0.4/debian/patches/checkflac_usage.patch flactag-2.0.4/debian/patches/checkflac_usage.patch
--- flactag-2.0.4/debian/patches/checkflac_usage.patch	1970-01-01 01:00:00.000000000 +0100
+++ flactag-2.0.4/debian/patches/checkflac_usage.patch	2020-05-04 19:07:44.000000000 +0200
@@ -0,0 +1,58 @@
+Description: make script more resiliant
+  checkflac: make script more resilient for filenames containing spaces or colon
+Origin: https://github.com/adhawkins/flactag/commit/346d0ad569d7f6bf0a8232975712a42991a5650c
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800802
+Forwarded: not-needed
+Applied-Upstream: See Origin.
+Last-Update: 2020-05-04 <YYYY-MM-DD, last update of the meta-information, optional>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/checkflac
++++ b/checkflac
+@@ -11,24 +11,40 @@
+ 	FILENAME="$1"
+ 	
+ 	CDID=`discid $CDROM`
+-	FLACID=`flactag --discid $FILENAME | cut -d':' -f 2| cut -d' ' -f 2`
++	if [ -z "${CDID}" ]
++	then
++		echo "Failed to get disc ID from ${CDROM}"
++		exit 1
++	fi
++
++	FLACID=`flactag --discid "${FILENAME}" | rev | cut -d' ' -f1 | rev`
++	if [ -z "${FLACID}" ]
++	then
++		echo "Failed to get disc ID from FLAC file ${FILENAME}"
++		exit 1
++	fi
+ 
+ 	if [ "$FLACID" != "$CDID" ]
+ 	then
+ 		echo "**********"
+ 		echo "**********"
+ 		echo "**********"
+-		echo "********** Disc ID of FLAC doesn't match Disc ID of CD  **********"
+-		echo "********** Please re-rip this CD and remove any invalid **********"
+-		echo "********** disc IDs from the MusicBrainz service        **********"
++                echo "********** Disc ID of CD:   ${CDID}"
++                echo "********** Disc ID of FLAC: ${FLACID} * INVALID *"
++                echo "**********"
++		echo "********** Disc ID of FLAC doesn't match Disc ID of CD   ***********"
++		echo "********** Please re-rip this CD and remove any invalid  ***********"
++		echo "********** disc IDs from the MusicBrainz service         ***********"
+ 		echo "**********"
+ 		echo "**********"
+ 		echo "**********"
++		exit 2
+ 	else
+-		echo "IDs match, disk is OK"
++		echo "IDs match, FLAC file is OK"
++		exit 0
+ 	fi
+ else
+ 	echo "Usage: $0 flacfile"
++	exit 1
+ fi
+ 
+-
diff -Nru flactag-2.0.4/debian/patches/hardcoded_cdrom.patch flactag-2.0.4/debian/patches/hardcoded_cdrom.patch
--- flactag-2.0.4/debian/patches/hardcoded_cdrom.patch	1970-01-01 01:00:00.000000000 +0100
+++ flactag-2.0.4/debian/patches/hardcoded_cdrom.patch	2020-05-04 19:07:44.000000000 +0200
@@ -0,0 +1,22 @@
+Description: Fix hardcoded cdrom device.
+Origin: https://github.com/adhawkins/flactag/commit/cd14b51a1a49755e743d6cb6f44464e45d21de51.patch
+Bug-Debian: https://bugs.debian.org/736458
+Forwarded: not-needed
+Applied-Upstream: see origin.
+Last-Update: 2020-05-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/checkflac
++++ b/checkflac
+@@ -1,6 +1,10 @@
+ #!/bin/sh
++set -e
+ 
+-CDROM=/dev/hdc
++if [ -z "$CDROM" ];
++then
++  CDROM=/dev/cdrom
++fi
+ 
+ if [ $# = "1" ]
+ then
diff -Nru flactag-2.0.4/debian/patches/series flactag-2.0.4/debian/patches/series
--- flactag-2.0.4/debian/patches/series	2015-07-09 12:32:48.000000000 +0200
+++ flactag-2.0.4/debian/patches/series	2020-05-04 19:07:44.000000000 +0200
@@ -1 +1,4 @@
+use_discid_read_sparse.patch
+hardcoded_cdrom.patch
+checkflac_usage.patch
 libmusicbrainz5cc.patch
diff -Nru flactag-2.0.4/debian/patches/use_discid_read_sparse.patch flactag-2.0.4/debian/patches/use_discid_read_sparse.patch
--- flactag-2.0.4/debian/patches/use_discid_read_sparse.patch	1970-01-01 01:00:00.000000000 +0100
+++ flactag-2.0.4/debian/patches/use_discid_read_sparse.patch	2020-05-04 19:07:44.000000000 +0200
@@ -0,0 +1,26 @@
+Description: use discid_read_sparse if available
+ In version 0.5.0 of libdiscid discid_read_sparce got added. This
+ function allows to specify what should be read from the disc. Using this
+ function one can avoid reading of the MCN of the disc and ISRCs from the
+ tracks. Only the disc ID is used and nothing else, so it is not
+ necessary to read the other information.
+Author: Sebastian Ramacher <sramacher@debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=736445
+Forwarded: https://github.com/adhawkins/flactag/pull/1
+Last-Update: 2020-05-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/DiscIDWrapper.cc
++++ b/DiscIDWrapper.cc
+@@ -40,7 +40,11 @@
+ 
+ bool CDiscIDWrapper::FromDevice(const std::string& Device)
+ {
++#if defined(DISCID_VERSION_MAJOR) && (DISCID_VERSION_MAJOR > 0 || (DISCID_VERSION_MAJOR == 0 && DISCID_VERSION_MINOR >= 4))
++	return discid_read_sparse(m_DiscID,Device.c_str(),DISCID_FEATURE_READ);
++#else
+ 	return discid_read(m_DiscID,Device.c_str());
++#endif
+ }
+ 
+ bool CDiscIDWrapper::FromCuesheet(const CCuesheet& Cuesheet)
diff -Nru flactag-2.0.4/debian/watch flactag-2.0.4/debian/watch
--- flactag-2.0.4/debian/watch	2015-04-26 13:43:48.000000000 +0200
+++ flactag-2.0.4/debian/watch	2020-05-04 19:06:48.000000000 +0200
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/flactag/flactag-(.+)\.tar\.gz
+https://sf.net/flactag/flactag-(.+)\.tar\.gz

--- End Message ---
--- Begin Message ---
Version: 2.0.4-6

On 2020-05-04 21:18:47 +0200, Tobias Frost wrote:
> Package: flactag
> Version: 2.0.4-5
> Severity: normal
> Tags: patch  pending
> 
> 
> Dear maintainer,
> 
> I've prepared an NMU for flactag (versioned as 2.0.4-5.1) and
> uploaded it to DELAYED/10. Please feel free to tell me if I
> should delay it longer.

Thanks, integrated in the last upload.

Cheers

> 
> Regards.
> 

> diff -Nru flactag-2.0.4/debian/changelog flactag-2.0.4/debian/changelog
> --- flactag-2.0.4/debian/changelog	2015-07-09 12:33:14.000000000 +0200
> +++ flactag-2.0.4/debian/changelog	2020-05-04 19:07:44.000000000 +0200
> @@ -1,3 +1,16 @@
> +flactag (2.0.4-5.1) UNRELEASED; urgency=medium
> +
> +  * Non-maintainer upload.
> +  * Apply changes from VCS.
> +  * Update uploaders. (Closes: #953462)
> +  * Fix "checkflac hardcodes device" by cherry-picking upstream fix.
> +    (Closes: #736458)
> +  * Fix "checkflac usage" by cherry-picking upstream fix. (Closes:# 800802)
> +  * Use discid_read_sparse if available -- apply patch from Sebastian
> +    Ramacher. (Closes: #736445)
> +
> + -- Tobias Frost <tobi@debian.org>  Mon, 04 May 2020 19:07:44 +0200
> +
>  flactag (2.0.4-5) unstable; urgency=medium
>  
>    * Team upload.
> diff -Nru flactag-2.0.4/debian/control flactag-2.0.4/debian/control
> --- flactag-2.0.4/debian/control	2015-07-09 12:32:48.000000000 +0200
> +++ flactag-2.0.4/debian/control	2020-05-04 19:07:44.000000000 +0200
> @@ -1,13 +1,13 @@
>  Source: flactag
>  Section: sound
>  Priority: optional
> -Maintainer: Debian Multimedia Team <pkg-multimedia-maintainers@lists.alioth.debian.org>
> -Uploaders: Daniel Pocock <daniel@pocock.pro>, Andy Hawkins <andy@gently.org.uk>
> +Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
> +Uploaders: Andy Hawkins <andy@gently.org.uk>
>  Build-Depends: cdbs, debhelper (>=8),libmusicbrainz5-dev(>=5.1.0+git20150707),libdiscid-dev,libslang2-dev,libflac++-dev,libneon27-gnutls-dev,libjpeg-dev,libunac1-dev,asciidoc,xmlto,pkg-config,dpkg-dev(>=1.16.1~),dh-autoreconf
>  Standards-Version: 3.9.6
>  Homepage: http://flactag.sourceforge.net/
> -Vcs-Git: git://anonscm.debian.org/pkg-multimedia/flactag.git
> -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/flactag.git
> +Vcs-Git: https://salsa.debian.org/multimedia-team/flactag.git
> +Vcs-Browser: https://salsa.debian.org/multimedia-team/flactag
>  
>  Package: flactag
>  Architecture: any
> diff -Nru flactag-2.0.4/debian/patches/checkflac_usage.patch flactag-2.0.4/debian/patches/checkflac_usage.patch
> --- flactag-2.0.4/debian/patches/checkflac_usage.patch	1970-01-01 01:00:00.000000000 +0100
> +++ flactag-2.0.4/debian/patches/checkflac_usage.patch	2020-05-04 19:07:44.000000000 +0200
> @@ -0,0 +1,58 @@
> +Description: make script more resiliant
> +  checkflac: make script more resilient for filenames containing spaces or colon
> +Origin: https://github.com/adhawkins/flactag/commit/346d0ad569d7f6bf0a8232975712a42991a5650c
> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800802
> +Forwarded: not-needed
> +Applied-Upstream: See Origin.
> +Last-Update: 2020-05-04 <YYYY-MM-DD, last update of the meta-information, optional>
> +---
> +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
> +--- a/checkflac
> ++++ b/checkflac
> +@@ -11,24 +11,40 @@
> + 	FILENAME="$1"
> + 	
> + 	CDID=`discid $CDROM`
> +-	FLACID=`flactag --discid $FILENAME | cut -d':' -f 2| cut -d' ' -f 2`
> ++	if [ -z "${CDID}" ]
> ++	then
> ++		echo "Failed to get disc ID from ${CDROM}"
> ++		exit 1
> ++	fi
> ++
> ++	FLACID=`flactag --discid "${FILENAME}" | rev | cut -d' ' -f1 | rev`
> ++	if [ -z "${FLACID}" ]
> ++	then
> ++		echo "Failed to get disc ID from FLAC file ${FILENAME}"
> ++		exit 1
> ++	fi
> + 
> + 	if [ "$FLACID" != "$CDID" ]
> + 	then
> + 		echo "**********"
> + 		echo "**********"
> + 		echo "**********"
> +-		echo "********** Disc ID of FLAC doesn't match Disc ID of CD  **********"
> +-		echo "********** Please re-rip this CD and remove any invalid **********"
> +-		echo "********** disc IDs from the MusicBrainz service        **********"
> ++                echo "********** Disc ID of CD:   ${CDID}"
> ++                echo "********** Disc ID of FLAC: ${FLACID} * INVALID *"
> ++                echo "**********"
> ++		echo "********** Disc ID of FLAC doesn't match Disc ID of CD   ***********"
> ++		echo "********** Please re-rip this CD and remove any invalid  ***********"
> ++		echo "********** disc IDs from the MusicBrainz service         ***********"
> + 		echo "**********"
> + 		echo "**********"
> + 		echo "**********"
> ++		exit 2
> + 	else
> +-		echo "IDs match, disk is OK"
> ++		echo "IDs match, FLAC file is OK"
> ++		exit 0
> + 	fi
> + else
> + 	echo "Usage: $0 flacfile"
> ++	exit 1
> + fi
> + 
> +-
> diff -Nru flactag-2.0.4/debian/patches/hardcoded_cdrom.patch flactag-2.0.4/debian/patches/hardcoded_cdrom.patch
> --- flactag-2.0.4/debian/patches/hardcoded_cdrom.patch	1970-01-01 01:00:00.000000000 +0100
> +++ flactag-2.0.4/debian/patches/hardcoded_cdrom.patch	2020-05-04 19:07:44.000000000 +0200
> @@ -0,0 +1,22 @@
> +Description: Fix hardcoded cdrom device.
> +Origin: https://github.com/adhawkins/flactag/commit/cd14b51a1a49755e743d6cb6f44464e45d21de51.patch
> +Bug-Debian: https://bugs.debian.org/736458
> +Forwarded: not-needed
> +Applied-Upstream: see origin.
> +Last-Update: 2020-05-04
> +---
> +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
> +--- a/checkflac
> ++++ b/checkflac
> +@@ -1,6 +1,10 @@
> + #!/bin/sh
> ++set -e
> + 
> +-CDROM=/dev/hdc
> ++if [ -z "$CDROM" ];
> ++then
> ++  CDROM=/dev/cdrom
> ++fi
> + 
> + if [ $# = "1" ]
> + then
> diff -Nru flactag-2.0.4/debian/patches/series flactag-2.0.4/debian/patches/series
> --- flactag-2.0.4/debian/patches/series	2015-07-09 12:32:48.000000000 +0200
> +++ flactag-2.0.4/debian/patches/series	2020-05-04 19:07:44.000000000 +0200
> @@ -1 +1,4 @@
> +use_discid_read_sparse.patch
> +hardcoded_cdrom.patch
> +checkflac_usage.patch
>  libmusicbrainz5cc.patch
> diff -Nru flactag-2.0.4/debian/patches/use_discid_read_sparse.patch flactag-2.0.4/debian/patches/use_discid_read_sparse.patch
> --- flactag-2.0.4/debian/patches/use_discid_read_sparse.patch	1970-01-01 01:00:00.000000000 +0100
> +++ flactag-2.0.4/debian/patches/use_discid_read_sparse.patch	2020-05-04 19:07:44.000000000 +0200
> @@ -0,0 +1,26 @@
> +Description: use discid_read_sparse if available
> + In version 0.5.0 of libdiscid discid_read_sparce got added. This
> + function allows to specify what should be read from the disc. Using this
> + function one can avoid reading of the MCN of the disc and ISRCs from the
> + tracks. Only the disc ID is used and nothing else, so it is not
> + necessary to read the other information.
> +Author: Sebastian Ramacher <sramacher@debian.org>
> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=736445
> +Forwarded: https://github.com/adhawkins/flactag/pull/1
> +Last-Update: 2020-05-04
> +---
> +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
> +--- a/DiscIDWrapper.cc
> ++++ b/DiscIDWrapper.cc
> +@@ -40,7 +40,11 @@
> + 
> + bool CDiscIDWrapper::FromDevice(const std::string& Device)
> + {
> ++#if defined(DISCID_VERSION_MAJOR) && (DISCID_VERSION_MAJOR > 0 || (DISCID_VERSION_MAJOR == 0 && DISCID_VERSION_MINOR >= 4))
> ++	return discid_read_sparse(m_DiscID,Device.c_str(),DISCID_FEATURE_READ);
> ++#else
> + 	return discid_read(m_DiscID,Device.c_str());
> ++#endif
> + }
> + 
> + bool CDiscIDWrapper::FromCuesheet(const CCuesheet& Cuesheet)
> diff -Nru flactag-2.0.4/debian/watch flactag-2.0.4/debian/watch
> --- flactag-2.0.4/debian/watch	2015-04-26 13:43:48.000000000 +0200
> +++ flactag-2.0.4/debian/watch	2020-05-04 19:06:48.000000000 +0200
> @@ -1,2 +1,2 @@
>  version=3
> -http://sf.net/flactag/flactag-(.+)\.tar\.gz
> +https://sf.net/flactag/flactag-(.+)\.tar\.gz

> _______________________________________________
> pkg-multimedia-maintainers mailing list
> pkg-multimedia-maintainers@alioth-lists.debian.net
> https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers


-- 
Sebastian Ramacher

Attachment: signature.asc
Description: PGP signature


--- End Message ---

Reply to: