[Pkg-javascript-commits] [libjs-handlebars] 01/03: rename and combine patches

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository libjs-handlebars.

commit 20085bf02f97982c271db6201457cf0d2fb73598
Author: Pirate Praveen <praveen at debian.org>
Date:   Mon Jan 1 16:14:23 2018 +0530

    rename and combine patches
---
 debian/patches/remove-eslint.patch     | 19 ------------------
 debian/patches/series                  |  3 +--
 debian/patches/skip-some-modules.patch | 35 ++++++++++++++++++++++++++++++++++
 debian/patches/use-global-tasks.patch  | 31 ------------------------------
 4 files changed, 36 insertions(+), 52 deletions(-)

diff --git a/debian/patches/remove-eslint.patch b/debian/patches/remove-eslint.patch
deleted file mode 100644
index 411aaec..0000000
--- a/debian/patches/remove-eslint.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Gruntfile.js
-+++ b/Gruntfile.js
-@@ -200,7 +200,6 @@
- 
-   // Build a new version of the library
-   this.registerTask('build', 'Builds a distributable version of the current project', [
--                    'eslint',
-                     'parser',
-                     'node',
-                     'globals']);
-@@ -210,7 +209,7 @@
-   this.registerTask('globals', ['webpack']);
-   this.registerTask('tests', ['concat:tests']);
- 
--  this.registerTask('release', 'Build final packages', ['eslint', 'amd', 'uglify', 'test:min', 'copy:dist', 'copy:components', 'copy:cdnjs']);
-+  this.registerTask('release', 'Build final packages', ['amd', 'uglify', 'test:min', 'copy:dist', 'copy:components', 'copy:cdnjs']);
- 
-   // Load tasks from npm
-   grunt.loadNpmTasks('grunt-contrib-clean','/usr/lib/nodejs');
diff --git a/debian/patches/series b/debian/patches/series
index 179c343..d0e9c98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
-use-global-tasks.patch
-remove-eslint.patch
+skip-some-modules.patch
 use-system-jison.patch
 port-to-babel6.patch
 use-babelrc-for-webpack.patch
diff --git a/debian/patches/skip-some-modules.patch b/debian/patches/skip-some-modules.patch
new file mode 100644
index 0000000..76937b7
--- /dev/null
+++ b/debian/patches/skip-some-modules.patch
@@ -0,0 +1,35 @@
+--- a/Gruntfile.js
++++ b/Gruntfile.js
+@@ -200,7 +200,6 @@
+ 
+   // Build a new version of the library
+   this.registerTask('build', 'Builds a distributable version of the current project', [
+-                    'eslint',
+                     'parser',
+                     'node',
+                     'globals']);
+@@ -210,19 +209,19 @@
+   this.registerTask('globals', ['webpack']);
+   this.registerTask('tests', ['concat:tests']);
+ 
+-  this.registerTask('release', 'Build final packages', ['eslint', 'amd', 'uglify', 'test:min', 'copy:dist', 'copy:components', 'copy:cdnjs']);
++  this.registerTask('release', 'Build final packages', ['amd', 'uglify', 'test:min', 'copy:dist', 'copy:components', 'copy:cdnjs']);
+ 
+   // Load tasks from npm
+   grunt.loadNpmTasks('grunt-contrib-clean');
+   grunt.loadNpmTasks('grunt-contrib-concat');
+-  grunt.loadNpmTasks('grunt-contrib-connect');
++  //grunt.loadNpmTasks('grunt-contrib-connect');
+   grunt.loadNpmTasks('grunt-contrib-copy');
+   grunt.loadNpmTasks('grunt-contrib-requirejs');
+   grunt.loadNpmTasks('grunt-contrib-uglify');
+-  grunt.loadNpmTasks('grunt-contrib-watch');
++  //grunt.loadNpmTasks('grunt-contrib-watch');
+   grunt.loadNpmTasks('grunt-babel');
+-  grunt.loadNpmTasks('grunt-eslint');
+-  grunt.loadNpmTasks('grunt-saucelabs');
++  //grunt.loadNpmTasks('grunt-eslint');
++  //grunt.loadNpmTasks('grunt-saucelabs');
+   grunt.loadNpmTasks('grunt-webpack');
+ 
+   grunt.task.loadTasks('tasks');
diff --git a/debian/patches/use-global-tasks.patch b/debian/patches/use-global-tasks.patch
deleted file mode 100644
index f8d1cdc..0000000
--- a/debian/patches/use-global-tasks.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/Gruntfile.js
-+++ b/Gruntfile.js
-@@ -213,17 +213,17 @@
-   this.registerTask('release', 'Build final packages', ['eslint', 'amd', 'uglify', 'test:min', 'copy:dist', 'copy:components', 'copy:cdnjs']);
- 
-   // Load tasks from npm
--  grunt.loadNpmTasks('grunt-contrib-clean');
--  grunt.loadNpmTasks('grunt-contrib-concat');
--  grunt.loadNpmTasks('grunt-contrib-connect');
--  grunt.loadNpmTasks('grunt-contrib-copy');
--  grunt.loadNpmTasks('grunt-contrib-requirejs');
--  grunt.loadNpmTasks('grunt-contrib-uglify');
--  grunt.loadNpmTasks('grunt-contrib-watch');
--  grunt.loadNpmTasks('grunt-babel');
--  grunt.loadNpmTasks('grunt-eslint');
--  grunt.loadNpmTasks('grunt-saucelabs');
--  grunt.loadNpmTasks('grunt-webpack');
-+  grunt.loadNpmTasks('grunt-contrib-clean','/usr/lib/nodejs');
-+  grunt.loadNpmTasks('grunt-contrib-concat','/usr/lib/nodejs');
-+  //grunt.loadNpmTasks('grunt-contrib-connect','/usr/lib/nodejs');
-+  grunt.loadNpmTasks('grunt-contrib-copy','/usr/lib/nodejs');
-+  grunt.loadNpmTasks('grunt-contrib-requirejs','/usr/lib/nodejs');
-+  grunt.loadNpmTasks('grunt-contrib-uglify','/usr/lib/nodejs');
-+  //grunt.loadNpmTasks('grunt-contrib-watch','/usr/lib/nodejs');
-+  grunt.loadNpmTasks('grunt-babel','/usr/lib/nodejs');
-+  //grunt.loadNpmTasks('grunt-eslint','/usr/lib/nodejs');
-+  //grunt.loadNpmTasks('grunt-saucelabs','/usr/lib/nodejs');
-+  grunt.loadNpmTasks('grunt-webpack','/usr/lib/nodejs');
- 
-   grunt.task.loadTasks('tasks');
- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/libjs-handlebars.git