[Pkg-javascript-commits] [SCM] pdf.js packaging branch, master, updated. v0.5.5-949-g17aea13

[David Prévot]

The following commit has been merged in the master branch:
commit 228c411a591ebb4bde22df09c435bbcbbc029106
Author: David Prévot <taffit at debian.org>
Date:   Mon Apr 8 12:51:03 2013 -0400

    Build everything in a single repository

diff --git a/debian/install b/debian/install
index b2fb0f5..c81036c 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-build/generic/*/* /usr/share/javascript/pdf
+build/generic/web/*	/usr/share/javascript/pdf
diff --git a/debian/patches/Fix_generic_build.patch b/debian/patches/Fix_generic_build.patch
new file mode 100644
index 0000000..886a906
--- /dev/null
+++ b/debian/patches/Fix_generic_build.patch
@@ -0,0 +1,44 @@
+Description: Build everything in a single repository
+ In order not to spread files everywhere, pdf.js will be installed in
+ the same main directory
+Author: David Prévot <taffit.debian.org>
+Forwarded: no
+Last-Update: 2013-04-08
+--- a/make.js
++++ b/make.js
+@@ -91,7 +91,6 @@
+ 
+   rm('-rf', GENERIC_DIR);
+   mkdir('-p', GENERIC_DIR);
+-  mkdir('-p', GENERIC_DIR + BUILD_DIR);
+   mkdir('-p', GENERIC_DIR + '/web');
+ 
+   var defines = builder.merge(DEFINES, {GENERIC: true});
+@@ -105,7 +104,7 @@
+       ['web/locale', GENERIC_DIR + '/web']
+     ],
+     preprocess: [
+-      [BUILD_TARGET, GENERIC_DIR + BUILD_TARGET],
++      [BUILD_TARGET, GENERIC_DIR + '/web'],
+       [COMMON_WEB_FILES_PREPROCESS, GENERIC_DIR + '/web']
+     ]
+   };
+--- a/web/viewer.js
++++ b/web/viewer.js
+@@ -45,7 +45,7 @@
+ };
+ 
+ //#if (FIREFOX || MOZCENTRAL || B2G || GENERIC || CHROME)
+-//PDFJS.workerSrc = '../build/pdf.js';
++//PDFJS.workerSrc = './pdf.js';
+ //#endif
+ 
+ var mozL10n = document.mozL10n || document.webL10n;
+--- a/web/viewer-snippet.html
++++ b/web/viewer-snippet.html
+@@ -1,4 +1,4 @@
+ <!-- This snippet is used in production, see Makefile -->
+ <link rel="resource" type="application/l10n" href="locale/locale.properties"/>
+ <script type="text/javascript" src="l10n.js"></script>
+-<script type="text/javascript" src="../build/pdf.js"></script>
++<script type="text/javascript" src="pdf.js"></script>
diff --git a/debian/patches/series b/debian/patches/series
index e5934ba..e6b19b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 Fix_missing_PDF.patch
 Fix_build_version.patch
+Fix_generic_build.patch

-- 
pdf.js packaging