[Pkg-javascript-commits] [pdf.js] 139/141: Add a common package, and extend descriptions

[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 cc70be380aba7e7498dec83d1c9147123cce1587
Author: David Prévot <taffit at debian.org>
Date:   Sat Apr 19 17:20:23 2014 -0400

    Add a common package, and extend descriptions
---
 debian/control               | 18 ++++++++++++++++--
 debian/links                 |  4 ++++
 debian/maintscript           |  7 +++++--
 debian/pdf.js-common.install |  5 +++++
 debian/rules                 |  9 +++++++++
 debian/xul-ext-pdf.js.links  |  4 ++++
 6 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 7392d66..b98d277 100644
--- a/debian/control
+++ b/debian/control
@@ -14,15 +14,17 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-javascript/pdf.js.git
 Package: libjs-pdf
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libjs-jquery, ${misc:Depends}
+Depends: libjs-jquery, pdf.js-common (= ${binary:Version}), ${misc:Depends}
 Breaks: owncloud (<< 6.0.3~)
 Description: Portable Document Format (PDF) viewer built with HTML5
  PDF.js is a general-purpose, web standards-based platform for parsing and
  rendering PDFs.
+ .
+ This package offers the viewer as used in some web applications.
 
 Package: xul-ext-pdf.js
 Architecture: all
-Depends: ${misc:Depends}, ${xpi:Depends}
+Depends: pdf.js-common (= ${binary:Version}), ${misc:Depends}, ${xpi:Depends}
 Recommends: ${xpi:Recommends}
 Breaks: ${xpi:Breaks}
 Provides: ${xpi:Provides}
@@ -30,3 +32,15 @@ Enhances: ${xpi:Enhances}
 Description: Portable Document Format (PDF) viewer plugin for Iceweasel
  PDF.js brings Portable Document Format (PDF) reading capabilities to the
  browser using web standard technologies.
+ .
+ This extension supersede the embedded PDF.js.
+
+Package: pdf.js-common
+Architecture: all
+Depends: ${misc:Depends}
+Description: Portable Document Format (PDF) viewer - common files
+ PDF.js is a general-purpose, web standards-based platform for parsing and
+ rendering PDFs.
+ .
+ This package contains files needed for the web viewer and the browser
+ extension.
diff --git a/debian/links b/debian/links
index 7946add..6852801 100644
--- a/debian/links
+++ b/debian/links
@@ -6,3 +6,7 @@ usr/share/javascript/pdf/web/locale		usr/share/javascript/pdf/locale
 usr/share/javascript/pdf/build/pdf.js		usr/share/javascript/pdf/pdf.js
 usr/share/javascript/pdf/build/pdf.worker.js	usr/share/javascript/pdf/pdf.worker.js
 usr/share/javascript/pdf/web/viewer.css		usr/share/javascript/pdf/viewer.css
+usr/share/pdf.js/cmaps				usr/share/javascript/pdf/web/cmaps
+usr/share/pdf.js/debugger.js			usr/share/javascript/pdf/web/debugger.js
+usr/share/pdf.js/images				usr/share/javascript/pdf/web/images
+usr/share/pdf.js/locale				usr/share/javascript/pdf/web/locale
diff --git a/debian/maintscript b/debian/maintscript
index 46c8114..edf917a 100644
--- a/debian/maintscript
+++ b/debian/maintscript
@@ -1,2 +1,5 @@
-dir_to_symlink /usr/share/javascript/pdf/locale web/locale 1.0.21+dfsg-1~
-dir_to_symlink /usr/share/javascript/pdf/images web/images 1.0.21+dfsg-1~
+dir_to_symlink /usr/share/javascript/pdf/images		web/images		1.0.21+dfsg-1~
+dir_to_symlink /usr/share/javascript/pdf/locale		web/locale		1.0.21+dfsg-1~
+dir_to_symlink /usr/share/javascript/pdf/web/cmaps	../../../pdf.js/cmaps	1.0.21+dfsg-2~
+dir_to_symlink /usr/share/javascript/pdf/web/images	../../../pdf.js/images	1.0.21+dfsg-2~
+dir_to_symlink /usr/share/javascript/pdf/web/locale	../../../pdf.js/locale	1.0.21+dfsg-2~
diff --git a/debian/pdf.js-common.install b/debian/pdf.js-common.install
new file mode 100644
index 0000000..1ae6927
--- /dev/null
+++ b/debian/pdf.js-common.install
@@ -0,0 +1,5 @@
+build/firefox/locale				usr/share/pdf.js
+build/generic/web/cmaps				usr/share/pdf.js
+build/generic/web/debugger.js			usr/share/pdf.js
+build/generic/web/images			usr/share/pdf.js
+build/generic/web/locale/locale.properties	usr/share/pdf.js/locale
diff --git a/debian/rules b/debian/rules
index e70148a..280165f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,3 +29,12 @@ override_dh_auto_install:
 
 override_dh_installchangelogs:
 	dh_installchangelogs $(CURDIR)/debian/upstream/changelog
+
+override_dh_link:
+	rm -r $(CURDIR)/debian/libjs-pdf/usr/share/javascript/pdf/web/cmaps
+	rm -r $(CURDIR)/debian/libjs-pdf/usr/share/javascript/pdf/web/images
+	rm -r $(CURDIR)/debian/libjs-pdf/usr/share/javascript/pdf/web/locale
+	rm -r $(CURDIR)/debian/xul-ext-pdf.js/usr/share/xul-ext/pdf.js/content/web/cmaps
+	rm -r $(CURDIR)/debian/xul-ext-pdf.js/usr/share/xul-ext/pdf.js/content/web/images
+	rm -r $(CURDIR)/debian/xul-ext-pdf.js/usr/share/xul-ext/pdf.js/locale
+	dh_link
diff --git a/debian/xul-ext-pdf.js.links b/debian/xul-ext-pdf.js.links
new file mode 100644
index 0000000..fce81cc
--- /dev/null
+++ b/debian/xul-ext-pdf.js.links
@@ -0,0 +1,4 @@
+usr/share/pdf.js/cmaps				usr/share/xul-ext/pdf.js/content/web/cmaps
+usr/share/pdf.js/debugger.js			usr/share/xul-ext/pdf.js/content/web/debugger.js
+usr/share/pdf.js/images				usr/share/xul-ext/pdf.js/content/web/images
+usr/share/pdf.js/locale				usr/share/xul-ext/pdf.js/locale

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