[Pkg-javascript-commits] [node-iconv] 01/01: Patches & deb folder
matthew pideil
mpideil-guest at moszumanska.debian.org
Mon May 5 08:38:39 UTC 2014
This is an automated email from the git hooks/post-receive script.
mpideil-guest pushed a commit to branch master
in repository node-iconv.
commit 85e7f3fdd8488ff21bb8a972a8f063c8402a37a7
Author: Matthew Pideil <matthewp_debian at teledetection.fr>
Date: Mon May 5 08:36:44 2014 +0000
Patches & deb folder
---
.pc/.quilt_patches | 1 +
.pc/.quilt_series | 1 +
.pc/.version | 1 +
.pc/applied-patches | 2 +
.pc/fix-gyp-callto-nodejs.patch/.timestamp | 0
.../fix-gyp-callto-nodejs.patch/binding.gyp | 0
.pc/fix-libiconv-call.patch/.timestamp | 0
{lib => .pc/fix-libiconv-call.patch/lib}/iconv.js | 0
binding.gyp | 2 +-
debian/changelog | 5 ++
debian/compat | 1 +
debian/control | 20 +++++
debian/copyright | 86 ++++++++++++++++++++++
debian/docs | 2 +
debian/install | 2 +
debian/patches/fix-gyp-callto-nodejs.patch | 12 +++
debian/patches/fix-libiconv-call.patch | 15 ++++
debian/patches/series | 2 +
debian/rules | 39 ++++++++++
debian/source/format | 1 +
debian/watch | 2 +
lib/iconv.js | 2 +-
22 files changed, 194 insertions(+), 2 deletions(-)
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/.pc/applied-patches b/.pc/applied-patches
new file mode 100644
index 0000000..0a142e8
--- /dev/null
+++ b/.pc/applied-patches
@@ -0,0 +1,2 @@
+fix-gyp-callto-nodejs.patch
+fix-libiconv-call.patch
diff --git a/.pc/fix-gyp-callto-nodejs.patch/.timestamp b/.pc/fix-gyp-callto-nodejs.patch/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/binding.gyp b/.pc/fix-gyp-callto-nodejs.patch/binding.gyp
similarity index 100%
copy from binding.gyp
copy to .pc/fix-gyp-callto-nodejs.patch/binding.gyp
diff --git a/.pc/fix-libiconv-call.patch/.timestamp b/.pc/fix-libiconv-call.patch/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/lib/iconv.js b/.pc/fix-libiconv-call.patch/lib/iconv.js
similarity index 100%
copy from lib/iconv.js
copy to .pc/fix-libiconv-call.patch/lib/iconv.js
diff --git a/binding.gyp b/binding.gyp
index 143bb15..06087d2 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -13,7 +13,7 @@
'include_dirs': [
'deps/libiconv/srclib',
'support',
- '<!(node -e "require(\'nan\')")',
+ '<!(nodejs -e "require(\'nan\')")',
],
'sources': [
'deps/libiconv/libcharset/lib/localcharset.c',
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..63299f6
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+node-iconv (2.1.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #744348)
+
+ -- Matthew Pideil <matthewp_debian at teledetection.fr> Sun, 04 May 2014 17:03:31 +0000
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..31b99e1
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,20 @@
+Source: node-iconv
+Section: web
+Priority: optional
+Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
+Uploaders: Matthew Pideil <matthewp_debian at teledetection.fr>
+Build-Depends: debhelper (>= 9.0.0),
+ node-gyp, node-nan
+Standards-Version: 3.9.5
+Homepage: https://github.com/bnoordhuis/node-iconv
+Vcs-Git: git://anonscm.debian.org/pkg-javascript/node-iconv.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-javascript/node-iconv.git
+
+Package: node-iconv
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, nodejs
+Description: text recoding module for Node.js
+ node-iconv provides a simple interface for converting text from one
+ character encoding to another.
+ .
+ Node.js is an event-based server-side javascript engine.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..ecc1b4e
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,86 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: iconv
+Upstream-Contact: Ben Noordhuis <info at bnoordhuis.nl>
+Source: https://github.com/bnoordhuis/node-iconv
+
+Files: *
+Copyright: 2013, Ben Noordhuis <info at bnoordhuis.nl>
+License: ISC
+
+Files: debian/*
+Copyright: 2014, Matthew Pideil <matthewp_debian at teledetection.fr>
+License: GPL-3+
+
+Files: deps/libiconv/*
+ deps/libiconv/autogen.sh 2003-2010
+Copyright: 2000-2011, Free Software Foundation, Inc.
+License: GPL-3+
+
+Files: support/iconv.h
+ deps/libiconv/configure.ac
+Copyright: 1999-2003, 2005-2006, 2008-2011, Free Software Foundation, Inc.
+License: LGPL-2+
+
+Files: deps/libiconv/aclocal.m4
+ deps/libiconv/configure
+Copyright: 1996-2010, Free Software Foundation, Inc.
+License: FSF
+
+License: FSF
+ This file is free software; the Free Software Foundation
+ gives unlimited permission to copy and/or distribute it,
+ with or without modifications, as long as this notice is preserved.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE.
+
+License: GPL-3+
+ 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 of the License, or
+ (at your option) any later version.
+ .
+ This package 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/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: ISC
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+
+License: LGPL-2+
+ The GNU LIBICONV Library is free software; you can redistribute it
+ and/or modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ .
+ The GNU LIBICONV Library 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU LIBICONV Library; see the file COPYING.LIB.
+ If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU Library General
+ Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..e55b2a1
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+README.md
+package.json
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..2715e0e
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,2 @@
+lib/iconv.js /usr/lib/nodejs/
+build/Release/iconv.node /usr/lib/nodejs/iconv
diff --git a/debian/patches/fix-gyp-callto-nodejs.patch b/debian/patches/fix-gyp-callto-nodejs.patch
new file mode 100644
index 0000000..cb356eb
--- /dev/null
+++ b/debian/patches/fix-gyp-callto-nodejs.patch
@@ -0,0 +1,12 @@
+The bindings file used for `node-gyp configure` use call nodejs as 'node' which isn't working.
+--- a/binding.gyp
++++ b/binding.gyp
+@@ -13,7 +13,7 @@
+ 'include_dirs': [
+ 'deps/libiconv/srclib',
+ 'support',
+- '<!(node -e "require(\'nan\')")',
++ '<!(nodejs -e "require(\'nan\')")',
+ ],
+ 'sources': [
+ 'deps/libiconv/libcharset/lib/localcharset.c',
diff --git a/debian/patches/fix-libiconv-call.patch b/debian/patches/fix-libiconv-call.patch
new file mode 100644
index 0000000..c16de90
--- /dev/null
+++ b/debian/patches/fix-libiconv-call.patch
@@ -0,0 +1,15 @@
+The call to libiconv from library iconv.js is false because of not using npm tree
+bindings = require('../build/Release/iconv.node');
+replaced to
+bindings = require('/usr/lib/nodejs/iconv/iconv.node');
+--- a/lib/iconv.js
++++ b/lib/iconv.js
+@@ -21,7 +21,7 @@
+
+ var bindings;
+ try {
+- bindings = require('../build/Release/iconv.node');
++ bindings = require('/usr/lib/nodejs/iconv/iconv.node');
+ }
+ catch (e) {
+ bindings = require('../build/Debug/iconv.node');
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0a142e8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix-gyp-callto-nodejs.patch
+fix-libiconv-call.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..abaa1a6
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,39 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+libiconv_build_dir=$(CURDIR)/node_modules/libiconv
+
+%:
+ dh $@
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf build
+
+override_dh_auto_configure:
+ node-gyp configure
+
+override_dh_auto_build:
+# mkdir -p ${libiconv_build_dir}
+# cp -r
+# dh_auto_build
+ node-gyp build
+
+override_dh_install:
+ dh_install
+ chmod 644 $(CURDIR)/debian/node-iconv/usr/lib/nodejs/iconv/iconv.node
+
+override_dh_shlibdeps:
+ dpkg-shlibdeps \
+ -T$(CURDIR)/debian/node-iconv.substvars \
+ $(CURDIR)/debian/node-iconv/usr/lib/nodejs/iconv/iconv.node
+
+override_dh_strip:
+ strip \
+ --remove-section=.comment \
+ --remove-section=.note \
+ --strip-unneeded \
+ $(CURDIR)/debian/node-iconv/usr/lib/nodejs/iconv/iconv.node
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..970da9b
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://github.com/bnoordhuis/node-iconv/tags .*/archive/v?(\d[\d\.]+).tar.gz
diff --git a/lib/iconv.js b/lib/iconv.js
index 2b6cf77..8fc3332 100644
--- a/lib/iconv.js
+++ b/lib/iconv.js
@@ -21,7 +21,7 @@ var util = require('util');
var bindings;
try {
- bindings = require('../build/Release/iconv.node');
+ bindings = require('/usr/lib/nodejs/iconv/iconv.node');
}
catch (e) {
bindings = require('../build/Debug/iconv.node');
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-iconv.git
More information about the Pkg-javascript-commits
mailing list