[devscripts] branch master updated (97a382d -> c065c65)

[Nicholas Bamber]

This is an automated email from the git hooks/post-receive script.

periapt pushed a change to branch master
in repository devscripts.

  from  97a382d   integration test for various scripts
   new  c065c65   move test clean up to test rule

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/rules  | 4 
 test/Makefile | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

Re: [devscripts] 03/03: Add apt to Recommends.

[James McCoy]

On Sat, Dec 05, 2015 at 09:33:33AM +, Nicholas Bamber wrote:
> I see another oddity in the dependency list. bash-completion is in the build
> dependency. This looks wrong to me as we do not use it's build tools.

$ grep pkg-config scripts/Makefile
COMPL_DIR := $(shell pkg-config --variable=completionsdir bash-completion)

$ dpkg -L bash-completion | grep pkgconfig
/usr/share/pkgconfig
/usr/share/pkgconfig/bash-completion.pc

> However it is absent from the Recommends where I believe it belongs.

I don't see why.  We're just providing bash-completion files to aid
someone that is using bash-completion.  If anything, the relationship
would be an Enhances.

Note that bash already Recommends bash-completion.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy 

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

[devscripts] branch master updated (c065c65 -> 2e197b3)

[Nicholas Bamber]

This is an automated email from the git hooks/post-receive script.

periapt pushed a change to branch master
in repository devscripts.

  from  c065c65   move test clean up to test rule
   new  2e197b3   corrected cleanup of test files

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

[devscripts] 01/01: corrected cleanup of test files

[Nicholas Bamber]

This is an automated email from the git hooks/post-receive script.

periapt pushed a commit to branch master
in repository devscripts.

commit 2e197b3221ab63767b5f44841510289168ffb5ae
Author: Nicholas Bamber 
Date:   Sat Dec 5 13:55:52 2015 +

corrected cleanup of test files
---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/rules b/debian/rules
index 0cfb25f..804ad62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,5 +13,6 @@ else
 endif
 
 override_dh_clean:
+   dh_clean
rm -rf test/uscan/gpg test/package_lifecycle
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

Re: [devscripts] 01/01: move test clean up to test rule

[James McCoy]

On Sat, Dec 05, 2015 at 12:54:37PM +, Nicholas Bamber wrote:
> commit c065c65f77b0e1f82c470c7afbb6b43ca2ee5ec4
> Author: Nicholas Bamber 
> Date:   Sat Dec 5 12:54:31 2015 +
> 
> move test clean up to test rule
> ---
>  debian/rules  | 4 
>  test/Makefile | 2 --
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/debian/rules b/debian/rules
> index 87f9c4f..0cfb25f 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -11,3 +11,7 @@ ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo 
> ubuntu),ubuntu)
>  else
>   dh_gencontrol -- -V'vendor:Suggests=' 
> -V'vendor:Recommends=$(UBU_SUGGESTS)'
>  endif
> +
> +override_dh_clean:
> + rm -rf test/uscan/gpg test/package_lifecycle

Why is this in debian/rules?  This should be part of the normal
Makefile.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy 

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

[devscripts] 02/03: Merge branch 'master' of ssh://anonscm.debian.org/git/collab-maint/devscripts

[Nicholas Bamber]

This is an automated email from the git hooks/post-receive script.

periapt pushed a commit to branch master
in repository devscripts.

commit c9c1e08caf89dcd8aecc334a7352270f7f207e32
Merge: fd91485 1d7d7dd
Author: Nicholas Bamber 
Date:   Sat Dec 5 09:12:53 2015 +

Merge branch 'master' of 
ssh://anonscm.debian.org/git/collab-maint/devscripts

 debian/changelog   |  8 
 debian/control |  9 +
 scripts/dget.pl| 21 ++---
 test/test_mk-origtargz |  7 +--
 4 files changed, 28 insertions(+), 17 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

[devscripts] 03/03: integration test for various scripts

[Nicholas Bamber]

This is an automated email from the git hooks/post-receive script.

periapt pushed a commit to branch master
in repository devscripts.

commit 97a382d981dc134b3035aa43ca870bd393787922
Author: Nicholas Bamber 
Date:   Sat Dec 5 12:40:08 2015 +

integration test for various scripts
---
 debian/changelog|   3 +-
 test/test_package_lifecycle | 150 ++--
 2 files changed, 105 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 249fef7..06ba13b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,7 +29,8 @@ devscripts (2.15.10) UNRELEASED; urgency=medium
 + Added test for licensecheck versus Software::License
 + Resolved failure to find license from Software::License generated
   files from Artistic and Mozilla licenses
-  * Added test for life cycle of package
+  * Added test for life cycle of package:
++ debuild, dscverify, dscextract, list-unreleased, debdiff
 
   [ Dominique Dumont ]
   * licensecheck:
diff --git a/test/test_package_lifecycle b/test/test_package_lifecycle
index 842e565..17e42a2 100755
--- a/test/test_package_lifecycle
+++ b/test/test_package_lifecycle
@@ -15,15 +15,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see .
 
+WORKDIR=$(readlink -f "${0%/*}")
+declare _ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
+
 if test "$1" = --installed; then
-INSTALLED=1
 shift
 else
-INSTALLED=0
+PATH=${WORKDIR}/../scripts:${PATH}
+   PERL5LIB=${WORKDIR}/../lib:${PERL5LIB}
+   export PATH PERL5LIB
 fi
 
-WORKDIR=$(readlink -f "${0%/*}")
-
 GPG=/usr/bin/gpg
 if [ ! -x $GPG ];then
 echo "$GPG missing"
@@ -91,7 +93,7 @@ runCommandOutCmpFile() {
 local exp_retval=$4
 local stdoutF="${SHUNIT_TMPDIR}/stdout"
 local stderrF="${SHUNIT_TMPDIR}/stderr"
-eval "${COMMAND} $param"  2> ${stderrF} | sed -e's!^ -- Testophilus 
Testownik .*! -- Testophilus Testownik 
!' > ${stdoutF}
+eval "${COMMAND} $param"  2> ${stderrF} | grep -v File::FcntlLock | sed 
-e's!^ -- Testophilus Testownik .*! -- Testophilus 
Testownik !' > ${stdoutF}
 retval=$?
eval "cmp ${stdoutF} ${exp_stdoutfile}" 3>&1 >/dev/null
local diffretval=$?
@@ -104,12 +106,7 @@ runCommandOutCmpFile() {
 test_debuild() {
   export GNUPGHOME=$GPGHOME
   cd ${WORKDIR}/package_lifecycle/test
-  if [[ $INSTALLED == "1" ]]; then
-COMMAND='debuild --no-conf'
-  else
-COMMAND="perl -I ${WORKDIR}/../lib ${WORKDIR}/../scripts/debuild.pl 
--no-conf"
-  fi
-  local _ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
+  COMMAND='debuild --no-conf --no-lintian --preserve-envvar=PATH 
--preserve-envvar=PERL5LIB --preserve-envvar=DEBFULLNAME 
--preserve-envvar=DEBEMAIL --preserve-envvar=GNUPGHOME'
   cat > ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS
 dpkg-buildpackage -rfakeroot -D -us -uc
dpkg-buildpackage: source package test
@@ -117,7 +114,7 @@ test_debuild() {
dpkg-buildpackage: source distribution unstable
dpkg-buildpackage: source changed by Testophilus Testownik 

 dpkg-source --before-build test
-   dpkg-buildpackage: host architecture amd64
+   dpkg-buildpackage: host architecture ${_ARCH}
 fakeroot debian/rules clean
dh clean
   dh_testdir
@@ -155,23 +152,10 @@ test_debuild() {
dpkg-genchanges: including full source code in upload
 dpkg-source --after-build test
dpkg-buildpackage: full upload (original source is included)
-   Now running lintian...
-   W: test source: debhelper-but-no-misc-depends test
-   E: test source: package-uses-debhelper-but-lacks-build-depends
-   W: test source: package-needs-versioned-debhelper-build-depends 9
-   W: test source: no-debian-copyright
-   I: test source: debian-watch-file-is-missing
-   P: test: no-upstream-changelog
-   W: test: new-package-should-close-itp-bug
-   E: test: no-copyright-file
-   I: test: extended-description-is-probably-too-short
-   P: test: no-homepage-field
-   W: test: empty-binary-package
-   Finished running lintian.
Now signing changes and any dsc files...
 signfile test_1.0-1.dsc uscan test key (no secret) 

-signfile test_1.0-1_amd64.changes uscan test key (no secret) 

+signfile test_1.0-1_${_ARCH}.changes uscan test key (no secret) 


Successfully signed dsc and changes files
 EOS
@@ -181,11 +165,7 @@ EOS
 
 test_dscverify () {
   cd ${WORKDIR}/package_lifecycle
-  if [[ $INSTALLED == "1" ]]; then
-COMMAND='dscverify --no-conf --keyring $GPGHOME/pubring.gpg'
-  else
-COMMAND="perl -I ${WORKDIR}/../lib ${WORKDIR}/../scripts/dscverify.pl 

[devscripts] 01/03: Added test for life cycle of package

[Nicholas Bamber]

This is an automated email from the git hooks/post-receive script.

periapt pushed a commit to branch master
in repository devscripts.

commit fd914851acaa716042b4219219e753f9be03319b
Author: Nicholas Bamber 
Date:   Fri Dec 4 20:14:43 2015 +

Added test for life cycle of package
---
 debian/changelog|   1 +
 test/Makefile   |   2 +
 test/test_package_lifecycle | 274 
 3 files changed, 277 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1dc53c0..2098b22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ devscripts (2.15.10) UNRELEASED; urgency=medium
 + Added test for licensecheck versus Software::License
 + Resolved failure to find license from Software::License generated
   files from Artistic and Mozilla licenses
+  * Added test for life cycle of package
 
   [ Dominique Dumont ]
   * licensecheck:
diff --git a/test/Makefile b/test/Makefile
index 7746eec..342fe32 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -9,6 +9,7 @@ test:
./test_checkbashisms
./test_dd-list
./test_debchange
+   ./test_package_lifecycle
./test_debdiff
./test_licensecheck
if [ $(check_unstable) = 0 ]; then \
@@ -24,6 +25,7 @@ test-installed:
./test_checkbashisms --installed
./test_dd-list --installed
./test_debchange --installed
+   ./test_package_lifecycle --installed
./test_debdiff --installed
./test_licensecheck --installed
if [ $(check_unstable) = 0 ]; then \
diff --git a/test/test_package_lifecycle b/test/test_package_lifecycle
new file mode 100755
index 000..842e565
--- /dev/null
+++ b/test/test_package_lifecycle
@@ -0,0 +1,274 @@
+#!/bin/bash
+
+# Copyright (C) 2015, Nicholas Bamber 
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+if test "$1" = --installed; then
+INSTALLED=1
+shift
+else
+INSTALLED=0
+fi
+
+WORKDIR=$(readlink -f "${0%/*}")
+
+GPG=/usr/bin/gpg
+if [ ! -x $GPG ];then
+echo "$GPG missing"
+GPG=/usr/bin/gpg2
+if [ ! -x $GPG ];then
+echo "$GPG missing"
+exit 1
+fi
+fi
+
+PRIVATE_KEY=${WORKDIR}/uscan/PRIVATE_KEY.asc
+PUBLIC_KEY=${WORKDIR}/uscan/PUBLIC_KEY.asc
+
+GPGHOME=$(readlink -f ${WORKDIR}/uscan/gpg)
+rm -rf $GPGHOME
+mkdir -p $GPGHOME
+chmod 700 $GPGHOME
+PRIVATE_KEYRING=$GPGHOME/secring.gpg
+PUBLIC_KEYRING=$GPGHOME/pubring.gpg
+
+$GPG -v --homedir $GPGHOME --no-options -q --batch --no-default-keyring \
+--output $PRIVATE_KEYRING --dearmor $PRIVATE_KEY
+
+$GPG -v --homedir $GPGHOME --no-options -q --batch --no-default-keyring \
+--output $PUBLIC_KEYRING --dearmor $PUBLIC_KEY
+
+$GPG --homedir $GPGHOME --no-options -q --batch --no-default-keyring \
+--secret-keyring $PRIVATE_KEYRING --default-key 72543FAF \
+--list-keys --verbose
+
+. "${0%/*}/shunit2-helper-functions.sh"
+
+mkdir -p ${WORKDIR}/package_lifecycle/test/debian/source
+cat > ${WORKDIR}/package_lifecycle/test/debian/control <<-EOS
+   Source: test
+   Section: devel
+   Priority: optional
+   Maintainer: Devscripts Devel Team 

+   Uploaders: Testophilus Testownik 
+   Standards-Version: 3.9.6
+   
+   Package: test
+   Architecture: all
+   Description: Short description
+Longer description
+EOS
+cp /usr/share/doc/debhelper/examples/rules.tiny 
${WORKDIR}/package_lifecycle/test/debian/rules
+_DATE=$(LC_ALL=C date '+%a, %d %b %Y %T +')
+cat > ${WORKDIR}/package_lifecycle/test/debian/changelog <<-EOS
+   test (1.0-1) unstable; urgency=low
+   
+ * Initial packaging
+   
+-- Testophilus Testownik   ${_DATE}
+EOS
+echo 9 > ${WORKDIR}/package_lifecycle/test/debian/compat
+echo '3.0 (quilt)' > ${WORKDIR}/package_lifecycle/test/debian/source/format
+touch ${WORKDIR}/package_lifecycle/test/CONTENTS
+cd ${WORKDIR}/package_lifecycle/ && tar cvf test_1.0.orig.tar --exclude debian 
-- test/CONTENTS 2>&1 > /dev/null && xz -f test_1.0.orig.tar
+
+runCommandOutCmpFile() {
+local param="$1"
+local exp_stdoutfile="$2"
+local exp_stderr="$3"
+local exp_retval=$4
+local stdoutF="${SHUNIT_TMPDIR}/stdout"
+local stderrF="${SHUNIT_TMPDIR}/stderr"
+eval 

[devscripts] branch master updated (1d7d7dd -> 97a382d)

[Nicholas Bamber]

This is an automated email from the git hooks/post-receive script.

periapt pushed a change to branch master
in repository devscripts.

  from  1d7d7dd   test_mk-origtargz: Export LANG=C
   new  fd91485   Added test for life cycle of package
   new  c9c1e08   Merge branch 'master' of 
ssh://anonscm.debian.org/git/collab-maint/devscripts
   new  97a382d   integration test for various scripts

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog|   2 +
 test/Makefile   |   2 +
 test/test_package_lifecycle | 330 
 3 files changed, 334 insertions(+)
 create mode 100755 test/test_package_lifecycle

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

[devscripts] 01/01: test_mk-origtargz: LANG → LC_ALL

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 87f8e347bebd4c6daaf3f109e3d956b2486d2b29
Author: James McCoy 
Date:   Sat Dec 5 08:37:02 2015 -0500

test_mk-origtargz: LANG → LC_ALL

LANG can still be overridden if specific LC_* environment variables are
present.  LC_ALL rules them all.

Signed-off-by: James McCoy 
---
 debian/changelog   |  2 +-
 test/test_mk-origtargz | 10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 06ba13b..1bb7e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -105,7 +105,7 @@ devscripts (2.15.10) UNRELEASED; urgency=medium
 + Fix parsing of sources.list lines with options.  (Closes: #674812)
   * Add apt to Recommends, since various scripts use tools from apt.  (Closes:
 #807065)
-  * Export LANG=C in test_mk-origtargz so the test doesn't fail in non-English
+  * Export LC_ALL=C in test_mk-origtargz so the test doesn't fail in 
non-English
 locales.
 
   [ Daniel Kahn Gillmor ]
diff --git a/test/test_mk-origtargz b/test/test_mk-origtargz
index a8efdc5..a4eaf06 100755
--- a/test/test_mk-origtargz
+++ b/test/test_mk-origtargz
@@ -28,13 +28,13 @@ fi
 
 cleanup(){
rm -rf $TMPDIR
-   unset LANG
+   unset LC_ALL
 }
 
 setUp () {
TMPDIR=$(mktemp -d test_mk-origtargz.)
-   LANG=C
-   export LANG
+   LC_ALL=C
+   export LC_ALL
 }
 
 tearDown () {
@@ -163,7 +163,7 @@ END
 
 expected_stderr_after_removal="WARNING: Files-Excluded pattern (exclude-dir2/) 
should not have a trailing /"
 
-expected_files_after_removal=$(LANG=C sort < 
$stderrF )"
+   output="$( cd $TMPDIR/$dir >/dev/null; LC_ALL=C $MK_ORIGTARGZ "$@" 2> 
$stderrF )"
stderr="$(cat $stderrF)"
retval=$?
assertEquals "standard output of mk-origtargz $*\n" "$exp_stdout" 
"$output"

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

[devscripts] branch master updated (ce691c3 -> 87f8e34)

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a change to branch master
in repository devscripts.

  from  ce691c3   uscan: If ! --signature, set to pgpmode=none
   new  87f8e34   test_mk-origtargz: LANG → LC_ALL

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   |  2 +-
 test/test_mk-origtargz | 10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

[devscripts] 01/01: move test clean up to test rule

[Nicholas Bamber]

This is an automated email from the git hooks/post-receive script.

periapt pushed a commit to branch master
in repository devscripts.

commit c065c65f77b0e1f82c470c7afbb6b43ca2ee5ec4
Author: Nicholas Bamber 
Date:   Sat Dec 5 12:54:31 2015 +

move test clean up to test rule
---
 debian/rules  | 4 
 test/Makefile | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 87f9c4f..0cfb25f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,3 +11,7 @@ ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo 
ubuntu),ubuntu)
 else
dh_gencontrol -- -V'vendor:Suggests=' 
-V'vendor:Recommends=$(UBU_SUGGESTS)'
 endif
+
+override_dh_clean:
+   rm -rf test/uscan/gpg test/package_lifecycle
+
diff --git a/test/Makefile b/test/Makefile
index 342fe32..8bbce57 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -17,7 +17,6 @@ test:
fi
./test_uscan
./test_uscan_mangle
-   rm -rf uscan/gpg
./test_mk-origtargz
 
 test-installed:
@@ -33,7 +32,6 @@ test-installed:
fi
./test_uscan --installed
./test_uscan_mangle --installed
-   rm -rf uscan/gpg
./test_mk-origtargz --installed
 
 online-test:

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

Re: [devscripts] 01/01: test_mk-origtargz: Export LANG=C

[Mattia Rizzolo]

On Sat, Dec 05, 2015 at 01:17:07PM +0100, Jakub Wilk wrote:
> * James McCoy , 2015-12-05, 01:56:
> >   test_mk-origtargz: Export LANG=C
> >
> >   Testing was broken in non-en_US locales due to different languages in
> >   the expected vs. actual output (seen in reproducible build
> >   testing).
> >
> >   Forcing LANG=C ensures consistent output regardless of the environment.
> 
> You should set LC_ALL, not LANG.
> LANG can be overridden by various LC_* variables;
> LC_ALL overrides them all.

And this is particularly true for

> -expected_files_after_removal=$(sort < +expected_files_after_removal=$(LANG=C sort 

[devscripts] branch master updated (2e197b3 -> ce691c3)

[Osamu Aoki]

This is an automated email from the git hooks/post-receive script.

osamu pushed a change to branch master
in repository devscripts.

  from  2e197b3   corrected cleanup of test files
   new  ce691c3   uscan: If ! --signature, set to pgpmode=none

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 scripts/uscan.pl | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

[devscripts] 01/01: uscan: If ! --signature, set to pgpmode=none

[Osamu Aoki]

This is an automated email from the git hooks/post-receive script.

osamu pushed a commit to branch master
in repository devscripts.

commit ce691c3a36b4ba992c13dfbacb0f3e30d1047383
Author: Osamu Aoki 
Date:   Sat Dec 5 22:52:58 2015 +0900

uscan: If ! --signature, set to pgpmode=none
---
 scripts/uscan.pl | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 3c95174..55d2eb6 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -2399,6 +2399,10 @@ sub process_watchline ($$)
 my $urlbase;
 my $headers = HTTP::Headers->new;
 
+if ($signature <= 0) {
+   $options{'pgpmode'} = 'none';
+}
+
 # Need to clear remembered redirection URLs so we don't try to build URLs
 # from previous watch files or watch lines
 $user_agent->clear_redirections;
@@ -2514,8 +2518,10 @@ sub process_watchline ($$)
} elsif ($opt =~ /^\s*filenamemangle\s*=\s*(.+?)\s*$/) {
@{$options{'filenamemangle'}} = split /;/, $1;
} elsif ($opt =~ /^\s*pgpsigurlmangle\s*=\s*(.+?)\s*$/) {
-   @{$options{'pgpsigurlmangle'}} = split /;/, $1;
-   $options{'pgpmode'} = 'mangle';
+   if ($signature > 0) {
+   @{$options{'pgpsigurlmangle'}} = split /;/, $1;
+   $options{'pgpmode'} = 'mangle';
+   }
} elsif ($opt =~ /^\s*oversionmangle\s*=\s*(.+?)\s*$/) {
@{$options{'oversionmangle'}} = split /;/, $1;
} else {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

Re: [devscripts] 03/03: Add apt to Recommends.

[Nicholas Bamber]

On 05/12/15 13:52, James McCoy wrote:

On Sat, Dec 05, 2015 at 09:33:33AM +, Nicholas Bamber wrote:

I see another oddity in the dependency list. bash-completion is in the build
dependency. This looks wrong to me as we do not use it's build tools.


$ grep pkg-config scripts/Makefile
COMPL_DIR := $(shell pkg-config --variable=completionsdir bash-completion)

$ dpkg -L bash-completion | grep pkgconfig
/usr/share/pkgconfig
/usr/share/pkgconfig/bash-completion.pc


However it is absent from the Recommends where I believe it belongs.


I don't see why.  We're just providing bash-completion files to aid
someone that is using bash-completion.  If anything, the relationship
would be an Enhances.

Note that bash already Recommends bash-completion.

Cheers,


 okay. I was going to try this. Now I don't need to. Thanks

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

[devscripts] 01/01: test_package_lifecycle: jessie backport safe test

[Osamu Aoki]

This is an automated email from the git hooks/post-receive script.

osamu pushed a commit to branch master
in repository devscripts.

commit 41b982013adf5f4bad31aa0b14f5a1fb157faa27
Author: Osamu Aoki 
Date:   Sun Dec 6 00:40:36 2015 +0900

test_package_lifecycle: jessie backport safe test

 * Filter STDOUT through ` -> '
 * make test ignore dh_strip_nondeterminism

dpkg-source changed its output style
< dpkg-source: info: using source format `3.0 (quilt)'
---
> dpkg-source: info: using source format '3.0 (quilt)'

dh_strip_nondeterminism happens only under stretch
---
 test/test_package_lifecycle | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/test_package_lifecycle b/test/test_package_lifecycle
index 17e42a2..41be7ed 100755
--- a/test/test_package_lifecycle
+++ b/test/test_package_lifecycle
@@ -93,7 +93,11 @@ runCommandOutCmpFile() {
 local exp_retval=$4
 local stdoutF="${SHUNIT_TMPDIR}/stdout"
 local stderrF="${SHUNIT_TMPDIR}/stderr"
-eval "${COMMAND} $param"  2> ${stderrF} | grep -v File::FcntlLock | sed 
-e's!^ -- Testophilus Testownik .*! -- Testophilus 
Testownik !' > ${stdoutF}
+eval "${COMMAND} $param"  2> ${stderrF} | \
+   grep -v File::FcntlLock | \
+   grep -v dh_strip_nondeterminism | \
+   sed -e "s/\`/'/g" | \
+   sed -e's!^ -- Testophilus Testownik .*! -- 
Testophilus Testownik !' > ${stdoutF}
 retval=$?
eval "cmp ${stdoutF} ${exp_stdoutfile}" 3>&1 >/dev/null
local diffretval=$?
@@ -140,7 +144,6 @@ test_debuild() {
   dh_installchangelogs
   dh_perl
   dh_link
-  dh_strip_nondeterminism
   dh_compress
   dh_fixperms
   dh_installdeb
@@ -287,7 +290,6 @@ test_debuild2() {
   dh_installchangelogs
   dh_perl
   dh_link
-  dh_strip_nondeterminism
   dh_compress
   dh_fixperms
   dh_installdeb

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

[devscripts] branch master updated (a7a4521 -> 41b9820)

[Osamu Aoki]

This is an automated email from the git hooks/post-receive script.

osamu pushed a change to branch master
in repository devscripts.

  from  a7a4521   uscan: Better code for !--signature handling
   new  41b9820   test_package_lifecycle: jessie backport safe test

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 test/test_package_lifecycle | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

Re: [devscripts] 01/01: move test clean up to test rule

[James McCoy]

On Sat, Dec 05, 2015 at 02:12:38PM +, Nicholas Bamber wrote:
> James,
>   I can move it back of course.
> 
>   I am actually puzzled why more is not done in debian/rules.

Like most packages, debian/ should only contain content that's relevant
for packaging.

Properly cleaning up detritus created by a test isn't specific to
packaging, so it should be handled by the test (e.g., using shunit's
oneTimeTearDown) or possibly by a clean target in test/Makefile.

> The whole
> devscripts structure seems sort of odd to me.

Why?  Debian-specific stuff should be handled by things in debian/.
"Upstream" stuff should be handled outside of debian/.

>   I put the test clean up in debian/rules because then one can easily 
> inspect
> the generated files between the test phase and the clean phase. More
> generally I can think of several places such clean up could be put in:
> 1. debian/rules
> 2. Makefile
> 3. test/Makefile
> 4. test/test_*
> 
> The two obvious places would seem to me 1. and 4. 4. seems not to be
> working.

Looking at test_package_lifecycle, it seems like use of either
oneTimeSetUp/oneTimeTearDown or setUp/tearDown would help.

> I am not quite sure why though I suspect the test script may be
> exiting earlier than the cleanup. However 1. looks better to me anyway for
> the reason I said. Both 2. and 3. look wrong to me. Why should test/Makefile
> know about the inner workings of the tests?

Why shouldn't it?  Do you expect other upstream Makefiles not to know
how to clean up their generated files?  The use of “debian/rules clean”
should typically only need to clean up files generated by the packaging,
not by the upstream build process.  The upstream files should be cleaned
by the upstream code.

> BTW there are several quetsions I have asked which have not been answered.

If they're buried in email chains about commits, where I wasn't already
part of the thread, that's probably why.  Start new threads when you're
discussing new topics.

> Also what are the plans for upload?

In the next week or so, probably.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy 

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

[devscripts] 01/01: licensecheck: also extract info from end of file

[dod]

This is an automated email from the git hooks/post-receive script.

dod pushed a commit to branch master
in repository devscripts.

commit 2eb741693dc3e701687160d721b8c1549b70f8e8
Author: Dominique Dumont 
Date:   Sat Dec 5 19:29:45 2015 +0100

licensecheck: also extract info from end of file

Be default, the last 5k bytes of a file is parsed to get
copyright and license information.
(also required or #806424)
---
 debian/changelog|   1 +
 scripts/licensecheck.pl |  24 ++-
 test/licensecheck/info-at-eof.h | 388 
 test/test_licensecheck  |   5 +
 4 files changed, 413 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1bb7e60..157ada9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,7 @@ devscripts (2.15.10) UNRELEASED; urgency=medium
 + parse multi-line copyright blocks (Closes: #519080)
 + parse .lisp file (part of #806424)
 + added LLGPL license (part of #806424)
++ also parse last 5kb of a file
 
   [ Osamu Aoki ]
   * uscan:
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 3a936b7..3ba7ebd 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -151,6 +151,9 @@ use warningsqw< FATAL  utf8 >;
 
 use Getopt::Long qw(:config gnu_getopt);
 use File::Basename;
+use File::stat;
+use IO::File;
+use Fcntl qw/:seek/;
 
 binmode STDOUT, ':utf8';
 
@@ -334,16 +337,27 @@ while (@files) {
 my $copyright = '';
 my $license = '';
 
+my $st = stat $file;
+
 my $enc = $OPT{encoding} ;
 my $mode = $enc ? "<:encoding($enc)" : '<';
 # need to use "<" when encoding is unknown otherwise we break compatibility
-open (my $F, $mode ,$file) or die "Unable to access $file\n";
+my $fh = IO::File->new ($file ,$mode) or die "Unable to access $file\n";
+
+while ( my $line = $fh->getline ) {
+   last if ($fh->input_line_number > $OPT{'lines'});
+   $content .= $line;
+}
+my $position = $fh->tell; # See IO::Seekable
+
+my $jump = $st->size - 4800; # yeah, that's 60 x 80 chars
+$jump = $position if $jump < $position;
 
-while ( <$F>) {
-   last if ($. > $OPT{'lines'});
-   $content .= $_;
+if ( $jump < $st->size) {
+   $fh->seek($jump, SEEK_SET) ; # also IO::Seekable
+   $content .= join('',$fh->getlines);
 }
-close($F);
+$fh->close;
 
 my %copyrights = extract_copyright($content);
 $copyright = join(" / ", reverse sort values %copyrights);
diff --git a/test/licensecheck/info-at-eof.h b/test/licensecheck/info-at-eof.h
new file mode 100644
index 000..f651a79
--- /dev/null
+++ b/test/licensecheck/info-at-eof.h
@@ -0,0 +1,388 @@
+/*
+** $Id: lua.h,v 1.218.1.7 2012/01/13 20:36:20 roberto Exp $
+** Lua - An Extensible Extension Language
+** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
+** See Copyright Notice at the end of this file
+*/
+
+
+#ifndef lua_h
+#define lua_h
+
+#include 
+#include 
+
+
+#include "luaconf.h"
+
+
+#define LUA_VERSION "Lua 5.1"
+#define LUA_RELEASE "Lua 5.1.5"
+#define LUA_VERSION_NUM 501
+#define LUA_COPYRIGHT   "Copyright (C) 1994-2012 Lua.org, PUC-Rio"
+#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
+
+
+/* mark for precompiled code (`Lua') */
+#define LUA_SIGNATURE   "\033Lua"
+
+/* option for multiple returns in `lua_pcall' and `lua_call' */
+#define LUA_MULTRET (-1)
+
+
+/*
+** pseudo-indices
+*/
+#define LUA_REGISTRYINDEX   (-1)
+#define LUA_ENVIRONINDEX(-10001)
+#define LUA_GLOBALSINDEX(-10002)
+#define lua_upvalueindex(i) (LUA_GLOBALSINDEX-(i))
+
+
+/* thread status; 0 is OK */
+#define LUA_YIELD   1
+#define LUA_ERRRUN  2
+#define LUA_ERRSYNTAX   3
+#define LUA_ERRMEM  4
+#define LUA_ERRERR  5
+
+
+typedef struct lua_State lua_State;
+
+typedef int (*lua_CFunction) (lua_State *L);
+
+
+/*
+** functions that read/write blocks when loading/dumping Lua chunks
+*/
+typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz);
+
+typedef int (*lua_Writer) (lua_State *L, const void* p, size_t sz, void* ud);
+
+
+/*
+** prototype for memory-allocation functions
+*/
+typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
+
+
+/*
+** basic types
+*/
+#define LUA_TNONE   (-1)
+
+#define LUA_TNIL0
+#define LUA_TBOOLEAN1
+#define LUA_TLIGHTUSERDATA  2
+#define LUA_TNUMBER 3
+#define LUA_TSTRING 4
+#define LUA_TTABLE  5
+#define LUA_TFUNCTION   6
+#define LUA_TUSERDATA   7
+#define LUA_TTHREAD 8
+
+
+
+/* minimum Lua stack available to a C function */
+#define LUA_MINSTACK20
+
+
+/*
+** generic extra include file
+*/
+#if defined(LUA_USER_H)
+#include LUA_USER_H
+#endif
+
+
+/* type of numbers in Lua */
+typedef LUA_NUMBER lua_Number;
+
+
+/* type for integer functions 

[devscripts] branch master updated (41b9820 -> 2eb7416)

[dod]

This is an automated email from the git hooks/post-receive script.

dod pushed a change to branch master
in repository devscripts.

  from  41b9820   test_package_lifecycle: jessie backport safe test
   new  2eb7416   licensecheck: also extract info from end of file

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog|   1 +
 scripts/licensecheck.pl |  24 ++-
 test/licensecheck/info-at-eof.h | 388 
 test/test_licensecheck  |   5 +
 4 files changed, 413 insertions(+), 5 deletions(-)
 create mode 100644 test/licensecheck/info-at-eof.h

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

Re: [devscripts] 01/01: test_mk-origtargz: Export LANG=C

[Jakub Wilk]

* Mattia Rizzolo , 2015-12-05, 13:40:

You should set LC_ALL, not LANG.
LANG can be overridden by various LC_* variables;
LC_ALL overrides them all.


And this is particularly true for


-expected_files_after_removal=$(sort <

AFAIK, LANG has no effects on `sort` behaviour.


That's not quite accurate. LANG _can_ affect sort behaviour:

$ printf 'gęś\ngoose\n' | env -i LANG=pl_PL.UTF-8 sort
gęś
goose

$ printf 'gęś\ngoose\n' | env -i sort
goose
gęś


This is what POSIX[0] says about LANG:
This variable shall determine the locale category for native language, 
local customs, and coded character set in the absence of the LC_ALL and 
other LC_* (LC_COLLATE, LC_CTYPE, LC_MESSAGES, LC_MONETARY, LC_NUMERIC, 
LC_TIME) environment variables.


[0] 
http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html#tag_08_02

--
Jakub Wilk

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

Re: [devscripts] 01/01: test_mk-origtargz: Export LANG=C

[Jakub Wilk]

* James McCoy , 2015-12-05, 01:56:

   test_mk-origtargz: Export LANG=C

   Testing was broken in non-en_US locales due to different languages in
   the expected vs. actual output (seen in reproducible build
   testing).

   Forcing LANG=C ensures consistent output regardless of the environment.


You should set LC_ALL, not LANG.
LANG can be overridden by various LC_* variables;
LC_ALL overrides them all.

--
Jakub Wilk

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

[devscripts] 01/01: emergency fixes to test script

[Nicholas Bamber]

This is an automated email from the git hooks/post-receive script.

periapt pushed a commit to branch master
in repository devscripts.

commit 31caed83aff84b4bbb4cce03f7d0c9fca364d405
Author: Nicholas Bamber 
Date:   Sat Dec 5 20:00:58 2015 +

emergency fixes to test script
---
 test/test_licensecheck_SL | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_licensecheck_SL b/test/test_licensecheck_SL
index a07a28a..7beb888 100755
--- a/test/test_licensecheck_SL
+++ b/test/test_licensecheck_SL
@@ -29,14 +29,14 @@ my %LICENSES = (
 Mozilla_1_0=>'MPL (v1.0)',
 None=>'UNKNOWN',
 PostgreSQL=>'UNKNOWN',
-AGPL_3=>'UNKNOWN',
+#AGPL_3=>'UNKNOWN',  This is broken since licensecheck started looking at 
the tail
 SSLeay=>'BSD (2 clause)',
 Apache_1_1=>'UNKNOWN',
 Mozilla_1_1=>'MPL (v1.1)',
 GFDL_1_2=>'UNKNOWN',
 Sun=>'UNKNOWN',
 BSD=>'UNKNOWN',
-OpenSSL=>'UNKNOWN',
+#OpenSSL=>'BSD (4 clause)',  This is actually a dual license not simply 
BSD 4 clause
 Perl_5=>'UNKNOWN',
 );
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

Re: bash completions

[James McCoy]

Note that I don't actually use bash completions (nor bash) so I don't
have much investment in this one way or another.

On Tue, Dec 01, 2015 at 11:20:21PM +, Nicholas Bamber wrote:
> I have had a look through the man pages of these scripts and I would
> classify them as follows:
> 
> default bash completion works
> =
> add-patch
> edit-patch
> dep3changelog
> diff2patches
> manpage-alert

Sounds good.

> not appropriate
> ===
> annotate-output
> namecheck

ACK.

> would rather not touch VCs-specific scripts
> ===

That's fine.  We don't need complete coverage. :) If someone else is
interested in it, they can do it.

> consider
> 
> cowpoke
> dcmd
> debclean
> debcommit
> debdiff
> debpkg
> debrelease (err ...dput-ng?)

Not sure what the parenthetical statement is supposed to mean.

> deb-reversion
> desktop2menu
> dpkg-depcheck
> dpkg-genbuilddeps
> mergechanges
> nmudiff
> origtargz
> plotchangelog
> sadt
> suspicious-source
> tagpending
> what-patch
> who-permits-upload
> wrap-and-sort
> 
> packagenames would do as a stop gap
> 
> debcheckout
> 
> over SSH?
> =
> debrsign

If there's a way to leverage ssh's existing completion, that could be
handy.

Generally, I agree with your categorizations.

> The VCS-specific commands are the most interesting. I don't think
> VCS-specific commands deserve a lot of support. VCS systems historically
> have come and gone (though perhaps that itself is history and git will rule
> all.)
> 
> One approach would be to have commands like debcommit. So we would replace
> archpath and svnpath (if they are doing something similar. I'm not sure)
> with debpath that could support the same VCS systems as debcommit.
> 
> A second approach would be to have one command, say "debvcs" with
> subcommands like "path", "commit", "checkout" etc. It would probably also be
> OO with a base VCS class, and subclasses for git, cvs etc.
> 
> A third approach is to say that's all very nice, but I don't feel like
> contributing to that. I kind of like the third approach.

Yeah, let's not go overboard on utilities that are rarely used.  I doubt
there are many people (if any) using the cvs-* scripts still.  Ditto for
archpath.

I do use svnpath, but never interactively.  It's handled by debcommit.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy 

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

Re: devscripts copyright file

[James McCoy]

On Wed, Nov 18, 2015 at 08:51:13PM +, Nicholas Bamber wrote:
> James,
> 
> I have been looking into the debian/copyright file (which happens to be
> raising a lintian error).

Perhaps you mean “happens to be raising a pedantic severity diagnostic”?

> I have a tool, license-reconcile, which I admit
> is a very immature piece of code, that attempts to reconcile
> debian/copyright to the source code. This can I think be used to get this
> right and keep it right. I had  a go at trying it on devscripts and I attach
> what I currently have.

Whether by hand or tool, it's useful to have this properly documented
and easier to keep up from there on.  Feel free to update the copyright
file.

>  The license-reconcile script uses licensecheck but has a config file to
> guide it when licensecheck cannot read human. I can keep this file privately
> but it would be more collaborative to add it to the debian directory.

Why in debian/? If you find it generally useful, maybe add it to
devscripts itself.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy 

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

Re: [devscripts] 03/03: Add apt to Recommends.

[Nicholas Bamber]

I see another oddity in the dependency list. bash-completion is in the 
build dependency. This looks wrong to me as we do not use it's build 
tools. However it is absent from the Recommends where I believe it belongs.


On 05/12/15 01:36, James McCoy wrote:

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 3a658e8034f7f95abad7514f89f19d36d209cc9a
Author: James McCoy 
Date:   Fri Dec 4 20:33:49 2015 -0500

 Add apt to Recommends.

 While apt is typically installed on a Debian system, it isn't required
 to be.  Add the relationship to play it safe.

 Closes: #807065
 Signed-off-by: James McCoy 
---
  debian/changelog | 2 ++
  debian/control   | 1 +
  2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4c56384..96118b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -101,6 +101,8 @@ devscripts (2.15.10) UNRELEASED; urgency=medium
  + Remove unnecessary requirement that “apt-cache policy $pkg” shows a
priority of 0 for the Candidate version.  (Closes: #807064)
  + Fix parsing of sources.list lines with options.  (Closes: #674812)
+  * Add apt to Recommends, since various scripts use tools from apt.  (Closes:
+#807065)

[ Daniel Kahn Gillmor ]
* debuild:
diff --git a/debian/control b/debian/control
index 919b1b7..643be2a 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,7 @@ Depends: dpkg-dev (>= 1.17.0),
   ${python3:Depends},
   ${shlibs:Depends}
  Recommends: at,
+apt,
  dctrl-tools,
  dput | dupload,
  fakeroot,




___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

[devscripts] 01/01: Rearranged cleanup of tests to use oneTimeSetUp/oneTimeTearDown

[Nicholas Bamber]

This is an automated email from the git hooks/post-receive script.

periapt pushed a commit to branch master
in repository devscripts.

commit 140fdf1372ff387d264719a23090d8a052bb4218
Author: Nicholas Bamber 
Date:   Sat Dec 5 20:44:03 2015 +

Rearranged cleanup of tests to use oneTimeSetUp/oneTimeTearDown
---
 debian/changelog|  1 +
 debian/rules|  4 ---
 test/test_package_lifecycle | 79 -
 test/test_uscan_mangle  | 33 ---
 4 files changed, 65 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 157ada9..576b561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ devscripts (2.15.10) UNRELEASED; urgency=medium
   files from Artistic and Mozilla licenses
   * Added test for life cycle of package:
 + debuild, dscverify, dscextract, list-unreleased, debdiff
+  * Rearranged cleanup of tests to use oneTimeSetUp/oneTimeTearDown
 
   [ Dominique Dumont ]
   * licensecheck:
diff --git a/debian/rules b/debian/rules
index 804ad62..d107992 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,3 @@ else
dh_gencontrol -- -V'vendor:Suggests=' 
-V'vendor:Recommends=$(UBU_SUGGESTS)'
 endif
 
-override_dh_clean:
-   dh_clean
-   rm -rf test/uscan/gpg test/package_lifecycle
-
diff --git a/test/test_package_lifecycle b/test/test_package_lifecycle
index 41be7ed..9a91a7f 100755
--- a/test/test_package_lifecycle
+++ b/test/test_package_lifecycle
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 
 # Copyright (C) 2015, Nicholas Bamber 
 #
@@ -26,40 +26,42 @@ else
export PATH PERL5LIB
 fi
 
-GPG=/usr/bin/gpg
-if [ ! -x $GPG ];then
-echo "$GPG missing"
-GPG=/usr/bin/gpg2
-if [ ! -x $GPG ];then
-echo "$GPG missing"
-exit 1
-fi
-fi
-
-PRIVATE_KEY=${WORKDIR}/uscan/PRIVATE_KEY.asc
-PUBLIC_KEY=${WORKDIR}/uscan/PUBLIC_KEY.asc
+. "${0%/*}/shunit2-helper-functions.sh"
 
 GPGHOME=$(readlink -f ${WORKDIR}/uscan/gpg)
-rm -rf $GPGHOME
-mkdir -p $GPGHOME
-chmod 700 $GPGHOME
-PRIVATE_KEYRING=$GPGHOME/secring.gpg
-PUBLIC_KEYRING=$GPGHOME/pubring.gpg
 
-$GPG -v --homedir $GPGHOME --no-options -q --batch --no-default-keyring \
---output $PRIVATE_KEYRING --dearmor $PRIVATE_KEY
+oneTimeSetUp () {
+   GPG=/usr/bin/gpg
+   if [ ! -x $GPG ];then
+   echo "$GPG missing"
+   GPG=/usr/bin/gpg2
+   if [ ! -x $GPG ];then
+   echo "$GPG missing"
+   exit 1
+   fi
+   fi
 
-$GPG -v --homedir $GPGHOME --no-options -q --batch --no-default-keyring \
---output $PUBLIC_KEYRING --dearmor $PUBLIC_KEY
+   PRIVATE_KEY=${WORKDIR}/uscan/PRIVATE_KEY.asc
+   PUBLIC_KEY=${WORKDIR}/uscan/PUBLIC_KEY.asc
 
-$GPG --homedir $GPGHOME --no-options -q --batch --no-default-keyring \
---secret-keyring $PRIVATE_KEYRING --default-key 72543FAF \
---list-keys --verbose
+   rm -rf $GPGHOME
+   mkdir -p $GPGHOME
+   chmod 700 $GPGHOME
+   PRIVATE_KEYRING=$GPGHOME/secring.gpg
+   PUBLIC_KEYRING=$GPGHOME/pubring.gpg
 
-. "${0%/*}/shunit2-helper-functions.sh"
+   $GPG -v --homedir $GPGHOME --no-options -q --batch --no-default-keyring 
\
+   --output $PRIVATE_KEYRING --dearmor $PRIVATE_KEY
+
+   $GPG -v --homedir $GPGHOME --no-options -q --batch --no-default-keyring 
\
+   --output $PUBLIC_KEYRING --dearmor $PUBLIC_KEY
 
-mkdir -p ${WORKDIR}/package_lifecycle/test/debian/source
-cat > ${WORKDIR}/package_lifecycle/test/debian/control <<-EOS
+   $GPG --homedir $GPGHOME --no-options -q --batch --no-default-keyring \
+   --secret-keyring $PRIVATE_KEYRING --default-key 72543FAF \
+   --list-keys --verbose
+
+   mkdir -p ${WORKDIR}/package_lifecycle/test/debian/source
+   cat > ${WORKDIR}/package_lifecycle/test/debian/control <<-EOS
Source: test
Section: devel
Priority: optional
@@ -72,19 +74,21 @@ cat > ${WORKDIR}/package_lifecycle/test/debian/control 
<<-EOS
Description: Short description
 Longer description
 EOS
-cp /usr/share/doc/debhelper/examples/rules.tiny 
${WORKDIR}/package_lifecycle/test/debian/rules
-_DATE=$(LC_ALL=C date '+%a, %d %b %Y %T +')
-cat > ${WORKDIR}/package_lifecycle/test/debian/changelog <<-EOS
+   cp /usr/share/doc/debhelper/examples/rules.tiny 
${WORKDIR}/package_lifecycle/test/debian/rules
+   _DATE=$(LC_ALL=C date '+%a, %d %b %Y %T +')
+   cat > ${WORKDIR}/package_lifecycle/test/debian/changelog <<-EOS
test (1.0-1) unstable; urgency=low

  * Initial packaging

 -- Testophilus Testownik   ${_DATE}
 EOS
-echo 9 > ${WORKDIR}/package_lifecycle/test/debian/compat
-echo '3.0 (quilt)' > ${WORKDIR}/package_lifecycle/test/debian/source/format
-touch ${WORKDIR}/package_lifecycle/test/CONTENTS
-cd ${WORKDIR}/package_lifecycle/ && 

[devscripts] branch master updated (2eb7416 -> 31caed8)

[Nicholas Bamber]

This is an automated email from the git hooks/post-receive script.

periapt pushed a change to branch master
in repository devscripts.

  from  2eb7416   licensecheck: also extract info from end of file
   new  31caed8   emergency fixes to test script

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 test/test_licensecheck_SL | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/devscripts.git

___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel

Re: [devscripts] 01/01: move test clean up to test rule

[Nicholas Bamber]

Normally the debian stuff has to fill in whatever gaps are not handled 
well by the upstream makefiles. Often this includes cleaning up or 
moving files around. You have the luxury of being in control of upstream 
which means you can interpret "upstream" how you want. You choose to 
interpret upstream maximally but you could have chosen to interpret it 
minimally.


However I am NOT trying to persuade you to change. I just wanted to 
understand.


I have moved the clean up into the One time functions.

The emails I referred to were:
https://lists.alioth.debian.org/pipermail/devscripts-devel/2015-December/004370.html
https://lists.alioth.debian.org/pipermail/devscripts-devel/2015-November/004259.html

I am not really expecting an answer for either this side of the upload.

On 05/12/15 17:27, James McCoy wrote:

On Sat, Dec 05, 2015 at 02:12:38PM +, Nicholas Bamber wrote:

James,
I can move it back of course.

I am actually puzzled why more is not done in debian/rules.


Like most packages, debian/ should only contain content that's relevant
for packaging.

Properly cleaning up detritus created by a test isn't specific to
packaging, so it should be handled by the test (e.g., using shunit's
oneTimeTearDown) or possibly by a clean target in test/Makefile.


The whole
devscripts structure seems sort of odd to me.


Why?  Debian-specific stuff should be handled by things in debian/.
"Upstream" stuff should be handled outside of debian/.


I put the test clean up in debian/rules because then one can easily 
inspect
the generated files between the test phase and the clean phase. More
generally I can think of several places such clean up could be put in:
1. debian/rules
2. Makefile
3. test/Makefile
4. test/test_*

The two obvious places would seem to me 1. and 4. 4. seems not to be
working.


Looking at test_package_lifecycle, it seems like use of either
oneTimeSetUp/oneTimeTearDown or setUp/tearDown would help.


I am not quite sure why though I suspect the test script may be
exiting earlier than the cleanup. However 1. looks better to me anyway for
the reason I said. Both 2. and 3. look wrong to me. Why should test/Makefile
know about the inner workings of the tests?


Why shouldn't it?  Do you expect other upstream Makefiles not to know
how to clean up their generated files?  The use of “debian/rules clean”
should typically only need to clean up files generated by the packaging,
not by the upstream build process.  The upstream files should be cleaned
by the upstream code.


BTW there are several quetsions I have asked which have not been answered.


If they're buried in email chains about commits, where I wasn't already
part of the thread, that's probably why.  Start new threads when you're
discussing new topics.


Also what are the plans for upload?


In the next week or so, probably.

Cheers,




___
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel