[Pkg-javascript-commits] [node-unicode-tr51] 01/05: Use unicode-data to provide the data, and generate the rest
Julien Puydt
julien.puydt at laposte.net
Sat Sep 9 11:42:36 UTC 2017
This is an automated email from the git hooks/post-receive script.
jpuydt-guest pushed a commit to branch master
in repository node-unicode-tr51.
commit ef8e8a72142ff175ac8fec41395f1e106f89cf27
Author: Julien Puydt <julien.puydt at laposte.net>
Date: Sat Sep 9 13:37:58 2017 +0200
Use unicode-data to provide the data, and generate the rest
---
debian/changelog | 2 +-
debian/control | 3 ++-
debian/copyright | 7 ++-----
debian/install | 2 +-
debian/patches/change_paths.patch | 28 ----------------------------
debian/patches/series | 1 -
debian/rules | 18 ++++++++----------
debian/watch | 1 +
8 files changed, 15 insertions(+), 47 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 010f5e7..e78d884 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-node-unicode-tr51 (9.0.0-1) unstable; urgency=low
+node-unicode-tr51 (9.0.0+ds-1) unstable; urgency=low
* Initial release (Closes: #872693)
diff --git a/debian/control b/debian/control
index 1ce337f..f7cf2a7 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Julien Puydt <julien.puydt at laposte.net>
Build-Depends: debhelper (>= 10),
mocha (>= 1.20.1),
node-jsesc (>= 2.2.0),
- nodejs
+ nodejs,
+ unicode-data (>= 10.0.0-3)
Standards-Version: 4.0.1
Homepage: https://mths.be/unicode-tr51
Vcs-Git: https://anonscm.debian.org/git/pkg-javascript/node-unicode-tr51.git
diff --git a/debian/copyright b/debian/copyright
index 7a84d06..6dee770 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,16 +2,13 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: unicode-tr51
Upstream-Contact: https://github.com/mathiasbynens/unicode-tr51/issues
Source: https://mths.be/unicode-tr51
+Comment: we either get them from unicode-data or build them
+Files-Excluded: data E*js emoji-version.js index.js sequences.js
Files: *
Copyright: 2017 Mathias Bynens (https://mathiasbynens.be/)
License: Expat
-Files: data/*
-Copyright: Unicode, inc
-License: Unicode
-Comment: would become part of unicode-data (bug #873028)
-
Files: debian/*
Copyright: 2017 Julien Puydt <julien.puydt at laposte.net>
License: Expat
diff --git a/debian/install b/debian/install
index 642eba0..9a3fb92 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,2 @@
-dist/* usr/lib/nodejs/unicode-tr51/
+*js usr/lib/nodejs/unicode-tr51/
package.json usr/lib/nodejs/unicode-tr51/
diff --git a/debian/patches/change_paths.patch b/debian/patches/change_paths.patch
deleted file mode 100644
index 34ca380..0000000
--- a/debian/patches/change_paths.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: change paths in the scripts since we build in dist/
-Author: Julien Puydt
-Forwarded: no
-
---- a/scripts/parse-emoji-data.js
-+++ b/scripts/parse-emoji-data.js
-@@ -20,7 +20,7 @@
-
- const parseEmojiData = function() {
- const map = new Map();
-- const source = fs.readFileSync('data/emoji-data.txt', 'utf8');
-+ const source = fs.readFileSync('../data/emoji-data.txt', 'utf8');
- if (!source) {
- return;
- }
---- a/scripts/parse-emoji-sequences.js
-+++ b/scripts/parse-emoji-sequences.js
-@@ -25,8 +25,8 @@
- return sequences;
- };
-
--const sequences = parseEmojiSequences('data/emoji-sequences.txt')
-- .concat(parseEmojiSequences('data/emoji-zwj-sequences.txt'));
-+const sequences = parseEmojiSequences('../data/emoji-sequences.txt')
-+ .concat(parseEmojiSequences('../data/emoji-zwj-sequences.txt'));
-
- const writeData = function(fileName, data) {
- fs.writeFileSync(
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a028e82..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-change_paths.patch
diff --git a/debian/rules b/debian/rules
index 7acb863..4c9f34a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,26 +3,24 @@
%:
dh $@
-DIR_DIST=data scripts tests
-
override_dh_auto_build:
- mkdir dist
- set -e ; for d in $(DIR_DIST); do \
- cp -r $$d dist/; \
- done
- cd dist && node scripts/parse-emoji-data.js
- cd dist && node scripts/parse-emoji-sequences.js
+ mkdir data
+ ln -s /usr/share/unicode/emoji/emoji-data.txt data/
+ ln -s /usr/share/unicode/emoji/emoji-sequences.txt data/
+ ln -s /usr/share/unicode/emoji/emoji-zwj-sequences.txt data/
+ node scripts/parse-emoji-data.js
+ node scripts/parse-emoji-sequences.js
override_dh_auto_clean:
dh_auto_clean
- rm -rf dist
+ rm -rf data *js
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
override_dh_auto_test:
@echo '**********************************************************'
@echo ' Run package test suite'
@echo '**********************************************************'
- cd dist && mocha tests/tests.js
+ mocha tests/tests.js
else
override_dh_auto_test:
@echo '**********************************************************'
diff --git a/debian/watch b/debian/watch
index caf0da4..ef6fc47 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,6 @@
version=4
opts=\
+repacksuffix=+ds,\
dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,\
filenamemangle=s/.*\/v?([\d\.-]+)\.tar\.gz/node-unicode-tr51-$1.tar.gz/ \
https://github.com/mathiasbynens/unicode-tr51/tags .*/archive/v?([\d\.]+).tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-unicode-tr51.git
More information about the Pkg-javascript-commits
mailing list