[Pkg-javascript-commits] [pdf.js] 48/56: Merge tag 'debian/1.0.21+dfsg-1+sid1'
David Prévot
taffit at moszumanska.debian.org
Thu May 15 15:17:47 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository pdf.js.
commit c8fc4bfb6cd4aeff3daddc2181780693d35685db
Merge: 9afd581 2af9259
Author: David Prévot <taffit at debian.org>
Date: Thu May 15 09:23:19 2014 -0400
Merge tag 'debian/1.0.21+dfsg-1+sid1'
pdf.js Debian release 1.0.21+dfsg-1+sid1
Conflicts:
debian/changelog
debian/control
debian/maintscript
debian/changelog | 8 +++++++-
debian/maintscript | 2 --
debian/postinst | 15 +++++++++++++++
3 files changed, 22 insertions(+), 3 deletions(-)
diff --cc debian/changelog
index 986da15,5058f97..5854038
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,17 @@@
+pdf.js (1.0.21+dfsg-2) experimental; urgency=medium
+
+ * Build the Mozilla extension
+ * Add a common package
+ * Extend descriptions
+
+ -- David Prévot <taffit at debian.org> Sat, 19 Apr 2014 17:53:44 -0400
+
+ pdf.js (1.0.21+dfsg-1+sid1) unstable; urgency=medium
+
+ * Handle compatibility symlinks manually, and upload to unstable
+
+ -- David Prévot <taffit at debian.org> Thu, 24 Apr 2014 17:51:14 -0400
+
pdf.js (1.0.21+dfsg-1) experimental; urgency=medium
[ Brendan Dahl ]
diff --cc debian/maintscript
index edf917a,0000000..d812c61
mode 100644,000000..100644
--- a/debian/maintscript
+++ b/debian/maintscript
@@@ -1,5 -1,0 +1,3 @@@
- 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~
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/pdf.js.git
More information about the Pkg-javascript-commits
mailing list