Your message dated Sun, 24 Mar 2019 14:55:00 +0000
with message-id <791da7f2-0814-4287-2631-454b81659...@thykier.net>
and subject line Re: Bug#925235: unblock: node-jschardet/1.6.0+dfsg-2
has caused the Debian Bug report #925235,
regarding unblock: node-jschardet/1.6.0+dfsg-2
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 ow...@bugs.debian.org
immediately.)
--
925235: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925235
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package node-jschardet
Hello,
due to uglifyjs and webpack changes, this package was not buildable in
buster. I updated it, the main change is in debian/rules to find
uglifyjs from node-uglify instead if new uglifyjs isn't available (see
#925211: conflict between webpack and uglifyjs). I updated also some
other things since package was a little outdated.
This fixes RC bug #924807
Cheers,
Xavier
unblock node-jschardet/1.6.0+dfsg-2
-- System Information:
Debian Release: buster/sid
APT prefers testing
APT policy: (600, 'testing'), (50, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.14.0-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE=
(charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff --git a/debian/changelog b/debian/changelog
index 57d5cc0..861c722 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+node-jschardet (1.6.0+dfsg-2) unstable; urgency=medium
+
+ * Team upload
+ * Add debian/clean
+ * Use node-uglify if uglifyjs isn't available (Closes: #924807)
+ * Bump debhelper compatibility level to 11
+ * Declare compliance with policy 4.3.0
+ * Fix VCS fields
+ * Fix debian/copyright URL format
+ * Switch minimal test to pkg-js-tools
+ * Add upstream/metadata
+ * Update lintian-overrides
+ * Add Multi-Arch: foreign
+
+ -- Xavier Guimard <y...@debian.org> Thu, 21 Mar 2019 15:52:01 +0100
+
node-jschardet (1.6.0+dfsg-1) unstable; urgency=low
* Initial release (Closes: #886228)
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..f5985ef
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+dist/
+buffer
diff --git a/debian/compat b/debian/compat
index ec63514..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
diff --git a/debian/control b/debian/control
index 8d8f730..628f301 100644
--- a/debian/control
+++ b/debian/control
@@ -1,24 +1,24 @@
Source: node-jschardet
-Section: javascript
-Priority: optional
Maintainer: Debian Javascript Maintainers
<pkg-javascript-de...@lists.alioth.debian.org>
Uploaders: Pirate Praveen <prav...@debian.org>
-Build-Depends:
- debhelper (>= 9)
- , dh-buildinfo
- , nodejs
- , uglifyjs
- , webpack
-Standards-Version: 4.1.3
+Section: javascript
+Priority: optional
+Testsuite: autopkgtest-pkg-nodejs
+Build-Depends: debhelper (>= 11~),
+ dh-buildinfo,
+ nodejs,
+ pkg-js-tools,
+ webpack
+Standards-Version: 4.3.0
+Vcs-Browser: https://salsa.debian.org/js-team/node-jschardet
+Vcs-Git: https://salsa.debian.org/js-team/node-jschardet.git
Homepage: https://github.com/aadsm/jschardet#readme
-Vcs-Git: https://anonscm.debian.org/git/pkg-javascript/node-jschardet.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-javascript/node-jschardet.git
Package: node-jschardet
Architecture: all
-Depends:
- ${misc:Depends}
- , nodejs
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+ nodejs
Description: Character encoding auto-detection in JavaScript
This library takes a sequence of bytes in an unknown character encoding, and
attempts to determine the encoding. This module is a port of python's chardet.
diff --git a/debian/copyright b/debian/copyright
index 90974d4..3379b80 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -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: jschardet
Upstream-Contact: https://github.com/aadsm/jschardet/issues
Source: https://github.com/aadsm/jschardet#readme
@@ -8,6 +8,7 @@ Files: *
Copyright: 2001, Netscape Communications Corporation
2018, António Afonso
License: LGPL-2.1+
+Comment: Portions created by the Initial Developer are Copyright (C) 2001
Files: debian/*
Copyright: 2018, Pirate Praveen <prav...@debian.org>
@@ -29,7 +30,7 @@ License: LGPL-2.1+
Lesser 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 <http://www.gnu.org/licenses/>.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in "/usr/share/common-licenses/LGPL-2.1".
diff --git a/debian/rules b/debian/rules
index 98d0df3..c553b2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,13 +5,14 @@
#export DH_VERBOSE=1
%:
- dh $@
+ dh $@ --with nodejs
override_dh_auto_build:
+ ln -s /usr/lib/nodejs/buffer .
webpack --config debian/webpack.config.js --output-library=jschardet
index.js dist/jschardet.js
- uglifyjs dist/jschardet.js > dist/jschardet.min.js
-
-#override_dh_auto_test:
-
-
-
+ if [ -e /usr/bin/uglifyjs ]; then \
+ uglifyjs dist/jschardet.js > dist/jschardet.min.js; \
+ else \
+ /usr/lib/nodejs/uglify-js/bin/uglifyjs dist/jschardet.js >
dist/jschardet.min.js; \
+ fi
+ rm -f buffer
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index f91af27..7f7b0c7 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,2 +1,5 @@
# false positive
node-jschardet source: source-is-missing tests/jschardet.js line length is
1105 characters (>512)
+node-jschardet source: insane-line-length-in-source-file tests/jschardet.js
line length is 1109 characters (>512)
+node-jschardet source: source-contains-prebuilt-javascript-object
tests/jschardet.js line length is 1105 characters (>512)
+
diff --git a/debian/tests/control b/debian/tests/control
deleted file mode 100644
index c8b6b41..0000000
--- a/debian/tests/control
+++ /dev/null
@@ -1,2 +0,0 @@
-Tests: require
-Depends: node-jschardet
diff --git a/debian/tests/require b/debian/tests/require
deleted file mode 100644
index c605e97..0000000
--- a/debian/tests/require
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-set -e
-nodejs -e "require('jschardet');"
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..8c5efd4
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,7 @@
+---
+Archive: GitHub
+Bug-Database: https://github.com/aadsm/jschardet/issues
+Contact: https://github.com/aadsm/jschardet/issues
+Name: jschardet
+Repository: https://github.com/aadsm/jschardet.git
+Repository-Browse: https://github.com/aadsm/jschardet
--- End Message ---
--- Begin Message ---
Xavier:
> Le 23/03/2019 à 17:21, Jonathan Wiltshire a écrit :
>> Control: tag -1 moreinfo
>>
>> On Thu, Mar 21, 2019 at 04:10:02PM +0100, Xavier Guimard wrote:
>>> +node-jschardet (1.6.0+dfsg-2) unstable; urgency=medium
>>> +
>>> + * Team upload
>>> + * Add debian/clean
>>> + * Use node-uglify if uglifyjs isn't available (Closes: #924807)
>>> + * Bump debhelper compatibility level to 11
>>
>> The time is gone for changing debhelper levels; please revert that.
>>
>>> + * Declare compliance with policy 4.3.0
>>> + * Fix VCS fields
>>> + * Fix debian/copyright URL format
>>> + * Switch minimal test to pkg-js-tools
>>> + * Add upstream/metadata
>>> + * Update lintian-overrides
>>> + * Add Multi-Arch: foreign
>>
>> Multi-arch changes aren't really appropriate now either.
>>
>>
>> Thanks,
>
> Hello,
>
> done in version 1.6.0+dfsg-3
>
> Cheers,
> Xavier
>
Unblocked, thanks.
~Niels
--- End Message ---
