diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2014-10-05 03:33:33 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2014-10-05 03:33:33 +0200 |
| commit | 88ceb63e9561773d7cb03267bf882912f255d776 (patch) | |
| tree | ca86b813517261fd8ac367d24c7ee28de3ed7e06 /debian | |
| parent | 274be9736eff09afe79778c91756b9abade26c75 (diff) | |
| download | samba-88ceb63e9561773d7cb03267bf882912f255d776.tar.gz | |
Use Excluded-Files in debian/copyright for DFSG-nonfree files.
Change-Id: I46846ad847f192e0da31a5da578d7cb105d9903d
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/copyright | 3 | ||||
| -rwxr-xr-x | debian/dfsg-clean.sh | 21 |
3 files changed, 4 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog index 91c31309a9..6bb3cad1f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ samba (2:4.1.11+dfsg-2) UNRELEASED; urgency=medium * Updated Italian translation. Thanks Luca Monducci. Closes: #760743 * Use HTTP in watch file, as ftp.samba.org is not working reliably for me. + * Use Excluded-Files in debian/copyright for DFSG-nonfree files. -- Jelmer Vernooij <jelmer@debian.org> Sun, 07 Sep 2014 20:52:27 +0200 diff --git a/debian/copyright b/debian/copyright index 39aee72d59..a734682b09 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,6 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: samba Upstream-Contact: Samba Developers <samba-technical@lists.samba.org> Source: http://www.samba.org/ +Files-Excluded: + source4/heimdal/lib/wind/*.txt + source4/ldap_server/devdocs Files: debian/* Copyright: diff --git a/debian/dfsg-clean.sh b/debian/dfsg-clean.sh deleted file mode 100755 index 25a9742c84..0000000000 --- a/debian/dfsg-clean.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -e -# DFSG-Clean a Samba 4 source tarball - -srcdir="$1" - -if [ -z "$srcdir" ]; then - srcdir="." -fi - -if [ ! -d "$srcdir/source4" ]; then - echo "Usage: $0 SRCDIR" - exit 1 -fi - -pushd $srcdir/source4 -rm heimdal/lib/wind/*.txt -pwd -rm -rf ldap_server/devdocs -popd - -exit 0 |