Control: tags 786880 + patch
Control: tags 786880 + pending
Dear maintainer,
I've prepared an NMU for cryptojs (versioned as 3.1.2+dfsg-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru cryptojs-3.1.2+dfsg/debian/build cryptojs-3.1.2+dfsg/debian/build
--- cryptojs-3.1.2+dfsg/debian/build 1970-01-01 01:00:00.000000000 +0100
+++ cryptojs-3.1.2+dfsg/debian/build 2015-10-05 14:26:58.000000000 +0200
@@ -0,0 +1,57 @@
+#!/bin/bash
+set -e
+
+FILES="aes=core+enc-base64+md5+evpkdf+cipher-core+aes
+hmac-md5=core+md5+hmac
+hmac-ripemd160=core+ripemd160+hmac
+hmac-sha1=core+sha1+hmac
+hmac-sha224=core+sha256+sha224+hmac
+hmac-sha256=core+sha256+hmac
+hmac-sha384=core+x64-core+sha512+sha384+hmac
+hmac-sha3=core+x64-core+sha3+hmac
+hmac-sha512=core+x64-core+sha512+hmac
+md5=core+md5
+pbkdf2=core+sha1+hmac+pbkdf2
+rabbit=core+md5+evpkdf+cipher-core+rabbit
+rabbit-legacy=core+md5+evpkdf+cipher-core+rabbit-legacy
+rc4=core+md5+evpkdf+cipher-core+rc4
+ripemd160=core+ripemd160
+sha1=core+sha1
+sha224=core+sha256+sha224
+sha256=core+sha256
+sha384=core+x64-core+sha512+sha384
+sha3=core+x64-core+sha3
+sha512=core+x64-core+sha512
+tripledes=core+enc-base64+md5+evpkdf+cipher-core+tripledes"
+
+
+rm -rf links
+mkdir -p links
+echo "Creating compatibility links"
+for file in components/*; do
+ ln -s $file links/
+done
+
+
+for file in components/*; do
+ echo Compressing $file >&2
+ yui-compressor -o "components/$(basename -s .js $file)-min.js" $file
+done
+
+
+rm -rf rollups
+mkdir -p rollups
+for file in $FILES; do
+ echo Building rollups/$file >&2
+ if [[ $file =~ ([-0-9a-z]+)=([-0-9a-z+]+) ]]; then
+ target=${BASH_REMATCH[1]}
+ sources=${BASH_REMATCH[2]}
+ _old_IFS=$IFS
+ IFS='+'
+ for src in $sources; do
+ cat components/$src-min.js >> rollups/$target.js
+ done
+ IFS=$_old_IFS
+ fi
+done
+
diff -Nru cryptojs-3.1.2+dfsg/debian/changelog cryptojs-3.1.2+dfsg/debian/changelog
--- cryptojs-3.1.2+dfsg/debian/changelog 2015-10-05 14:26:08.000000000 +0200
+++ cryptojs-3.1.2+dfsg/debian/changelog 2015-10-05 14:26:58.000000000 +0200
@@ -1,3 +1,15 @@
+cryptojs (3.1.2+dfsg-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Re-created upstream "rollups", single javascript files with all
+ dependencies embeded. This enables the use of that library as documented,
+ and fixes import issues on Safari. (Closes: #786880)
+ * Added build-dependency on yui-compressor.
+ * New d/clean and d/build files.
+ * Added links to keep the old addresses working.
+
+ -- Jean-Michel Vourgère <[email protected]> Mon, 05 Oct 2015 14:23:30 +0200
+
cryptojs (3.1.2+dfsg-1) unstable; urgency=low
* Initial upload (closes: #719784).
diff -Nru cryptojs-3.1.2+dfsg/debian/clean cryptojs-3.1.2+dfsg/debian/clean
--- cryptojs-3.1.2+dfsg/debian/clean 1970-01-01 01:00:00.000000000 +0100
+++ cryptojs-3.1.2+dfsg/debian/clean 2015-10-05 14:26:58.000000000 +0200
@@ -0,0 +1,3 @@
+components/*-min.js
+rollups/*
+links/*
diff -Nru cryptojs-3.1.2+dfsg/debian/control cryptojs-3.1.2+dfsg/debian/control
--- cryptojs-3.1.2+dfsg/debian/control 2015-10-05 14:26:08.000000000 +0200
+++ cryptojs-3.1.2+dfsg/debian/control 2015-10-05 14:26:58.000000000 +0200
@@ -2,7 +2,7 @@
Section: web
Priority: extra
Maintainer: Laszlo Boszormenyi (GCS) <[email protected]>
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 9), yui-compressor
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/collab-maint/cryptojs.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/cryptojs.git;a=summary
diff -Nru cryptojs-3.1.2+dfsg/debian/libjs-cryptojs.install cryptojs-3.1.2+dfsg/debian/libjs-cryptojs.install
--- cryptojs-3.1.2+dfsg/debian/libjs-cryptojs.install 2015-10-05 14:26:08.000000000 +0200
+++ cryptojs-3.1.2+dfsg/debian/libjs-cryptojs.install 2015-10-05 14:26:58.000000000 +0200
@@ -1 +1,3 @@
-components/* usr/share/javascript/cryptojs/
+components usr/share/javascript/cryptojs/
+rollups usr/share/javascript/cryptojs/
+links/* usr/share/javascript/cryptojs/
diff -Nru cryptojs-3.1.2+dfsg/debian/rules cryptojs-3.1.2+dfsg/debian/rules
--- cryptojs-3.1.2+dfsg/debian/rules 2015-10-05 14:26:08.000000000 +0200
+++ cryptojs-3.1.2+dfsg/debian/rules 2015-10-05 14:26:58.000000000 +0200
@@ -9,6 +9,9 @@
%:
dh $@
+override_dh_auto_build:
+ debian/build
+
get-orig-source:
VERSION=$(shell if [ -z $$CJS_VERSION ]; \
then dpkg-parsechangelog | grep ^Version | cut -d\ -f2 | cut -d- -f1 | cut -d+ -f1; \
