Control: tags 941638 + pending

Dear maintainer,

I've prepared an NMU for docopt (versioned as 0.6.2-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru docopt-0.6.2/debian/changelog docopt-0.6.2/debian/changelog
--- docopt-0.6.2/debian/changelog	2018-08-17 10:16:51.000000000 -0400
+++ docopt-0.6.2/debian/changelog	2019-10-11 00:57:20.000000000 -0400
@@ -1,3 +1,16 @@
+docopt (0.6.2-2.1) unstable; urgency=medium
+
+  [ Matthias Klose ]
+  * Don't run the Python2 autopkg tests. python-schema is gone.
+
+  [ Ondřej Nový ]
+  * d/copyright: Use https protocol in Format field
+
+  [ Antoine Beaupré ]
+  * Non-maintainer upload to ship Klose's patch (Closes: #941638)
+
+ -- Antoine Beaupré <anar...@debian.org>  Fri, 11 Oct 2019 00:57:20 -0400
+
 docopt (0.6.2-2) unstable; urgency=medium
 
   * [d/control] Remove obsolete X-Python-Version
diff -Nru docopt-0.6.2/debian/copyright docopt-0.6.2/debian/copyright
--- docopt-0.6.2/debian/copyright	2018-08-17 10:16:51.000000000 -0400
+++ docopt-0.6.2/debian/copyright	2019-10-11 00:57:20.000000000 -0400
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: docopt
 Upstream-Contact: Vladimir Keleshev <vladi...@keleshev.com>
 Source: https://github.com/docopt/docopt
diff -Nru docopt-0.6.2/debian/gitlab-ci.yml docopt-0.6.2/debian/gitlab-ci.yml
--- docopt-0.6.2/debian/gitlab-ci.yml	2018-08-17 10:16:51.000000000 -0400
+++ docopt-0.6.2/debian/gitlab-ci.yml	2019-10-11 00:57:20.000000000 -0400
@@ -1,71 +1,16 @@
-# Warning! This file is autogenerated by salsa pipeline bot. Any change made
-# over this document will be lost. Customization and changes must be made over
-# the template yaml.
-variables:
-  DEBFULLNAME: "Salsa Pipeline"
-  DEBEMAIL: "<salsa-pipel...@debian.org>"
-  DEBIAN_FRONTEND: noninteractive
-  WORKING_DIR: ./debian/output
+include: https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
 
-stages:
-  - build
-  - test
+build:
+    extends: .build-unstable
 
-image: debian:unstable
+reprotest:
+    extends: .test-reprotest
 
-build package:
-  stage: build
-  image: registry.salsa.debian.org/salsa-ci-team/images/gbp
-  artifacts:
-    expire_in: 180 day
-    name: "$CI_BUILD_NAME"
-    paths:
-        - ${WORKING_DIR}/
-  script:
-    - apt-get update
-    - eatmydata apt-get build-dep -y .
-    - gbp pull --ignore-branch
-    - gbp buildpackage --git-ignore-branch --git-export-dir=${WORKING_DIR} -us -uc
+lintian:
+    extends: .test-lintian
 
-run autopkgtest:
-  stage: test
-  image: registry.salsa.debian.org/salsa-ci-team/images/autopkgtest
-  script:
-    - eatmydata autopkgtest -U ${WORKING_DIR}/*.deb -- null
+autopkgtest:
+    extends: .test-autopkgtest
 
-run lintian:
-  stage: test
-  image: registry.salsa.debian.org/salsa-ci-team/images/lintian
-  script:
-    - lintian -iI ${WORKING_DIR}/*.changes
-
-run reprotest:
-  stage: test
-  image: registry.salsa.debian.org/salsa-ci-team/images/reprotest
-  artifacts:
-    name: "$CI_BUILD_NAME"
-    expire_in: 180 day
-    paths:
-      - ./reprotest.log
-    when: always
-  script:
-    - apt-get update
-    - eatmydata apt-get build-dep -y .
-    - export DEB_BUILD_OPTIONS=nocheck
-    - eatmydata reprotest . -- null &> reprotest.log
-
-run piuparts:
-  stage: test
-  image: registry.salsa.debian.org/salsa-ci-team/images/piuparts
-  services:
-    - docker:dind
-  script:
-    - CHROOT_PATH=/tmp/debian-unstable
-    - CONTAINER_ID=$(docker run --rm -d debian:unstable sleep infinity)
-    - docker exec ${CONTAINER_ID} bash -c "apt-get update && apt-get install eatmydata -y"
-    - mkdir -p ${CHROOT_PATH}
-    - docker export ${CONTAINER_ID} | tar -C ${CHROOT_PATH} -xf -
-    - mknod -m 666 ${CHROOT_PATH}/dev/urandom c 1 9
-    - piuparts --hard-link -e ${CHROOT_PATH} ${WORKING_DIR}/*.deb
-# End of include
-#################################### Below starts the local customization ###################################
+piuparts:
+    extends: .test-piuparts
diff -Nru docopt-0.6.2/debian/gitlab-ci.yml.tpl docopt-0.6.2/debian/gitlab-ci.yml.tpl
--- docopt-0.6.2/debian/gitlab-ci.yml.tpl	2018-08-17 10:16:51.000000000 -0400
+++ docopt-0.6.2/debian/gitlab-ci.yml.tpl	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-include: https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-
-# end of salsa pipeline bot parser
diff -Nru docopt-0.6.2/debian/tests/control docopt-0.6.2/debian/tests/control
--- docopt-0.6.2/debian/tests/control	2018-08-17 10:16:51.000000000 -0400
+++ docopt-0.6.2/debian/tests/control	2019-10-11 00:57:20.000000000 -0400
@@ -2,5 +2,3 @@
 Depends: @,
  python3-pytest,
  python3-schema,
- python-pytest,
- python-schema,
diff -Nru docopt-0.6.2/debian/tests/run_examples docopt-0.6.2/debian/tests/run_examples
--- docopt-0.6.2/debian/tests/run_examples	2018-08-17 10:16:51.000000000 -0400
+++ docopt-0.6.2/debian/tests/run_examples	2019-10-11 00:57:20.000000000 -0400
@@ -1,7 +1,3 @@
 for file in $(ls examples/*.py); do
     python3 $file -h
 done
-
-for file in $(ls examples/*.py); do
-    python $file -h
-done
diff -Nru docopt-0.6.2/debian/tests/unittests docopt-0.6.2/debian/tests/unittests
--- docopt-0.6.2/debian/tests/unittests	2018-08-17 10:16:51.000000000 -0400
+++ docopt-0.6.2/debian/tests/unittests	2019-10-11 00:57:20.000000000 -0400
@@ -1,2 +1 @@
 pytest-3
-pytest

Attachment: signature.asc
Description: PGP signature

Reply via email to