[Pkg-javascript-commits] [pdf.js] 134/141: Make the version change more generic

[David Prévot]

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

taffit pushed a commit to branch master
in repository pdf.js.

commit 274812efced7ba7e88031ae0bc97850d673e672c
Author: David Prévot <taffit at debian.org>
Date:   Sat Apr 19 15:06:07 2014 -0400

    Make the version change more generic
---
 ...0002-Fix-build-versions-in-generated-file.patch | 30 ++++++++++++++++------
 ...3-Build-everything-in-a-single-repository.patch |  2 +-
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/debian/patches/0002-Fix-build-versions-in-generated-file.patch b/debian/patches/0002-Fix-build-versions-in-generated-file.patch
index b99eb97..b5b57c3 100644
--- a/debian/patches/0002-Fix-build-versions-in-generated-file.patch
+++ b/debian/patches/0002-Fix-build-versions-in-generated-file.patch
@@ -5,26 +5,40 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
-Since the Debian package should be build out of the tarball, the build
+Since the Debian package is built out of the tarball, the build
 system can’t rely on feature coming from the Git repository.
 Forwarded: not-needed
 ---
- make.js | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
+ make.js | 12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
 
 diff --git a/make.js b/make.js
-index 24c0e0e..a66da48 100644
+index 24c0e0e..26341b8 100644
 --- a/make.js
 +++ b/make.js
-@@ -343,9 +343,8 @@ target.bundle = function(args) {
-     }
+@@ -344,8 +344,7 @@ target.bundle = function(args) {
  
      var bundleContent = cat(SRC_FILES),
--        bundleVersion = VERSION,
+         bundleVersion = VERSION,
 -        bundleBuild = exec('git log --format="%h" -n 1',
 -          {silent: true}).output.replace('\n', '');
-+        bundleVersion = '@EXTENSION_VERSION@',
 +        bundleBuild = 'debian';
  
      crlfchecker.checkIfCrlfIsPresent(SRC_FILES);
  
+@@ -563,14 +562,7 @@ target.buildnumber = function() {
+   echo();
+   echo('### Getting extension build number');
+ 
+-  var lines = exec('git log --format=oneline ' +
+-                   config.baseVersion + '..', {silent: true}).output;
+-  // Build number is the number of commits since base version
+-  BUILD_NUMBER = lines ? lines.match(/\n/g).length : 0;
+-
+-  echo('Extension build number: ' + BUILD_NUMBER);
+-
+-  VERSION = config.versionPrefix + BUILD_NUMBER;
++  VERSION = '@EXTENSION_VERSION@';
+ };
+ 
+ //
diff --git a/debian/patches/0003-Build-everything-in-a-single-repository.patch b/debian/patches/0003-Build-everything-in-a-single-repository.patch
index ed02da9..14b9e85 100644
--- a/debian/patches/0003-Build-everything-in-a-single-repository.patch
+++ b/debian/patches/0003-Build-everything-in-a-single-repository.patch
@@ -12,7 +12,7 @@ Forwarded: no
  3 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/make.js b/make.js
-index a66da48..6f65d49 100644
+index 26341b8..e25caf8 100644
 --- a/make.js
 +++ b/make.js
 @@ -108,7 +108,6 @@ target.generic = function() {

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