Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian....@packages.debian.org
Usertags: pu

Hi,

I'm proposing to update dput-ng package in stretch.

The version included in stretch ship a default configuration that
doesn't allow to upload package to common suites like
stretch-backports. (#878665)

Please see the attached .debdiff and the inlined relevant changes
below:

diff -Nru dput-ng-1.13/debian/changelog dput-ng-1.15+deb9u1/debian/changelog
--- dput-ng-1.13/debian/changelog       2017-05-30 17:41:14.000000000 +0100
+++ dput-ng-1.15+deb9u1/debian/changelog        2017-10-28 19:08:23.000000000 
+0100
@@ -1,3 +1,27 @@
+dput-ng (1.15+deb9u1) stretch; urgency=medium
+
+  [ Miguel Landaeta ]
+  * Team upload.
+  * New upstream stable release.
+
+  [ Mattia Rizzolo ]
+  * Fix typo on the jessie-backports-sloppy target.  (Closes: #867245)
+  * Include 'testing' in the rm-managed suites.
+  * Add jessie-backports-sloppy and stretch-backports. (Closes: #878665)
+  * Mark dput-ng-doc as Multi-Arch:foreign.
+  * wrap-and-sort.
+  * Bump Standards-Version to 4.0.0, no changes needed.
+  * doc/man: fix some spelling errors.
+
+  [ James Clarke ]
+  * Add ports-master profile. (Closes: #855154)
+
+  [ Stephan Sürken ]
+  * dput/uploaders/ftp.py: Parse and use optional [:port] part for fqdn.
+    (Closes: #814440)
+
+ -- Miguel Landaeta <nomad...@debian.org>  Sat, 28 Oct 2017 19:08:23 +0100
+
 dput-ng (1.13) unstable; urgency=medium
 
   * Team upload.
diff -Nru dput-ng-1.13/skel/codenames/debian.json 
dput-ng-1.15+deb9u1/skel/codenames/debian.json
--- dput-ng-1.13/skel/codenames/debian.json     2017-05-30 17:39:07.000000000 
+0100
+++ dput-ng-1.15+deb9u1/skel/codenames/debian.json      2017-10-28 
19:01:15.000000000 +0100
@@ -2,7 +2,9 @@
     "backport": [
         "stable-backports",
         "oldstable-backports",
+        "stretch-backports",
         "jessie-backports",
+        "jessie-backports-sloppy",
         "wheezy-backports",
         "wheezy-backports-sloppy",
         "squeeze-backports",
@@ -16,6 +18,7 @@
         "sid"
     ],
     "rm-managed": [
+        "testing",
         "stable",
         "oldstable",
         "bullseye",
@@ -42,5 +45,8 @@
         "stretch-security",
         "buster-security",
         "bullseye-security"
+    ],
+    "ports": [
+        "unreleased"
     ]
 }


Thanks,

-- System Information:
Debian Release: 9.2
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 4.9.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=UTF-8 (charmap=UTF-8) (ignored: LC_ALL set 
to en_US.UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) (ignored: LC_ALL set to 
en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

-- 
Miguel Landaeta, nomadium at debian.org
secure email with PGP 0x6E608B637D8967E9 available at http://miguel.cc/key.
"Faith means not wanting to know what is true." -- Nietzsche
diff -Nru dput-ng-1.13/debian/changelog dput-ng-1.15+deb9u1/debian/changelog
--- dput-ng-1.13/debian/changelog       2017-05-30 17:41:14.000000000 +0100
+++ dput-ng-1.15+deb9u1/debian/changelog        2017-10-28 19:08:23.000000000 
+0100
@@ -1,3 +1,27 @@
+dput-ng (1.15+deb9u1) stretch; urgency=medium
+
+  [ Miguel Landaeta ]
+  * Team upload.
+  * New upstream stable release.
+
+  [ Mattia Rizzolo ]
+  * Fix typo on the jessie-backports-sloppy target.  (Closes: #867245)
+  * Include 'testing' in the rm-managed suites.
+  * Add jessie-backports-sloppy and stretch-backports. (Closes: #878665)
+  * Mark dput-ng-doc as Multi-Arch:foreign.
+  * wrap-and-sort.
+  * Bump Standards-Version to 4.0.0, no changes needed.
+  * doc/man: fix some spelling errors.
+
+  [ James Clarke ]
+  * Add ports-master profile. (Closes: #855154)
+
+  [ Stephan Sürken ]
+  * dput/uploaders/ftp.py: Parse and use optional [:port] part for fqdn.
+    (Closes: #814440)
+
+ -- Miguel Landaeta <nomad...@debian.org>  Sat, 28 Oct 2017 19:08:23 +0100
+
 dput-ng (1.13) unstable; urgency=medium
 
   * Team upload.
diff -Nru dput-ng-1.13/debian/control dput-ng-1.15+deb9u1/debian/control
--- dput-ng-1.13/debian/control 2017-05-30 17:39:07.000000000 +0100
+++ dput-ng-1.15+deb9u1/debian/control  2017-10-28 19:01:15.000000000 +0100
@@ -2,39 +2,49 @@
 Section: devel
 Priority: extra
 Maintainer: dput-ng Maintainers <dput-ng-ma...@lists.alioth.debian.org>
-Uploaders: Arno Töll <a...@debian.org>,
- Paul Tagliamonte <paul...@debian.org>
-Build-Depends: debhelper (>= 10),
- dh-python,
- python-distro-info,
+Uploaders:
+ Arno Töll <a...@debian.org>,
+ Paul Tagliamonte <paul...@debian.org>,
+Build-Depends:
+ asciidoc,
  bash-completion,
+ debhelper (>= 10),
+ dh-python,
+ docbook-xml,
+ docbook-xsl,
+ docbook-xsl-ns,
+ libxml2-utils,
  python-all (>= 2.7~),
- python-setuptools,
  python-coverage,
  python-debian,
+ python-distro-info,
  python-nose,
- python-validictory,
  python-paramiko,
+ python-setuptools,
  python-sphinx (>= 1.0.7+dfsg),
- asciidoc,
- libxml2-utils,
- docbook-xml,
- docbook-xsl,
- docbook-xsl-ns,
- xsltproc
-Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/dputng.git
+ python-validictory,
+ xsltproc,
+Standards-Version: 4.0.0
+Vcs-Browser: https://anonscm.debian.org/git/collab-maint/dputng.git
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/dputng.git
 Homepage: http://dput-ng.debian.net/
 X-Python-Version: >= 2.7
 
 Package: dput-ng
 Architecture: all
-Conflicts: dput
-Replaces: dput
-Provides: dput
-Depends: ${misc:Depends}, ${python:Depends}, python-dput (= ${binary:Version})
-Recommends: bash-completion, python-paramiko
+Conflicts:
+ dput,
+Replaces:
+ dput,
+Provides:
+ dput,
+Depends:
+ python-dput (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+Recommends:
+ bash-completion,
+ python-paramiko,
 Description: next generation Debian package upload tool
  dput-ng is a Debian package upload tool which provides an easy to use
  interface to Debian (like) package archive hosting facilities. It allows
@@ -54,17 +64,18 @@
 Package: python-dput
 Architecture: all
 Section: python
-Depends: ${misc:Depends}, ${python:Depends},
- python-debian,
+Depends:
  gnupg,
+ python-debian,
+ ${misc:Depends},
+ ${python:Depends},
 Recommends:
+ debian-keyring,
  lintian,
+ openssh-client,
  python-distro-info,
  python-paramiko,
  python-validictory,
- openssh-client,
- python-distro-info,
- debian-keyring
 Description: next generation Debian package upload tool (Python library)
  dput-ng is a Debian package upload tool which provides an easy to use
  interface to Debian (like) package archive hosting facilities. It allows
@@ -79,8 +90,11 @@
 
 Package: dput-ng-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Depends:
+ ${misc:Depends},
+ ${sphinxdoc:Depends},
 Description: next generation Debian package upload tool (documentation)
  dput-ng is a Debian package upload tool which provides an easy to use
  interface to Debian (like) package archive hosting facilities. It allows
diff -Nru dput-ng-1.13/debian/copyright dput-ng-1.15+deb9u1/debian/copyright
--- dput-ng-1.13/debian/copyright       2017-05-30 17:39:07.000000000 +0100
+++ dput-ng-1.15+deb9u1/debian/copyright        2017-10-28 19:01:15.000000000 
+0100
@@ -53,4 +53,4 @@
    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-   OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+   OTHER DEALINGS IN THE SOFTWARE.
diff -Nru dput-ng-1.13/debian/dput-ng.dirs 
dput-ng-1.15+deb9u1/debian/dput-ng.dirs
--- dput-ng-1.13/debian/dput-ng.dirs    2017-05-30 17:39:07.000000000 +0100
+++ dput-ng-1.15+deb9u1/debian/dput-ng.dirs     2017-10-28 19:01:15.000000000 
+0100
@@ -1,13 +1,13 @@
-etc/dput.d/hooks
 etc/dput.d/commands
+etc/dput.d/hooks
+etc/dput.d/hooks
 etc/dput.d/interfaces
 etc/dput.d/metas
-etc/dput.d/hooks
 etc/dput.d/profiles
 etc/dput.d/uploaders
 usr/share/dput-ng/commands
+usr/share/dput-ng/hooks
 usr/share/dput-ng/interfaces
 usr/share/dput-ng/metas
-usr/share/dput-ng/hooks
 usr/share/dput-ng/profiles
 usr/share/dput-ng/uploaders
diff -Nru dput-ng-1.13/debian/dput-ng.install 
dput-ng-1.15+deb9u1/debian/dput-ng.install
--- dput-ng-1.13/debian/dput-ng.install 2017-05-30 17:39:07.000000000 +0100
+++ dput-ng-1.15+deb9u1/debian/dput-ng.install  2017-10-28 19:01:15.000000000 
+0100
@@ -1,11 +1,11 @@
+README.md                   usr/share/doc/dput-ng/
 bin/*                       usr/bin/
-skel/metas                  etc/dput.d/
-skel/profiles               etc/dput.d/
-skel/hooks                  usr/share/dput-ng/
+skel/README                 usr/share/dput-ng/
+skel/codenames              usr/share/dput-ng/
 skel/commands               usr/share/dput-ng/
+skel/hooks                  usr/share/dput-ng/
 skel/interfaces             usr/share/dput-ng/
-skel/uploaders              usr/share/dput-ng/
+skel/metas                  etc/dput.d/
+skel/profiles               etc/dput.d/
 skel/schemas                usr/share/dput-ng/
-skel/codenames              usr/share/dput-ng/
-skel/README                 usr/share/dput-ng/
-README.md                   usr/share/doc/dput-ng/
+skel/uploaders              usr/share/dput-ng/
diff -Nru dput-ng-1.13/docs/man/dcut.1.man 
dput-ng-1.15+deb9u1/docs/man/dcut.1.man
--- dput-ng-1.13/docs/man/dcut.1.man    2017-05-30 17:39:07.000000000 +0100
+++ dput-ng-1.15+deb9u1/docs/man/dcut.1.man     2017-10-28 19:01:15.000000000 
+0100
@@ -59,8 +59,8 @@
 *-O, --output*=FILENAME::
        Write the resulting commands file to 'FILENAME' instead of uploading it.
     This option should not be used with the *upload* command.  The selected
-    'FILENAME' wont be overwritten if it exists already. This is very helpful 
for
-    testing that things work correctly.
+    'FILENAME' won't be overwritten if it exists already. This is very helpful
+    for testing that things work correctly.
 
 *-P, --passive*::
        Force FTP passive mode when uploading the package through FTP.
diff -Nru dput-ng-1.13/docs/man/dput.5.man 
dput-ng-1.15+deb9u1/docs/man/dput.5.man
--- dput-ng-1.13/docs/man/dput.5.man    2017-05-30 17:39:07.000000000 +0100
+++ dput-ng-1.15+deb9u1/docs/man/dput.5.man     2017-10-28 19:01:15.000000000 
+0100
@@ -170,7 +170,7 @@
 *incoming* (string)::
 
 The directory that *dput* should upload files to. Most upload sites do not
-allow to write files in the log-in directory. Specify a path here, to which
+allow writes in the log-in directory. Specify a path here, to which
 *dput* should change the directory to, before starting to write files.
 
 *method* (string)::
diff -Nru dput-ng-1.13/dput/uploaders/ftp.py 
dput-ng-1.15+deb9u1/dput/uploaders/ftp.py
--- dput-ng-1.13/dput/uploaders/ftp.py  2017-05-30 17:39:07.000000000 +0100
+++ dput-ng-1.15+deb9u1/dput/uploaders/ftp.py   2017-10-28 19:01:15.000000000 
+0100
@@ -59,12 +59,10 @@
         timeout = conf['timeout'] if 'timeout' in conf else 10
 
         try:
-            self._ftp = ftplib.FTP(
-                self._config["fqdn"],
-                self._config["login"],
-                None,
-                timeout=timeout
-            )
+            self._ftp = ftplib.FTP()
+            host, dummy, port = self._config["fqdn"].partition(":")
+            self._ftp.connect(host, None if port == "" else int(port), timeout)
+            self._ftp.login(self._config["login"])
         except Exception as e:
             raise FtpUploadException(
                 "Could not establish FTP connection to %s: %s" % (
diff -Nru dput-ng-1.13/skel/codenames/debian.json 
dput-ng-1.15+deb9u1/skel/codenames/debian.json
--- dput-ng-1.13/skel/codenames/debian.json     2017-05-30 17:39:07.000000000 
+0100
+++ dput-ng-1.15+deb9u1/skel/codenames/debian.json      2017-10-28 
19:01:15.000000000 +0100
@@ -2,7 +2,9 @@
     "backport": [
         "stable-backports",
         "oldstable-backports",
+        "stretch-backports",
         "jessie-backports",
+        "jessie-backports-sloppy",
         "wheezy-backports",
         "wheezy-backports-sloppy",
         "squeeze-backports",
@@ -16,6 +18,7 @@
         "sid"
     ],
     "rm-managed": [
+        "testing",
         "stable",
         "oldstable",
         "bullseye",
@@ -42,5 +45,8 @@
         "stretch-security",
         "buster-security",
         "bullseye-security"
+    ],
+    "ports": [
+        "unreleased"
     ]
 }
diff -Nru dput-ng-1.13/skel/profiles/ports-master.json 
dput-ng-1.15+deb9u1/skel/profiles/ports-master.json
--- dput-ng-1.13/skel/profiles/ports-master.json        1970-01-01 
01:00:00.000000000 +0100
+++ dput-ng-1.15+deb9u1/skel/profiles/ports-master.json 2017-10-28 
19:01:15.000000000 +0100
@@ -0,0 +1,12 @@
+{
+    "fqdn": "ports-master.debian.org",
+    "incoming": "/incoming/",
+    "login": "anonymous",
+    "meta": "debian",
+    "method": "ftp",
+    "allowed-distribution": {
+        "codename-groups": [
+            "general", "ports"
+        ]
+    }
+}
diff -Nru dput-ng-1.13/tests/dputng/codenames/debian.json 
dput-ng-1.15+deb9u1/tests/dputng/codenames/debian.json
--- dput-ng-1.13/tests/dputng/codenames/debian.json     2017-05-30 
17:39:07.000000000 +0100
+++ dput-ng-1.15+deb9u1/tests/dputng/codenames/debian.json      2017-10-28 
19:01:15.000000000 +0100
@@ -2,7 +2,9 @@
     "backport": [
         "stable-backports",
         "oldstable-backports",
+        "stretch-backports",
         "jessie-backports",
+        "jessie-backports-sloppy",
         "wheezy-backports",
         "wheezy-backports-sloppy",
         "squeeze-backports",
@@ -16,6 +18,7 @@
         "sid"
     ],
     "rm-managed": [
+        "testing",
         "stable",
         "oldstable",
         "bullseye",
@@ -42,5 +45,8 @@
         "stretch-security",
         "buster-security",
         "bullseye-security"
+    ],
+    "ports": [
+        "unreleased"
     ]
 }
diff -Nru dput-ng-1.13/tests/fake_package/fnord_1.0.dsc 
dput-ng-1.15+deb9u1/tests/fake_package/fnord_1.0.dsc
--- dput-ng-1.13/tests/fake_package/fnord_1.0.dsc       2017-05-30 
17:41:14.000000000 +0100
+++ dput-ng-1.15+deb9u1/tests/fake_package/fnord_1.0.dsc        1970-01-01 
01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-Format: 3.0 (native)
-Source: fnord
-Binary: fnord
-Architecture: all
-Version: 1.0
-Maintainer: Winston Smith <wsm...@bigbrother.com>
-Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 9)
-Package-List:
- fnord deb misc optional arch=all
-Checksums-Sha1:
- f013a01ce3928665c721b28a14dc8a9f3f8a43c4 1132 fnord_1.0.tar.xz
-Checksums-Sha256:
- f9925ee11f05bdcf9db4957cf0b4e567d23ecdb3eec41cc5e79693e99a8c94a6 1132 
fnord_1.0.tar.xz
-Files:
- e29410235ba03b5b79c3b72a495d7690 1132 fnord_1.0.tar.xz
diff -Nru dput-ng-1.13/tests/fake_package/fnord_1.0_source.changes 
dput-ng-1.15+deb9u1/tests/fake_package/fnord_1.0_source.changes
--- dput-ng-1.13/tests/fake_package/fnord_1.0_source.changes    2017-05-30 
17:41:14.000000000 +0100
+++ dput-ng-1.15+deb9u1/tests/fake_package/fnord_1.0_source.changes     
1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-Format: 1.8
-Date: Mon, 26 Nov 2012 17:41:41 +0100
-Source: fnord
-Binary: fnord
-Architecture: source
-Version: 1.0
-Distribution: precise
-Urgency: low
-Maintainer: Winston Smith <wsm...@bigbrother.com>
-Changed-By: Winston Smith <wsm...@bigbrother.com>
-Description:
- fnord      - beard labore +1 chillwave esse pour-over sartorial
-Closes: 691624
-Changes:
- fnord (1.0) precise; urgency=low
- .
-   * Initial release (Closes: #691624)
-Checksums-Sha1:
- 8bda78eca7bb59b0b1c719839cd8c3d724e5d6d0 484 fnord_1.0.dsc
- f013a01ce3928665c721b28a14dc8a9f3f8a43c4 1132 fnord_1.0.tar.xz
-Checksums-Sha256:
- 5df7b6a7b53d56522f9af904981c27c38d55601f76e5ee8ff9d540e8c902c2de 484 
fnord_1.0.dsc
- f9925ee11f05bdcf9db4957cf0b4e567d23ecdb3eec41cc5e79693e99a8c94a6 1132 
fnord_1.0.tar.xz
-Files:
- e7c8db137c6a590807332c3c796e8ff9 484 misc optional fnord_1.0.dsc
- e29410235ba03b5b79c3b72a495d7690 1132 misc optional fnord_1.0.tar.xz
diff -Nru dput-ng-1.13/tests/fake_package/fnord_1.0_source.test.upload 
dput-ng-1.15+deb9u1/tests/fake_package/fnord_1.0_source.test.upload
--- dput-ng-1.13/tests/fake_package/fnord_1.0_source.test.upload        
2017-05-30 17:41:14.000000000 +0100
+++ dput-ng-1.15+deb9u1/tests/fake_package/fnord_1.0_source.test.upload 
1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-2016-11-27 12:51:29,136 - dput[21046]: uploader.invoke_dput - Uploading fnord 
using local to test (host: test; directory: /dev/null)
-2016-11-27 12:51:29,136 - dput[21046]: hook.run_hook - running checksum: 
verify checksums before uploading
-2016-11-27 12:51:29,137 - dput[21046]: hook.run_hook - running suite-mismatch: 
check the target distribution for common errors
-2016-11-27 12:51:29,138 - dput[21046]: hook.run_hook - running check-debs: 
makes sure the upload contains a binary package
-2016-11-27 12:51:29,139 - dput[21046]: hook.run_hook - running 
supported-distribution: check whether the target distribution is currently 
supported (using distro-info)
-2016-11-27 12:51:29,140 - dput[21046]: 
distro_info_checks.check_supported_distribution - {u'known': [u'release'], 
u'allowed': [u'release']}
-2016-11-27 12:51:29,141 - dput[21046]: uploader.invoke_dput - Uploading 
fnord_1.0.dsc
-2016-11-27 12:51:29,143 - dput[21046]: uploader.invoke_dput - Uploading 
fnord_1.0.tar.xz
-2016-11-27 12:51:29,144 - dput[21046]: uploader.invoke_dput - Uploading 
fnord_1.0_source.changes
Binary files /tmp/LLPvNURcy6/dput-ng-1.13/tests/fake_package/fnord_1.0.tar.xz 
and /tmp/cUdOS0b0jz/dput-ng-1.15+deb9u1/tests/fake_package/fnord_1.0.tar.xz 
differ

Attachment: signature.asc
Description: PGP signature

Reply via email to