[Pkg-javascript-commits] [SCM] simplified HTTP request client for NodeJS branch, master, updated. debian/2.9.153-1-413-gd44bf32

Jonas Smedegaard dr at jones.dk
Mon Apr 15 23:28:08 UTC 2013 

The following commit has been merged in the master branch:
commit d44bf321defb5a681497e9c2042a51d1d219b446
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Apr 16 01:27:52 2013 +0200

    Repackage using CDBS.

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..63f32b1
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+CDBS+git-buildpackage
+---------------------
+
+This source package uses CDBS and git-buildpackage.
+
+More info here: http://wiki.debian.org/CDBS+git-buildpackage
+
+
+ -- Jonas Smedegaard <dr at jones.dk>  Wed, 14 Nov 2012 18:34:55 +0100
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index 72a229c..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Not use the embedded copy of vendor/cookie/ from tobi (available via npm),
-  which should be packaged and depended upon.
diff --git a/debian/changelog b/debian/changelog
index 26770b1..0ea5dc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+node-request (2.16.2-1) UN RELEASED; urgency=low
+
+  [ upstream ]
+  * New release.
+
+  [ Jonas Smedegaard ]
+  * Repackage using CDBS.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Tue, 16 Apr 2013 01:25:42 +0200
+
 node-request (2.9.153-1) unstable; urgency=low
 
   [ Jérémy Lal ]
diff --git a/debian/control b/debian/control
index 52a1e1f..cfe3495 100644
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,33 @@ Source: node-request
 Section: web
 Priority: extra
 Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
-Uploaders: David Paleino <dapal at debian.org>
- , Jérémy Lal <kapouer at melix.org>
-Build-Depends:
- debhelper (>= 8.0.0)
- , dh-buildinfo
-Standards-Version: 3.9.3
+Uploaders: Jérémy Lal <kapouer at melix.org>,
+ Jonas Smedegaard <dr at jones.dk>
+Build-Depends: cdbs,
+ devscripts,
+ debhelper,
+ dh-buildinfo,
+ node-form-data,
+ node-mime,
+ node-hawk,
+ node-node-uuid,
+ node-cookie-jar,
+ node-aws-sign,
+ node-oauth-sign,
+ node-forever-agent,
+ node-tunnel-agent,
+ node-json-strignify-safe,
+ node-qs,
+ nodejs
+Standards-Version: 3.9.4
 Homepage: https://github.com/mikeal/request
-Vcs-Git: git://git.debian.org/collab-maint/node-request.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/node-request.git;a=summary
+Vcs-Git: git://anonscm.debian.org/collab-maint/node-request.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/node-request.git
 
 Package: node-request
 Architecture: all
-Depends:
- ${misc:Depends}
- , nodejs
+Depends: ${misc:Depends},
+ ${cdbs:Depends}
 Description: simplified HTTP request client for NodeJS
  Request is a simple HTTP client for the NodeJS framework.
  .
diff --git a/debian/control b/debian/control.in
similarity index 54%
copy from debian/control
copy to debian/control.in
index 52a1e1f..0a51d3d 100644
--- a/debian/control
+++ b/debian/control.in
@@ -2,21 +2,18 @@ Source: node-request
 Section: web
 Priority: extra
 Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
-Uploaders: David Paleino <dapal at debian.org>
- , Jérémy Lal <kapouer at melix.org>
-Build-Depends:
- debhelper (>= 8.0.0)
- , dh-buildinfo
-Standards-Version: 3.9.3
+Uploaders: Jérémy Lal <kapouer at melix.org>,
+ Jonas Smedegaard <dr at jones.dk>
+Build-Depends: @cdbs@
+Standards-Version: 3.9.4
 Homepage: https://github.com/mikeal/request
-Vcs-Git: git://git.debian.org/collab-maint/node-request.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/node-request.git;a=summary
+Vcs-Git: git://anonscm.debian.org/collab-maint/node-request.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/node-request.git
 
 Package: node-request
 Architecture: all
-Depends:
- ${misc:Depends}
- , nodejs
+Depends: ${misc:Depends},
+ ${cdbs:Depends}
 Description: simplified HTTP request client for NodeJS
  Request is a simple HTTP client for the NodeJS framework.
  .
diff --git a/debian/copyright b/debian/copyright
index 3f10bba..9bc5987 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,50 +1,50 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: request
+Upstream-Contact: https://github.com/mikeal/request/issues
+Source: https://github.com/mikeal/request
 
 Files: *
-Copyright: ©, Mikeal Rogers <mikeal.rogers at gmail.com>
+Copyright: 2010-2012 Mikeal Rogers <mikeal.rogers at gmail.com>
 License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+
+Files: debian/*
+Copyright: 2011-2012, David Paleino <dapal at debian.org>
+Copyright: 2013, Jonas Smedegaard <dr at jones.dk>
+License: GPL-3+
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at
  .
  http://www.apache.org/licenses/LICENSE-2.0
  .
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License.
  .
- On Debian systems, the complete text of the Apache version 2.0 license
- can be found in "/usr/share/common-licenses/Apache-2.0".
-
-Files: debian/*
-Copyright: © 2011-2012, David Paleino <dapal at debian.org>
-License: MIT
-
-Files: vendor/*
-Copyright: © 2010, LearnBoost <dev at learnboost.com>
-License: MIT
+ Comment:
+ .
+ On Debian systems the 'Apache' license version 2.0 is located in
+ '/usr/share/common-licenses/Apache-2.0'.
 
-License: MIT
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
+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, 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.
+ .
+ Comment:
+ .
+ On Debian systems the 'GNU General Public License' version 3 is located
+ in '/usr/share/common-licenses/GPL-3'.
+ .
+ You should have received a copy of the 'GNU General Public License'
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/debian/copyright_hints b/debian/copyright_hints
new file mode 100644
index 0000000..632975a
--- /dev/null
+++ b/debian/copyright_hints
@@ -0,0 +1,82 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: FIXME
+Upstream-Contact: FIXME
+Source: FIXME
+Disclaimer: Autogenerated by CDBS
+
+Files: README.md
+ debian/README.source
+ debian/compat
+ debian/control
+ debian/control.in
+ debian/source/format
+ debian/watch
+ package.json
+ tests/run.js
+ tests/server.js
+ tests/squid.conf
+ tests/ssl/ca/ca.cnf
+ tests/ssl/ca/ca.crt
+ tests/ssl/ca/ca.csr
+ tests/ssl/ca/ca.key
+ tests/ssl/ca/ca.srl
+ tests/ssl/ca/server.cnf
+ tests/ssl/ca/server.crt
+ tests/ssl/ca/server.csr
+ tests/ssl/ca/server.js
+ tests/ssl/ca/server.key
+ tests/ssl/npm-ca.crt
+ tests/ssl/test.crt
+ tests/ssl/test.key
+ tests/test-basic-auth.js
+ tests/test-body.js
+ tests/test-defaults.js
+ tests/test-digest-auth.js
+ tests/test-errors.js
+ tests/test-follow-all-303.js
+ tests/test-follow-all.js
+ tests/test-form.js
+ tests/test-hawk.js
+ tests/test-headers.js
+ tests/test-httpModule.js
+ tests/test-https-strict.js
+ tests/test-https.js
+ tests/test-oauth.js
+ tests/test-params.js
+ tests/test-piped-redirect.js
+ tests/test-pipes.js
+ tests/test-pool.js
+ tests/test-protocol-changing-redirect.js
+ tests/test-proxy.js
+ tests/test-qs.js
+ tests/test-redirect.js
+ tests/test-s3.js
+ tests/test-timeout.js
+ tests/test-toJSON.js
+Copyright: *No copyright*
+License: UNKNOWN
+ FIXME
+
+Files: index.js
+Copyright: 2010-2012, Mikeal Rogers
+License: Apache-2.0
+ FIXME
+
+Files: debian/rules
+Copyright: 2013, Jonas Smedegaard <dr at jones.dk>
+License: GPL-2+
+ FIXME
+
+Files: tests/test-tunnel.js
+Copyright: 
+License: UNKNOWN
+ FIXME
+
+Files: LICENSE
+Copyright: License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form
+  owner or by an individual or Legal Entity authorized to submit on behalf of the owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the owner as "Not a Contribution."
+  owner or entity authorized by the owner that is granting the License
+  statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License
+License: UNKNOWN
+ FIXME
+
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index b43bf86..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..790a2f9
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,8 @@
+# Configuration file for git-buildpackage and friends
+
+[DEFAULT]
+pristine-tar = True
+sign-tags = True
+
+[git-import-orig]
+filter = .gitignore
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 6a0c2ab..0000000
--- a/debian/install
+++ /dev/null
@@ -1,9 +0,0 @@
-forever.js      usr/lib/nodejs/request/
-main.js         usr/lib/nodejs/request/
-mimetypes.js    usr/lib/nodejs/request/
-oauth.js        usr/lib/nodejs/request/
-tunnel.js       usr/lib/nodejs/request/
-uuid.js         usr/lib/nodejs/request/
-
-# it should really be packaged into node-tobi, and then depend on it
-vendor/         usr/lib/nodejs/request/
diff --git a/debian/links b/debian/links
deleted file mode 100644
index b64ecf7..0000000
--- a/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/nodejs/request/main.js	usr/lib/nodejs/request/index.js
diff --git a/debian/rules b/debian/rules
index f10fa3f..2b69fff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,44 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2013 Jonas Smedegaard <dr at jones.dk>
+# Description: Main Debian packaging script for Request
+#
+# 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 2, 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/>.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/upstream-tarball.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 
-%:
-	dh $@
+lib = request
+pkg = $(DEB_SOURCE_PACKAGE)
 
-override_dh_install:
-	dh_install
-	dh_buildinfo
+# Needed by upstream build and (always) at runtime
+node-deps = form-data mime hawk node-uuid cookie-jar aws-sign oauth-sign
+node-deps += forever-agent tunnel-agent json-strignify-safe qs
+deps = $(patsubst %,$(comma) node-%,$(node-deps))
+deps +=, nodejs
+
+CDBS_BUILD_DEPENDS += , $(deps)
+CDBS_DEPENDS_$(pkg) = $(deps)
+
+DEB_UPSTREAM_URL = https://github.com/mikeal/request/archive
+# FIXME: when tagged upstream change to v$(DEB_UPSTREAM_TARBALL_VERSION)
+DEB_UPSTREAM_TARBALL_BASENAME = 28fc741
+
+# suppress checking binary files, to not upset dpkg-source
+DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^tests/.*\.jpg|debian/(changelog|copyright(|_hints|_newhints))$
+
+DEB_INSTALL_DOCS_ALL += README.md
+
+DEB_DH_INSTALL_ARGS_$(pkg) = *.js /usr/lib/nodejs/$(lib)
diff --git a/debian/watch b/debian/watch
index 52e365b..ec8b724 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=3
-https://alioth.debian.org/~dapal/npmjs.php?id=request \
-	http://registry.npmjs.org/request/-/request-(\d+.*)\.tgz
+https://github.com/mikeal/request/tags .*/archive/v?(\d[\d\.]+).tar.gz

-- 
simplified HTTP request client for NodeJS

More information about the Pkg-javascript-commits mailing list