Your message dated Mon, 10 May 2021 20:04:33 +0000
with message-id <[email protected]>
and subject line unblock pkg-js-tools
has caused the Debian Bug report #988338,
regarding unblock: pkg-js-tools/0.9.65
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
988338: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988338
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock package pkg-js-tools
[ Reason ]
pkg-js-tools provides dh-sequence-nodejs. It simulates npm install
features to install node modules in the right places.
Since 0.9.52, it reads .npmignore to not install some files. But I
missed to force package.json install, this is fixed by this version
(0.9.65). This unblock is required to fix node-got RC bug (#988334)
[ Impact ]
If not unblocked, node-got and maybe some other node packages may be
broken
[ Tests ]
No specific test
[ Risks ]
This patch includes:
* some doc fixes
* GitHub tags update
* package.json install even if removed by .npmignore
[ Checklist ]
[X] all changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in testing
Cheers,
Yadd (from hospital)
unblock pkg-js-tools/0.9.65
diff --git a/debian/changelog b/debian/changelog
index 9647851..def7239 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+pkg-js-tools (0.9.65) unstable; urgency=medium
+
+ * Force package.json install even if removed by .npmignore (Closes: #988194)
+
+ -- Yadd <[email protected]> Mon, 10 May 2021 20:03:59 +0200
+
+pkg-js-tools (0.9.64) unstable; urgency=medium
+
+ * Fix doc, thanks to Andrius Merkys (Closes: #980549)
+ * Set SALSA_CI_CONFIG_PATH to "debian/salsa-ci.yml" in pkg-js-salsa.conf
+ * Fix GitHub tags template
+ * Update copyright
+
+ -- Yadd <[email protected]> Sat, 27 Mar 2021 07:12:38 +0100
+
pkg-js-tools (0.9.63) unstable; urgency=medium
* autopkgtest: fix regexp that parse debian/nodejs/ext* (Closes: #980195)
diff --git a/debian/control b/debian/control
index 6a1f4bd..9c2fef5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: pkg-js-tools
Maintainer: Debian Javascript Maintainers
<[email protected]>
Uploaders:
- Xavier Guimard <[email protected]>,
+ Yadd <[email protected]>,
Section: devel
Testsuite: autopkgtest-pkg-perl
Priority: optional
@@ -65,12 +65,12 @@ Depends:
libjson-perl,
${misc:Depends},
${perl:Depends},
-Description: collection of autopktest scripts for Nodejs packages
+Description: collection of autopkgtest scripts for Nodejs packages
This package contains test runners
to be used with the autopkgtest infrastructure for Nodejs packages.
.
Packages using the tests with autopkgtests in this package
- can simply set "Testsuite: autopkgtest-nodejs" in debian/control.
+ can simply set "Testsuite: autopkgtest-pkg-nodejs" in debian/control.
.
- Cf. /usr/share/doc/pkg-js-autopkgtest/README.autopkgtest.md
+ Cf. /usr/share/doc/pkg-js-autopkgtest/README.md
for information on the tests and how to tweak them.
diff --git a/debian/copyright b/debian/copyright
index 522c406..be27528 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: pkg-js-tools
Source: https://salsa.debian.org/js-team/pkg-js-tools
Files: *
-Copyright: 2019-2020, Xavier Guimard <[email protected]>
+Copyright: 2019-2020, Yadd <[email protected]>
License: GPL-2+
Files: lintian/*
@@ -12,7 +12,7 @@ Copyright: 2013, Niels Thykier <[email protected]>
2013, 2014, Axel Beckert <[email protected]>
2014, Damyan Ivanov <[email protected]>
2018, Florian Schlichting <[email protected]>
- 2019, Xavier Guimard <[email protected]>
+ 2019-2021, Yadd <[email protected]>
License: GPL-2+
Files: tools/dh-make-node
diff --git a/doc/tools/README.md b/doc/tools/README.md
index 5f8a885..5be8c51 100644
--- a/doc/tools/README.md
+++ b/doc/tools/README.md
@@ -146,7 +146,7 @@ Example:
```
...
-Testsuite: autopkgtest-nodejs
+Testsuite: autopkgtest-pkg-nodejs
Build-Depends: dh-sequence-nodejs
...
```
diff --git a/lib/Debian/Debhelper/Buildsystem/nodejs.pm
b/lib/Debian/Debhelper/Buildsystem/nodejs.pm
index 8e060ac..d02138c 100644
--- a/lib/Debian/Debhelper/Buildsystem/nodejs.pm
+++ b/lib/Debian/Debhelper/Buildsystem/nodejs.pm
@@ -390,7 +390,8 @@ sub install_module {
$mainFile = "$mainFile/index.js" if -d $mainFile;
warning "MAIN: $mainFile\n" if (DEBUG);
$mainFile =~ s#//+#/#g;
- my $foundMain = 0;
+ my $foundMain = 0;
+ my $foundPkgJson = 0;
foreach my $p (@files) {
my $pattern;
@@ -466,7 +467,9 @@ sub install_module {
else {
unless ( grep { $_ } @tests ) {
push @dest, [ $d, $File::Find::name ];
- $foundMain = 1 if $File::Find::name eq $mainFile;
+ $foundMain = 1 if $File::Find::name eq $mainFile;
+ $foundPkgJson = 1
+ if $File::Find::name eq 'package.json';
}
# Debug
@@ -507,6 +510,9 @@ EOF
push @dest, [ $ldir, $mainFile ];
}
}
+ unless ($foundPkgJson) {
+ push @dest, [ '', "$dir/package.json" ];
+ }
foreach (@dest) {
$self->doit_in_builddir( 'mkdir', '-p', "$path/$_->[0]" )
unless doit_noerror( { chdir => $self->get_buildpath },
diff --git a/lib/Debian/PkgJs/Lib.pm b/lib/Debian/PkgJs/Lib.pm
index 2b32ac0..534b474 100644
--- a/lib/Debian/PkgJs/Lib.pm
+++ b/lib/Debian/PkgJs/Lib.pm
@@ -79,7 +79,7 @@ sub git_last_version {
sort {
Dpkg::Version->new( "$a-0", check => 0 )
cmp Dpkg::Version->new( "$b-0", check => 0 )
- } ( $response->content =~ m#.*/archive/v?([\d\.]+).tar.gz#g );
+ } ( $response->content =~ m#.*/archive.*/v?([\d\.]+).tar.gz#g );
return @versions ? pop(@versions) : 0;
}
}
@@ -103,7 +103,7 @@ sub git_watch {
opts=\\
${component}dversionmangle=auto,\\
filenamemangle=s/.*\\/v?([\\d\\.-]+)\\.tar\\.gz/node-$name-\$1.tar.gz/ \\
- $repo/tags$after .*/archive/$version.tar.gz$type
+ $repo/tags$after .*/archive.*/$version.tar.gz$type
EOF
}
else {
diff --git a/pkg-js-salsa.conf b/pkg-js-salsa.conf
index 519162b..427d653 100644
--- a/pkg-js-salsa.conf
+++ b/pkg-js-salsa.conf
@@ -4,3 +4,4 @@ SALSA_IRKER=no
SALSA_KGB=yes
SALSA_IRC_CHANNEL=debian-js-changes
SALSA_TAGPENDING=yes
+SALSA_CI_CONFIG_PATH=debian/salsa-ci.yml
--- End Message ---
--- Begin Message ---
Unblocked.
--- End Message ---
