[SCM] Source extractor for astronomical images branch, debian, updated. 73a587a2a459212806a70acaf822460233087669

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 84e7295419b53bda4b8622489527c3c188929c7a
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jan 30 10:55:10 2013 +0100

    Remove non-free documentation from source. Closes: #699275, #399759

diff --git a/debian/changelog b/debian/changelog
index 2e7d871..bf99184 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at 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 --git a/debian/dfsg.remove b/debian/dfsg.remove
new file mode 100644
index 0000000..548cf0a
--- /dev/null
+++ b/debian/dfsg.remove
@@ -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 --git a/debian/repack-dfsg.sh b/debian/repack-dfsg.sh
new file mode 100755
index 0000000..925a91a
--- /dev/null
+++ b/debian/repack-dfsg.sh
@@ -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 --git a/debian/sextractor.doc-base.handbook b/debian/sextractor.doc-base.handbook
deleted file mode 100644
index e68a23e..0000000
--- a/debian/sextractor.doc-base.handbook
+++ /dev/null
@@ -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 --git a/debian/sextractor.doc-base.manual b/debian/sextractor.doc-base.manual
deleted file mode 100644
index 565eed8..0000000
--- a/debian/sextractor.doc-base.manual
+++ /dev/null
@@ -1,11 +0,0 @@
-Document: sextractor-manual
-Title: SExtractor v2.5 User's manual
-Author: Emmanuel Bertin <bertin at 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 --git a/debian/sextractor.docs b/debian/sextractor.docs
index ef966ae..f89a8cd 100644
--- a/debian/sextractor.docs
+++ b/debian/sextractor.docs
@@ -1,5 +1,3 @@
-doc/Guide2source_extractor.pdf
-doc/sextractor.pdf
 doc/README.DOC
 BUGS
 HISTORY
diff --git a/debian/watch b/debian/watch
index 4124fd6..e4213fa 100644
--- a/debian/watch
+++ b/debian/watch
@@ -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

-- 
Source extractor for astronomical images