Merge ~ahasenack/ubuntu/+source/raphael:xenial-raphae-symlink-1576471 into ubuntu/+source/raphael:ubuntu/xenial-devel

[Andreas Hasenack]

Testing PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/raphaeljs-merge/ (I reused the one for the groovy sync/merge)

This is the same fix that was uploaded to artful (https://git.launchpad.net/ubuntu/+source/raphael/commit/?id=cee2e8e9c5959bf158d74db2199a9a517493341a) back then, but without the README.Ubuntu bit which I thought unnecessary for an SRU.

The bug has the SRU template and testing instructions.

[Bryce Harrington (bryce)]

I didn't run the test case but the fix checks out as a legit typo cleanup.

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, tagging and uploading 79a4ca84e0a840084fadd61d7276bba27aa65a10

$ git push pkg upload/2.1.0-1ubuntu1.1
Enumerating objects: 14, done.
Counting objects: 100% (14/14), done.
Delta compression using up to 4 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (10/10), 1.28 KiB | 187.00 KiB/s, done.
Total 10 (delta 6), reused 1 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/raphael
 * [new tag] upload/2.1.0-1ubuntu1.1 -> upload/2.1.0-1ubuntu1.1

$ dput ubuntu ../raphael_2.1.0-1ubuntu1.1_source.changes
Checking signature on .changes
gpg: ../raphael_2.1.0-1ubuntu1.1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../raphael_2.1.0-1ubuntu1.1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading raphael_2.1.0-1ubuntu1.1.dsc: done.
  Uploading raphael_2.1.0-1ubuntu1.1.debian.tar.xz: done.
  Uploading raphael_2.1.0-1ubuntu1.1_source.buildinfo: done.
  Uploading raphael_2.1.0-1ubuntu1.1_source.changes: done.
Successfully uploaded packages.

Unmerged commits

79a4ca8... by Andreas Hasenack on 2020-07-03

changelog

26e42f5... by Andreas Hasenack on 2017-08-29

  * d/links, d/rules: produce the correct filename for raphael.min.js
    and symlink our previous incorrect name (raphael-min.js) to the fixed
    one for backwards compatibility reasons. (LP: #1576471)

diff --git a/debian/changelog b/debian/changelog
index a02a29b..687e33d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+raphael (2.1.0-1ubuntu1.1) xenial; urgency=medium
+
+  * d/links, d/rules: produce the correct filename for raphael.min.js
+    and symlink our previous incorrect name (raphael-min.js) to the fixed
+    one for backwards compatibility reasons. (LP: #1576471)
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 03 Jul 2020 17:58:53 -0300
+
 raphael (2.1.0-1ubuntu1) raring; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..5571ffa
--- /dev/null
+++ b/debian/links
@@ -0,0 +1 @@
+usr/share/javascript/raphael/raphael.min.js usr/share/javascript/raphael/raphael-min.js
diff --git a/debian/rules b/debian/rules
index 7f6ae2d..2519875 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 	dh $@
 
 override_dh_auto_build:
-	yui-compressor -o dist/raphael-min.js dist/raphael.js
+	yui-compressor -o dist/raphael.min.js dist/raphael.js
 
 clean:
-	dh_clean dist/raphael-min.js
+	dh_clean dist/raphael.min.js