Opps, spurious leftover line on end of patch in previous mail. This one should actually work.
Wookey -- Principal hats: Linaro, Debian, Wookware, ARM http://wookware.org/
diff -Nru npm2deb-0.3.0/debian/changelog npm2deb-0.3.0/debian/changelog --- npm2deb-0.3.0/debian/changelog 2020-04-30 15:06:06.000000000 +0100 +++ npm2deb-0.3.0/debian/changelog 2020-06-01 03:51:22.000000000 +0100 @@ -1,3 +1,10 @@ +npm2deb (0.3.0-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Remove initial directory if uupdate succeeds (Closes: #961873) + + -- Wookey <woo...@debian.org> Mon, 01 Jun 2020 02:51:22 +0000 + npm2deb (0.3.0-4) unstable; urgency=medium * Team upload diff -Nru npm2deb-0.3.0/debian/patches/fix-961873-cleanup-initial-debian-dir.patch npm2deb-0.3.0/debian/patches/fix-961873-cleanup-initial-debian-dir.patch --- npm2deb-0.3.0/debian/patches/fix-961873-cleanup-initial-debian-dir.patch 1970-01-01 01:00:00.000000000 +0100 +++ npm2deb-0.3.0/debian/patches/fix-961873-cleanup-initial-debian-dir.patch 2020-06-01 03:51:22.000000000 +0100 @@ -0,0 +1,25 @@ +Description: Remove initial temporary debian dir if uupdate succeeds +Author: Wookey <woo...@debian.org> +Bug-Debian: https://bugs.debian.org/961873 +Last-Update: 2020-06-01 + +--- npm2deb-0.3.0.orig/npm2deb/__init__.py ++++ npm2deb-0.3.0/npm2deb/__init__.py +@@ -100,6 +100,9 @@ class Npm2Deb(object): + + new_dir = '%s-%s' % (self.debian_name, self.upstream_version) + utils.change_dir('../%s' % new_dir) ++ # copy over non-duplicate changelog ++ _os.rename('../%s/debian/changelog' % self.debian_name, 'debian/changelog') ++ _rmtree('../%s' % self.debian_name) + self.run_buildpackage() + self.edit_changelog() + +--- npm2deb-0.3.0.orig/npm2deb/templates.py ++++ npm2deb-0.3.0/npm2deb/templates.py +@@ -1,4 +1,4 @@ +-CHANGELOG = """%(debian_name)s (%(version)s-1) UNRELEASED; urgency=low ++CHANGELOG = """%(debian_name)s (%(version)s-1) UNRELEASED; urgency=medium + + * Initial release (Closes: #nnnn) + diff -Nru npm2deb-0.3.0/debian/patches/series npm2deb-0.3.0/debian/patches/series --- npm2deb-0.3.0/debian/patches/series 2020-04-30 15:04:16.000000000 +0100 +++ npm2deb-0.3.0/debian/patches/series 2020-06-01 03:51:22.000000000 +0100 @@ -2,3 +2,4 @@ switch-install-to-pkg-js-tools.diff switch-to-debhelper-compat.diff fix-warnings.diff +fix-961873-cleanup-initial-debian-dir.patch
signature.asc
Description: PGP signature
