diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..218bab3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+node_modules/
+npm-debug.log
+.vscode
+.idea
+yarn.lock
diff --git a/Xcomposer/.gitignore b/Xcomposer/.gitignore
new file mode 100644
index 0000000..07e6e47
--- /dev/null
+++ b/Xcomposer/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/debian/changelog b/debian/changelog
index e799068..cfe6122 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+node-eslint-plugin-eslint-plugin (2.3.0+~0.3.0-4) unstable; urgency=medium
+
+ * update git-buildpackage config:
+ + use DEP-14 branch names debian/latest upstream/latest
+ (not debian/master upstream)
+ + add usage comment
+ * fix lint-check only visible files;
+ closes: bug#1006065, thanks to Lucas Nussbaum
+ * generate documentation with cmark-gfm (not pandoc);
+ build-depend on cmark-gfm (not pandoc)
+ * declare compliance with Debian Policy 4.6.0
+ * update copyright info:
+ + use Reference field (not License-Reference);
+ tighten lintian overrides
+ + update coverage
+ * simplify source helper script copyright-check
+
+ -- Jonas Smedegaard <dr@jones.dk> Fri, 25 Feb 2022 19:02:38 +0100
+
node-eslint-plugin-eslint-plugin (2.3.0+~0.3.0-3) unstable; urgency=medium
* add patch cherry-picked upstream
diff --git a/debian/control b/debian/control
index 957e9d3..7e5ba31 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.deb
Uploaders:
Jonas Smedegaard <dr@jones.dk>,
Build-Depends:
+ cmark-gfm <!nodoc>,
debhelper-compat (= 13),
jq,
mocha <!nocheck>,
@@ -16,8 +17,7 @@ Build-Depends:
node-estraverse <!nocheck>,
node-js-yaml <!nocheck>,
node-lodash <!nocheck>,
- pandoc <!nodoc>,
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
Homepage: https://github.com/not-an-aardvark/eslint-plugin-eslint-plugin
Vcs-Browser: https://salsa.debian.org/js-team/node-eslint-plugin-eslint-plugin
Vcs-Git: https://salsa.debian.org/js-team/node-eslint-plugin-eslint-plugin.git
diff --git a/debian/copyright b/debian/copyright
index b0ef3af..5c77198 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,22 +5,28 @@ Source: https://github.com/not-an-aardvark/eslint-plugin-eslint-plugin/releases
https://github.com/not-an-aardvark/eslint-rule-composer/releases
Files: *
-Copyright: 2016-2017, Teddy Katz <teddy.katz@gmail.com>
+Copyright:
+ 2016-2017 Teddy Katz <teddy.katz@gmail.com>
License: Expat
+Reference:
+ package.json
+ LICENSE
Files:
tests/lib/rules/require-meta-docs-url.js
Copyright:
- 2016, Toru Nagashima <star.ctor@gmail.com>
+ 2016 Toru Nagashima <star.ctor@gmail.com>
License-Grant:
See LICENSE file in root directory for full license.
License: Expat
+Reference:
+ LICENSE
Files:
debian/*
Copyright:
- 2016-2020, Jonas Smedegaard <dr@jones.dk>
- 2019-2020, Purism SPC
+ 2019-2022 Jonas Smedegaard <dr@jones.dk>
+ 2019-2022 Purism SPC
License-Grant:
This program is free software;
you can redistribute it and/or modify it
@@ -28,6 +34,7 @@ License-Grant:
as published by the Free Software Foundation;
either version 3, or (at your option) any later version.
License: GPL-3+
+Reference: debian/copyright
License: Expat
Permission is hereby granted, free of charge,
@@ -54,4 +61,4 @@ License: Expat
OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
License: GPL-3+
-License-Reference: /usr/share/common-licenses/GPL-3
+Reference: /usr/share/common-licenses/GPL-3
diff --git a/debian/copyright-check b/debian/copyright-check
index 23904b6..b7ac352 100755
--- a/debian/copyright-check
+++ b/debian/copyright-check
@@ -1,75 +1,3 @@
#!/bin/sh
-# Copyright 2020 Jonas Smedegaard <dr@jones.dk>
-# Copyright 2020 Purism, SPC
-# Description: helper script to update copyright_hints
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# 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/>.
-set -eu
-
-SKIPFILES='meta'
-
-# omit files not copyright protected nor stating copyright or licensing
-RE_omit='.*\.(ico)'
-
-# cleanup stray hint files from a previous run
-find -type f -regextype posix-egrep -regex "^.*:($SKIPFILES)$" -delete
-
-1>&2 echo 'extract metadata from binary files ...'
-RE_meta='.*\.png'
-exiftool '-textOut!' %d%f.%e:meta -short -short -recurse -ext png .
-
-RE_SKIP="$RE_omit|$RE_meta"
-
-# TODO: automate more of this manual cleanup:
-# * strip garbage copyright holders
-# * optionally merge equally licensed Files sections
-# * do "sort -k2 -k1,1 -u" on copyright holders
-# * merge copyright years for each copyright holder
-# TODO: strip files matching glob in current (only, no later) section
-_licensecheck() {
- GLOB=$1
- shift
- case "$GLOB" in
- '*') 1>&2 echo "check default section(s) ...";;
- '') 1>&2 echo "check remaining upstream section(s) ...";;
- *) 1>&2 echo "check section(s) $GLOB ...";;
- esac
- licensecheck --copyright --deb-machine --recursive --lines 0 "$@" -- * \
- | GLOB=$GLOB SKIPFILES=$SKIPFILES perl -0777 -p \
- -e 'BEGIN { our $GLOB = join "\n ", split(" ",$ENV{GLOB}) }' \
- -e 's/^.*?\n\nFiles: \K/$GLOB\n /s if $GLOB;' \
- -e 's/^.*?\n\nFiles: \K.*?(?=\n\w)/$GLOB/s if $GLOB and $GLOB =~ /^[*]\//;' \
- -e 's/^.*?\n\n//s unless $GLOB and $GLOB =~ /^[*]$/m;' \
- -e 's/^Files:\K /\n /mg;' \
- -e 's/^Copyright:\K /\n /mg;' \
- -e 's/(?:(?<=^ )|(?<=\d{4})),\K (?=\d{4})//mg;' \
- -e 's/:(?:$ENV{SKIPFILES})$//mg;' \
- >> debian/copyright_hints
-}
-
-rm -f debian/copyright_hints
-
-# initially, check all to know roughly what to group and in which order
-#rm -f debian/copyright_hints
-#_licensecheck '' --check '.*' --ignore "^($RE_SKIP|debian/.*)$"
-#exit 0
-
-# check generally
-# * omit non-copyright-protected Debian files
-_licensecheck '*' --check '.*' --ignore "^($RE_SKIP|debian/.*)$"
-_licensecheck '*/debian' --check '^debian/' --ignore "^($RE_SKIP|debian/(changelog|copyright(_hints)?|source/lintian-overrides))$"
-
-# cleanup hint files
-find -type f -regextype posix-egrep -regex "^.*:($SKIPFILES)$" -delete
+licensecheck --check '.*' --recursive --copyright --deb-machine --ignore '^(debian/(changelog|copyright(_hints)?))$' --lines 0 -- * > debian/copyright_hints
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 5cdf685..ab2bc35 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -4,18 +4,32 @@ Upstream-Contact: FIXME
Source: FIXME
Disclaimer: Autogenerated by licensecheck
-Files:
- *
- CHANGELOG.md
+Files: CHANGELOG.md
README.md
Xcomposer/.eslintrc.yml
Xcomposer/.travis.yml
Xcomposer/CHANGELOG.md
Xcomposer/README.md
Xcomposer/lib/rule-composer.js
- Xcomposer/package.json
Xcomposer/tests/lib/rule-composer.js
build/generate-readme-table.js
+ debian/TODO
+ debian/control
+ debian/copyright-check
+ debian/gbp.conf
+ debian/install
+ debian/patches/2001_privacy.patch
+ debian/patches/2002_avoid_eslint-plugin-self.patch
+ debian/patches/2003_avoid_eslint-config-not-an-aardvark.patch
+ debian/patches/2004_avoid_eslint-config-airbnb-base.patch
+ debian/patches/2005_no-require-jsdoc.patch
+ debian/patches/series
+ debian/rules
+ debian/source/format
+ debian/source/lintian-overrides
+ debian/tests/control
+ debian/upstream/metadata
+ debian/watch
docs/rules/consistent-output.md
docs/rules/fixer-return.md
docs/rules/meta-property-ordering.md
@@ -60,7 +74,6 @@ Files:
lib/rules/test-case-property-ordering.js
lib/rules/test-case-shorthand-strings.js
lib/utils.js
- package.json
tests/.eslintrc.yml
tests/build/generate-readme-table.js
tests/lib/index.js
@@ -85,44 +98,26 @@ Files:
tests/lib/rules/test-case-property-ordering.js
tests/lib/rules/test-case-shorthand-strings.js
tests/lib/utils.js
-Copyright:
- NONE
+Copyright: NONE
License: UNKNOWN
FIXME
-Files:
- LICENSE.md
- Xcomposer/LICENSE.md
-Copyright:
- 2016, Teddy Katz
- 2017, Teddy Katz
+Files: Xcomposer/package.json
+ debian/patches/020210413~8eccc37.patch
+ package.json
+Copyright: NONE
License: Expat
FIXME
-Files:
- tests/lib/rules/require-meta-docs-url.js
-Copyright:
- 2016, Toru Nagashima.
-License: UNKNOWN
+Files: LICENSE.md
+ Xcomposer/LICENSE.md
+Copyright: 2016, Teddy Katz
+ 2017, Teddy Katz
+License: Expat
FIXME
-Files:
- */debian
-Copyright:
- NONE
+Files: tests/lib/rules/require-meta-docs-url.js
+Copyright: 2016, Toru Nagashima.
License: UNKNOWN
FIXME
-Files:
- debian/copyright-check
-Copyright:
- --deb-machine --recursive --lines 0 "$@" -- *
- -protected Debian files
- 2020, Jonas Smedegaard <dr@jones.dk>
- 2020, Purism, SPC
- K / /mg;'
- protected nor stating copyright or licensing
- years for each copyright holder
-License: GPL-3+
- FIXME
-
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 8158ae5..b800f5b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,8 +1,15 @@
-# Configuration file for git-buildpackage and friends
+# clone this source: gbp clone $PKG_GIT_URL
+# track upstream source: git remote add upstream-git $UPSTREAM_GIT_URL
+# update this source: gbp pull
+# update upstream source: git fetch upstream-git --tags
+# import upstream release: gbp import-orig --upstream-vcs-tag=$VERSION --uscan
+# build package: gbp buildpackage
+# publish source release: gbp tag && gbp push
[DEFAULT]
pristine-tar = True
sign-tags = True
filter = */.git*
components = ['Xcomposer']
-debian-branch = debian/master
+debian-branch = debian/latest
+upstream-branch = upstream/latest
diff --git a/debian/rules b/debian/rules
index c31fd88..b3d6f68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
+# resolve DEB_VERSION
include /usr/share/dpkg/pkg-info.mk
# generate documentation unless nodoc requested
@@ -19,15 +20,6 @@ ESLINT += --format unix
MOCHA += --reporter dot --no-colors
endif
-%:
- dh $@
-
-%.html: %.md
- pandoc --from gfm-raw_html --to html --standalone --output $@ $<
-
-%.txt: %.md
- pandoc --from gfm-raw_html --to plain --output $@ $<
-
override_dh_clean:
dh_clean -- $(DOCS) $(CHANGELOGS)
@@ -35,7 +27,7 @@ override_dh_auto_build: $(DOCS) $(CHANGELOGS)
override_dh_auto_test:
$(ESLINT) Xcomposer
- $(ESLINT) . --ignore-pattern '!.*'
+ $(ESLINT) . --ignore-pattern '.*'
$(MOCHA) --recursive Xcomposer/tests
$(MOCHA) --recursive tests
@@ -47,3 +39,12 @@ override_dh_installchangelogs:
override_dh_gencontrol:
dh_gencontrol -- -V"composer:Version=$(shell jq --raw-output .version < Xcomposer/package.json)~$(DEB_VERSION)"
+
+%.html: %.md
+ cmark-gfm $< > $@
+
+%.txt: %.md
+ cmark-gfm --to plaintext $< > $@
+
+%:
+ dh $@
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index e5f206a..f90d628 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,3 +1,3 @@
-# License is in License-Reference field (see bug#786450)
+# License is in Reference field (see bug#786450)
missing-license-paragraph-in-dep5-copyright gpl-3\+ *
missing-license-text-in-dep5-copyright GPL-3\+ *
