Bug#696990: unblock: gmerlin/1.2.0~dfsg+1-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Hi,
Please unblock gmerlin/1.2.0~dfsg+1-1
It seems gmerlin/1.2.0~dfsg+1-1 was uploaded by Alessio Treglia to fix bug
#695775 (non-free GFDL docs). As there is no unblock request yet, I'm filing
one now.
I manually created the diff without -N, to chown only the real changes, not
the contents of the removed files.
unblock gmerlin/1.2.0~dfsg+1-1
Cheers,
Ivo
diff -ur -w gmerlin_1.2.0~dfsg-3/debian/changelog gmerlin_1.2.0~dfsg+1-1/debian/changelog
--- gmerlin_1.2.0~dfsg-3/debian/changelog 2012-11-26 14:29:42.000000000 +0100
+++ gmerlin_1.2.0~dfsg+1-1/debian/changelog 2012-12-13 16:57:02.000000000 +0100
@@ -1,3 +1,14 @@
+gmerlin (1.2.0~dfsg+1-1) unstable; urgency=low
+
+ * Repack tarball to exclude the doc/ directory from upstream sources to
+ get rid of non DFSG-compliant documentation. (Closes: #695775)
+ * Patch buildsystem to avoid generation of non DFSG-compliant
+ documentation.
+ * Remove {,lib}gmerlin-doc packages, the docs are no longer provided.
+ * Refresh fix_typos.patch against new repackaged tarball.
+
+ -- Alessio Treglia <alessio@debian.org> Thu, 13 Dec 2012 15:56:51 +0000
+
gmerlin (1.2.0~dfsg-3) unstable; urgency=low
* Promote gmerlin-encoders to Recommends. (Closes: #681983)
diff -ur -w gmerlin_1.2.0~dfsg-3/debian/control gmerlin_1.2.0~dfsg+1-1/debian/control
--- gmerlin_1.2.0~dfsg-3/debian/control 2012-11-26 14:28:30.000000000 +0100
+++ gmerlin_1.2.0~dfsg+1-1/debian/control 2012-12-13 11:15:18.000000000 +0100
@@ -94,20 +94,6 @@
.
This package provides the gmerlin plugins from the "base" set.
-Package: gmerlin-doc
-Architecture: all
-Section: doc
-Depends:
- ${misc:Depends}
-Description: multiformat media player - documentation files
- Gmerlin is a multiformat media player with tree-like virtual directory
- structure, where you can save your files, webstreams or whatever. It
- handles even large media collections gracefully. Hardware devices appear
- also in the tree so you can open Audio-CDs, (S)VCDs, DVDs and
- DVB-broadcasts.
- .
- This package contains documentation for gmerlin.
-
Package: gmerlin-data
Architecture: all
Multi-Arch: foreign
@@ -208,17 +194,3 @@
.
This package contains the files needed to compile and statically link
against libgmerlin.
-
-Package: libgmerlin-doc
-Architecture: all
-Section: doc
-Depends:
- ${misc:Depends}
-Description: core library for gmerlin - documentation files
- Gmerlin is a multiformat media player with tree-like virtual directory
- structure, where you can save your files, webstreams or whatever. It
- handles even large media collections gracefully. Hardware devices appear
- also in the tree so you can open Audio-CDs, (S)VCDs, DVDs and
- DVB-broadcasts.
- .
- This package contains the documentation about libgmerlin.
diff -ur -w gmerlin_1.2.0~dfsg-3/debian/control.in gmerlin_1.2.0~dfsg+1-1/debian/control.in
--- gmerlin_1.2.0~dfsg-3/debian/control.in 2012-11-26 14:26:49.000000000 +0100
+++ gmerlin_1.2.0~dfsg+1-1/debian/control.in 2012-12-13 11:13:24.000000000 +0100
@@ -87,20 +87,6 @@
.
This package provides the gmerlin plugins from the "base" set.
-Package: gmerlin-doc
-Architecture: all
-Section: doc
-Depends:
- ${misc:Depends}
-Description: multiformat media player - documentation files
- Gmerlin is a multiformat media player with tree-like virtual directory
- structure, where you can save your files, webstreams or whatever. It
- handles even large media collections gracefully. Hardware devices appear
- also in the tree so you can open Audio-CDs, (S)VCDs, DVDs and
- DVB-broadcasts.
- .
- This package contains documentation for gmerlin.
-
Package: gmerlin-data
Architecture: all
Multi-Arch: foreign
@@ -201,17 +187,3 @@
.
This package contains the files needed to compile and statically link
against libgmerlin.
-
-Package: libgmerlin-doc
-Architecture: all
-Section: doc
-Depends:
- ${misc:Depends}
-Description: core library for gmerlin - documentation files
- Gmerlin is a multiformat media player with tree-like virtual directory
- structure, where you can save your files, webstreams or whatever. It
- handles even large media collections gracefully. Hardware devices appear
- also in the tree so you can open Audio-CDs, (S)VCDs, DVDs and
- DVB-broadcasts.
- .
- This package contains the documentation about libgmerlin.
Only in gmerlin_1.2.0~dfsg-3/debian: gmerlin-doc.doc-base
Only in gmerlin_1.2.0~dfsg-3/debian: gmerlin-doc.install
Only in gmerlin_1.2.0~dfsg-3/debian: libgmerlin-doc.doc-base
Only in gmerlin_1.2.0~dfsg-3/debian: libgmerlin-doc.install
diff -ur -w gmerlin_1.2.0~dfsg-3/debian/patches/fix_typos.patch gmerlin_1.2.0~dfsg+1-1/debian/patches/fix_typos.patch
--- gmerlin_1.2.0~dfsg-3/debian/patches/fix_typos.patch 2012-07-18 15:33:42.000000000 +0200
+++ gmerlin_1.2.0~dfsg+1-1/debian/patches/fix_typos.patch 2012-12-12 17:59:05.000000000 +0100
@@ -2,12 +2,11 @@
Description: fix various spelling errors reported by lintian
---
apps/kbd/kbd_config.c | 2 +-
- doc/gmerlin_play.texi | 2 +-
lib/lcdproc.c | 2 +-
plugins/videofilters/fv_tctweak.c | 2 +-
po/de.po | 4 ++--
po/gmerlin.pot | 4 ++--
- 6 files changed, 8 insertions(+), 8 deletions(-)
+ 5 files changed, 7 insertions(+), 7 deletions(-)
--- gmerlin.orig/apps/kbd/kbd_config.c
+++ gmerlin/apps/kbd/kbd_config.c
@@ -20,17 +19,6 @@
PACKAGE);
ret->add_button =
---- gmerlin.orig/doc/gmerlin_play.texi
-+++ gmerlin/doc/gmerlin_play.texi
-@@ -181,7 +181,7 @@ Port base for RTP@*@*
- Port base for RTP over UDP. Values of 1024 or smaller enable random
- ports (recommended for RTSP aware firewalls). Values larger than 1024
- define the base port. 2 consecutive ports are used for each A/V stream,
--these must be accessable through the firewall. Odd values are rounded to
-+these must be accessible through the firewall. Odd values are rounded to
- the next even value.
- @*@*
- @item @b{ftp_anonymous}=[1|0] (default: 1)@*@*
--- gmerlin.orig/lib/lcdproc.c
+++ gmerlin/lib/lcdproc.c
@@ -211,7 +211,7 @@ static int do_connect(bg_lcdproc_t* l)
diff -ur -w gmerlin_1.2.0~dfsg-3/debian/patches/series gmerlin_1.2.0~dfsg+1-1/debian/patches/series
--- gmerlin_1.2.0~dfsg-3/debian/patches/series 2012-07-18 15:33:42.000000000 +0200
+++ gmerlin_1.2.0~dfsg+1-1/debian/patches/series 2012-12-12 18:00:04.000000000 +0100
@@ -5,3 +5,4 @@
gmerlin_visualizer_slave.patch
fix_typos.patch
binutils_gold.patch
+strip_doc_out.patch
Only in gmerlin_1.2.0~dfsg+1-1/debian/patches: strip_doc_out.patch
diff -ur -w gmerlin_1.2.0~dfsg-3/debian/restorefiles gmerlin_1.2.0~dfsg+1-1/debian/restorefiles
--- gmerlin_1.2.0~dfsg-3/debian/restorefiles 2012-07-18 15:33:42.000000000 +0200
+++ gmerlin_1.2.0~dfsg+1-1/debian/restorefiles 2012-12-13 11:21:05.000000000 +0100
@@ -13,13 +13,6 @@
apps/cmdlinerecorder/Makefile.in
apps/nmjedit/Makefile.in
configure
-doc/Makefile.in
-doc/gmerlin.info
-doc/stamp-vti
-doc/version.texi
-doc/gmerlin.info-1
-doc/gmerlin.info-2
-doc/gmerlin.info-3
icons/Makefile.in
include/Makefile.in
include/gmerlin/Makefile.in
diff -ur -w gmerlin_1.2.0~dfsg-3/debian/rules gmerlin_1.2.0~dfsg+1-1/debian/rules
--- gmerlin_1.2.0~dfsg-3/debian/rules 2012-07-18 15:33:42.000000000 +0200
+++ gmerlin_1.2.0~dfsg+1-1/debian/rules 2012-12-12 17:52:57.000000000 +0100
@@ -36,6 +36,7 @@
DEB_UPSTREAM_URL = http://downloads.sourceforge.net/gmerlin
DEB_UPSTREAM_TARBALL_MD5 = 2f2a0880e738e71486f04c929ba067f4
DEB_UPSTREAM_REPACKAGE_EXCLUDES = ./include/gmerlin/bg_sem.h
+DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./doc/
DEB_UPSTREAM_REPACKAGE_EXCLUDES += CVS/
Only in gmerlin_1.2.0~dfsg-3: doc
Reply to: