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

Bug#699362: unblock: sextractor/2.8.6+dfsg-1



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear Release Team,

please unblock sextractor.

2.8.6+dfsg-1 fixes a copyright issue for PDF documentation which were
distributed without an appropriate permission.

Relevant bug: #699275

Debdiff is attached.

Best regards

Ole
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iQIcBAEBAgAGBQJRCUuEAAoJEHEVr9B3ENz3zuYQAOQ1KBItv2EWKxZ0eQARuhuc
vnP9UWEbTVVTRsDaLY69EQ8erkqoQ4fBTso7KHp+SCe4T+z6jkwUrNFstrdJuQEu
Doifjhz7cIoq8ZP0oNiOcJIvL1O225Q0PSWvdmQ3CmDU9tHxZkzyuFWCbsJaowXG
NNJha4MJtBXIB/TnHavDtE5t4knCfIbd2UpN/SczsSPEdsT9/JnNK6ywVAfYaBjg
wyKaM1oRjYXiqheHNHUPtNhJTKX3cIYf20UjEjrBPo4sbktyCYgzJEjsJKuIqf5k
vcJbnKyAI7oXRm5jiXfo9eUgAj6bffSCOffEkEYQ0FMIMcntU23Mhez/Nwld+ljb
WtYIbzno6+CsdJmCILPdD7ELgjddViUO6KYYOYYHdSGawLDaFQWyOlCXKo40sYg6
p3i0r17JcN0Hs1J0H9oeMfKoGqKjFkNn7imVwUqktGAnZTHftqLzel2chwAOx+OA
ijcjHVr9h05lFvwPxRdptV5cAnqB7FqqLPNJPFaCMmNpGU+L+SLQAi/QfX8Bqtai
7Bm8HqZLnQu0LuCuCHzIeMFBd3r7K/sv1WKrBtq+K/MXOKcXZbSPN85gIhUx8PQX
ir44xQIHZac5ktXrxJgg7KBadXnwYTqdJRQwtZsGiesk370em2G1SD3JrgrhWlJ4
w0L+vb/JnGJwPyFZvLoh
=xl6U
-----END PGP SIGNATURE-----
diffstat for sextractor-2.8.6 sextractor-2.8.6+dfsg

 debian/README.debian                |    8 ++++++++
 debian/changelog                    |    6 ++++++
 debian/control                      |    1 -
 debian/dfsg.remove                  |    6 ++++++
 debian/repack-dfsg.sh               |   34 ++++++++++++++++++++++++++++++++++
 debian/sextractor.doc-base.handbook |    9 ---------
 debian/sextractor.doc-base.manual   |   11 -----------
 debian/sextractor.docs              |    2 --
 debian/watch                        |    5 +++--
 doc/Guide2source_extractor.pdf      |binary
 doc/sextractor.pdf                  |binary
 11 files changed, 57 insertions(+), 25 deletions(-)

diff -Nru sextractor-2.8.6/debian/README.debian sextractor-2.8.6+dfsg/debian/README.debian
--- sextractor-2.8.6/debian/README.debian	1970-01-01 01:00:00.000000000 +0100
+++ sextractor-2.8.6+dfsg/debian/README.debian	2013-01-30 15:30:12.000000000 +0100
@@ -0,0 +1,8 @@
+The PDF documentation has been removed from the package for copyright reasons.
+Check http://bugs.debian.org/699275 for details.
+For the documentation, see
+
+ * Official user's manual: https://www.astromatic.net/pubsvn/software/sextractor/trunk/doc/sextractor.pdf
+ * Dummy's guide: http://mensa.ast.uct.ac.za/~holwerda/SE/Manual.html
+
+ -- Ole Streicher <debian@liska.ath.cx>  Wed, 30 Jan 2013 10:45:52 +0100
diff -Nru sextractor-2.8.6/debian/changelog sextractor-2.8.6+dfsg/debian/changelog
--- sextractor-2.8.6/debian/changelog	2013-01-30 10:59:28.000000000 +0100
+++ sextractor-2.8.6+dfsg/debian/changelog	2013-01-30 15:30:12.000000000 +0100
@@ -1,3 +1,9 @@
+sextractor (2.8.6+dfsg-1) unstable; urgency=low
+
+  * Remove non-free documentation from source. Closes: #699275, #399759
+
+ -- Ole Streicher <debian@liska.ath.cx>  Wed, 30 Jan 2013 10:45:52 +0100
+
 sextractor (2.8.6-3) unstable; urgency=low
 
   * Fix FTBS on mips (missed in last release)
diff -Nru sextractor-2.8.6/debian/control sextractor-2.8.6+dfsg/debian/control
--- sextractor-2.8.6/debian/control	2013-01-30 10:59:28.000000000 +0100
+++ sextractor-2.8.6+dfsg/debian/control	2013-01-30 15:30:12.000000000 +0100
@@ -3,7 +3,6 @@
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian@liska.ath.cx>
-DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50),
                dh-autoreconf,
                libatlas-base-dev,
diff -Nru sextractor-2.8.6/debian/dfsg.remove sextractor-2.8.6+dfsg/debian/dfsg.remove
--- sextractor-2.8.6/debian/dfsg.remove	1970-01-01 01:00:00.000000000 +0100
+++ sextractor-2.8.6+dfsg/debian/dfsg.remove	2013-01-30 15:30:12.000000000 +0100
@@ -0,0 +1,6 @@
+# The following non-free files are removed from the original tarball
+#
+# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=699275
+#
+doc/Guide2source_extractor.pdf
+doc/sextractor.pdf
diff -Nru sextractor-2.8.6/debian/repack-dfsg.sh sextractor-2.8.6+dfsg/debian/repack-dfsg.sh
--- sextractor-2.8.6/debian/repack-dfsg.sh	1970-01-01 01:00:00.000000000 +0100
+++ sextractor-2.8.6+dfsg/debian/repack-dfsg.sh	2013-01-30 15:30:12.000000000 +0100
@@ -0,0 +1,34 @@
+#!/bin/sh
+# ./debian/repack
+# Repackage the source files as a DFSG tarball, with unnecessary
+# files removed. 
+
+TMPDIR=$(mktemp --directory)
+trap "rm -fr ${TMPDIR} || exit 1" EXIT INT TERM
+
+ver=$2
+orig_tar=$3
+tardir=$(dirname ${orig_tar})
+debiandir=$(dirname $0)
+pkgname=$(grep ^[^[:space:]] ${debiandir}/changelog | head -1|cut -d' ' -f1)
+
+echo $pkgname $ver $orig_tar $tardir $wd
+
+tar xf ${orig_tar} -C ${TMPDIR} 
+srcdir=$(ls -d ${TMPDIR}/*)
+
+if [ -f ${debiandir}/dfsg.move ] ; then
+  ( while read source target ; do
+      mkdir -p ${srcdir}/${target}
+      mv ${srcdir}/${source} ${srcdir}/${target}
+    done ) < ${debiandir}/dfsg.move
+fi
+
+for fname in $(cat ${debiandir}/dfsg.remove | sed s/\#.\*//); do
+    rm -rf ${srcdir}/${fname}
+done
+
+dfsg_tar=${tardir}/${pkgname}_${ver}+dfsg.orig.tar.gz
+tar czf ${dfsg_tar} -C ${TMPDIR} .
+
+exec uupdate --no-symlink --upstream-version ${ver}+dfsg ${dfsg_tar}
diff -Nru sextractor-2.8.6/debian/sextractor.doc-base.handbook sextractor-2.8.6+dfsg/debian/sextractor.doc-base.handbook
--- sextractor-2.8.6/debian/sextractor.doc-base.handbook	2013-01-30 10:59:28.000000000 +0100
+++ sextractor-2.8.6+dfsg/debian/sextractor.doc-base.handbook	1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-Document: sextractor-handbook
-Title: Source Extractor for Dummies
-Author: Benne W. Holwerda
-Abstract: Everything you wanted to know about Source Extractor and
- Benne was forced to find out.
-Section: Science/Astronomy
-
-Format: pdf
-Files: /usr/share/doc/sextractor/Guide2source_extractor.pdf.gz
diff -Nru sextractor-2.8.6/debian/sextractor.doc-base.manual sextractor-2.8.6+dfsg/debian/sextractor.doc-base.manual
--- sextractor-2.8.6/debian/sextractor.doc-base.manual	2013-01-30 10:59:28.000000000 +0100
+++ sextractor-2.8.6+dfsg/debian/sextractor.doc-base.manual	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-Document: sextractor-manual
-Title: SExtractor v2.5 User's manual
-Author: Emmanuel Bertin <bertin@iap.fr>
-Abstract: This manual describes what SExtractor is and how it can be
- used to generate catalogues of objects from astronomical images. It
- gives full list and descriptions of configuration options and
- available output parameters.
-Section: Science/Astronomy
-
-Format: pdf
-Files: /usr/share/doc/sextractor/sextractor.pdf.gz
diff -Nru sextractor-2.8.6/debian/sextractor.docs sextractor-2.8.6+dfsg/debian/sextractor.docs
--- sextractor-2.8.6/debian/sextractor.docs	2013-01-30 10:59:28.000000000 +0100
+++ sextractor-2.8.6+dfsg/debian/sextractor.docs	2013-01-30 15:30:12.000000000 +0100
@@ -1,5 +1,3 @@
-doc/Guide2source_extractor.pdf
-doc/sextractor.pdf
 doc/README.DOC
 BUGS
 HISTORY
diff -Nru sextractor-2.8.6/debian/watch sextractor-2.8.6+dfsg/debian/watch
--- sextractor-2.8.6/debian/watch	2013-01-30 10:59:28.000000000 +0100
+++ sextractor-2.8.6+dfsg/debian/watch	2013-01-30 15:30:12.000000000 +0100
@@ -1,3 +1,4 @@
 version=3
-
-http://www.astromatic.net/download/sextractor/sextractor-(.*)\.tar\.gz debian uupdate
+opts=dversionmangle=s/\+dfsg// \
+http://www.astromatic.net/download/sextractor/sextractor-(.*)\.tar\.gz \
+debian debian/repack-dfsg.sh
Binary files /tmp/QyDcWUotxx/sextractor-2.8.6/doc/Guide2source_extractor.pdf and /tmp/XHUaLlHTfn/sextractor-2.8.6+dfsg/doc/Guide2source_extractor.pdf differ
Binary files /tmp/QyDcWUotxx/sextractor-2.8.6/doc/sextractor.pdf and /tmp/XHUaLlHTfn/sextractor-2.8.6+dfsg/doc/sextractor.pdf differ

Reply to: