[Python-modules-commits] [notebook] 02/03: Initialize git-dpm

[Gordon Ball]

This is an automated email from the git hooks/post-receive script.

chronitis-guest pushed a commit to branch master
in repository notebook.

commit d1934c938bcd16de3a50665b9e52163009bcc940
Merge: 7a02ebf 2adb6a2
Author: Gordon Ball <gordon at chronitis.net>
Date:   Thu Oct 20 19:59:23 2016 +0200

    Initialize git-dpm

 debian/.git-dpm                                    |  8 +++++
 ...irejs.patch => 0001-nodejs-related-fixes.patch} | 37 ++++++++++++++--------
 debian/patches/series                              |  2 +-
 setupbase.py                                       |  2 +-
 tools/build-main.js                                |  2 +-
 5 files changed, 35 insertions(+), 16 deletions(-)

diff --cc debian/.git-dpm
index 0000000,0000000..24dc068
new file mode 100644
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,0 -1,0 +1,8 @@@
++# see git-dpm(1) from git-dpm package
++2adb6a2b02726a8d9279a388d115d43aa6dc56db
++2adb6a2b02726a8d9279a388d115d43aa6dc56db
++e51bebecac4b49107ac1793907335479587bd349
++e51bebecac4b49107ac1793907335479587bd349
++notebook_4.2.3+github1.orig.tar.gz
++cd42c2013047d2722d3990db4787820cff51cbc8
++4456566
diff --cc debian/patches/0001-nodejs-related-fixes.patch
index ee21ac2,0000000..e948e6e
mode 100644,000000..100644
--- a/debian/patches/0001-nodejs-related-fixes.patch
+++ b/debian/patches/0001-nodejs-related-fixes.patch
@@@ -1,27 -1,0 +1,38 @@@
- Description: nodejs related fixes
++From 2adb6a2b02726a8d9279a388d115d43aa6dc56db Mon Sep 17 00:00:00 2001
++From: Gordon Ball <gordon at chronitis.net>
++Date: Thu, 20 Oct 2016 19:59:23 +0200
++Subject: nodejs related fixes
++
 + * non-functional import of requirejs
 + * s/node/nodejs/
- Author: Gordon Ball <gordon at chronitis.net>
++---
++ setupbase.py        | 2 +-
++ tools/build-main.js | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
 +
++diff --git a/setupbase.py b/setupbase.py
++index 62d4e63..a411c9b 100644
++--- a/setupbase.py
+++++ b/setupbase.py
++@@ -476,7 +476,7 @@ class CompileJS(Command):
++             log.info("%s up to date" % target)
++             return
++         log.info("Rebuilding %s" % target)
++-        run(['node', 'tools/build-main.js', name])
+++        run(['nodejs', 'tools/build-main.js', name])
++ 
++     def run(self):
++         self.run_command('jsdeps')
++diff --git a/tools/build-main.js b/tools/build-main.js
++index bd0316b..3336159 100644
 +--- a/tools/build-main.js
 ++++ b/tools/build-main.js
 +@@ -1,7 +1,7 @@
 + // build main.min.js
 + // spawned by gulp to allow parallelism
 + 
 +-var rjs = require('requirejs').optimize;
 ++var rjs = require('r').optimize;
 + 
 + var name = process.argv[2];
 + 
- --- a/setupbase.py
- +++ b/setupbase.py
- @@ -476,7 +476,7 @@
-              log.info("%s up to date" % target)
-              return
-          log.info("Rebuilding %s" % target)
- -        run(['node', 'tools/build-main.js', name])
- +        run(['nodejs', 'tools/build-main.js', name])
-  
-      def run(self):
-          self.run_command('jsdeps')
diff --cc debian/patches/series
index 4d06e39,0000000..90020d8
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- requirejs.patch
++0001-nodejs-related-fixes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/notebook.git