Switch to the proper upstream changelog

2 files changed, 3 insertions, 348 deletions

diff --git a/debian/CHANGELOG b/debian/CHANGELOG
deleted file mode 100644
index 324ecea..0000000
--- a/debian/CHANGELOG
+++ /dev/null
@@ -1,348 +0,0 @@
-changeset:   60:6de7972514f2
-branch:      stable
-tag:         tip
-user:        Tikitu de Jager <tikitu@logophile.org>
-date:        Fri Jan 31 23:57:10 2014 +1300
-summary:     Added tag release-2.0.9 for changeset 6f478019608c
-
-changeset:   59:6f478019608c
-branch:      stable
-tag:         release-2.0.9
-parent:      55:0d463f411a50
-parent:      58:736120d85337
-user:        Tikitu de Jager <tikitu@logophile.org>
-date:        Fri Jan 31 23:56:46 2014 +1300
-summary:     Merge released version 2.0.9 from default
-
-changeset:   58:736120d85337
-user:        Tikitu de Jager <tikitu@logophile.org>
-date:        Fri Jan 31 23:49:55 2014 +1300
-summary:     Bump version for release.
-
-changeset:   57:6dca03a03832
-parent:      56:156a5e3cdf97
-parent:      55:0d463f411a50
-user:        Tikitu de Jager <tikitu@logophile.org>
-date:        Fri Jan 31 23:47:49 2014 +1300
-summary:     Merge from stable for test
-
-changeset:   56:156a5e3cdf97
-parent:      52:03a33a4b4f7e
-user:        Tikitu de Jager <tikitu@logophile.org>
-date:        Fri Jan 31 23:43:53 2014 +1300
-summary:     Tentative fix for issue #10.
-
-changeset:   55:0d463f411a50
-branch:      stable
-user:        Tikitu de Jager <tikitu@logophile.org>
-date:        Fri Jan 31 23:42:46 2014 +1300
-summary:     Fixed test for issue #10.
-
-changeset:   54:dfb7e58090b4
-branch:      stable
-user:        Tikitu de Jager <tikitu@logophile.org>
-date:        Fri Jan 31 23:06:49 2014 +1300
-summary:     Failing test for issue #10
-
-changeset:   53:9c21321d7331
-branch:      stable
-parent:      51:13c9fde88ad8
-user:        Tikitu de Jager <tikitu@logophile.org>
-date:        Fri Jan 31 22:56:06 2014 +1300
-summary:     Removed duplicated tests.
-
-changeset:   52:03a33a4b4f7e
-parent:      50:2076db5fc76f
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Sat Nov 09 00:29:18 2013 +0200
-summary:     Added tag release-2.0.8 for changeset 13c9fde88ad8
-
-changeset:   51:13c9fde88ad8
-branch:      stable
-tag:         release-2.0.8
-parent:      39:41678d35ed95
-parent:      50:2076db5fc76f
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Sat Nov 09 00:16:23 2013 +0200
-summary:     Merge released version from default
-
-changeset:   50:2076db5fc76f
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Sat Nov 09 00:14:46 2013 +0200
-summary:     Turns out pypi *does* support code:: directive.
-
-changeset:   49:030f97d5968c
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Sat Nov 09 00:10:42 2013 +0200
-summary:     Moved README so bitbucket realises it's ReST
-
-changeset:   48:8aad58fd734b
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Sat Nov 09 00:09:27 2013 +0200
-summary:     More attempts to fix broken ReST
-
-changeset:   47:63871dfd11a1
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Fri Nov 08 23:58:30 2013 +0200
-summary:     Fix non-standard reStructuredText that breaks bitbucket and pypi renderer :-(
-
-changeset:   46:fb44316f6e1e
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Fri Nov 08 23:50:35 2013 +0200
-summary:     Added note pointing to the Travis test page in readme.
-
-changeset:   45:5a216924d0d8
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Fri Nov 08 23:44:43 2013 +0200
-summary:     Bump version for release.
-
-changeset:   44:670a0887a51b
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Fri Nov 08 23:43:18 2013 +0200
-summary:     Fix behaviour when file ends in a string with no final newline.
-
-changeset:   43:f5b1963ce744
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Fri Nov 08 23:34:50 2013 +0200
-summary:     Test for file ending in a string with no final newline.
-
-changeset:   42:da5b262017e8
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Fri Nov 08 23:34:23 2013 +0200
-summary:     Protect against sequences of -/+ tokens, e.g. "a - -b" or "a + ++b". Solves issue #9.
-
-changeset:   41:1b657a23e362
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Fri Nov 08 23:04:46 2013 +0200
-summary:     Tiny documentation improvements (most importantly: a usage example).
-
-changeset:   40:6d8a417630e0
-parent:      38:6c0a50afaea1
-parent:      39:41678d35ed95
-user:        Tikitu de Jager <tikitu+jsmin@logophile.org>
-date:        Tue Nov 05 02:02:02 2013 +0200
-summary:     Merge from stable for failing test
-
-changeset:   39:41678d35ed95
-branch:      stable
-parent:      37:1ece24381498
-user:        Tikitu de Jager <tikitu+jsmin@logophile.org>
-date:        Tue Nov 05 01:58:55 2013 +0200
-summary:     Failing test for plus/space handling. Issue #9
-
-changeset:   38:6c0a50afaea1
-parent:      36:4c8049753c1a
-user:        Tikitu de Jager <tikitu+jsmin@logophile.org>
-date:        Tue Nov 05 01:54:32 2013 +0200
-summary:     Update readme for travis build-status locations.
-
-changeset:   37:1ece24381498
-branch:      stable
-parent:      30:f02a6b63d038
-parent:      36:4c8049753c1a
-user:        Tikitu de Jager <tikitu+jsmin@logophile.org>
-date:        Tue Nov 05 01:47:08 2013 +0200
-summary:     Merge from default
-
-changeset:   36:4c8049753c1a
-user:        Tikitu de Jager <tikitu+jsmin@logophile.org>
-date:        Mon Nov 04 22:49:00 2013 +0200
-summary:     Adding travis-ci integration (via github mirror).
-
-changeset:   35:3b94c466447f
-user:        Tikitu de Jager <tikitu+jsmin@logophile.org>
-date:        Sun Oct 27 21:39:32 2013 +0200
-summary:     Haha, I can do this all night. Another (rather important) contributor who we can find online. Of course.
-
-changeset:   34:c1466be7f574
-user:        Tikitu de Jager <tikitu+jsmin@logophile.org>
-date:        Sun Oct 27 21:21:41 2013 +0200
-summary:     Added tag release-2.0.7 for changeset f02a6b63d038
-
-changeset:   33:6fa50a84ad9d
-user:        Tikitu de Jager <tikitu+jsmin@logophile.org>
-date:        Sun Oct 27 21:12:00 2013 +0200
-summary:     Info about contributing and clearer (I hope) explanation of build status.
-
-changeset:   32:95556dab612c
-user:        Tikitu de Jager <tikitu+jsmin@logophile.org>
-date:        Sun Oct 27 20:58:07 2013 +0200
-summary:     One more contributor update, because yes, we *do* have that info.
-
-changeset:   31:04b8cdc247f2
-parent:      29:647860737f7d
-user:        Tikitu de Jager <tikitu+jsmin@logophile.org>
-date:        Sun Oct 27 20:55:10 2013 +0200
-summary:     Who has two thumbs and forgot to update the contributor's list?
-
-changeset:   30:f02a6b63d038
-branch:      stable
-tag:         release-2.0.7
-parent:      24:181df5a4fec5
-parent:      29:647860737f7d
-user:        Tikitu de Jager <tikitu+jsmin@logophile.org>
-date:        Sun Oct 27 20:50:25 2013 +0200
-summary:     Merge released version from default
-
-changeset:   29:647860737f7d
-user:        Tikitu de Jager <tikitu+jsmin@logophile.org>
-date:        Sun Oct 27 20:47:42 2013 +0200
-summary:     Bump version for release.
-
-changeset:   28:38801aae0bbe
-parent:      25:7195b1191b3a
-parent:      27:483ab825f11b
-user:        Tikitu de Jager <tikitu+jsmin@logophile.org>
-date:        Sun Oct 27 20:38:54 2013 +0200
-summary:     merge PR from @tannern
-
-changeset:   27:483ab825f11b
-user:        tannern@gmail.com
-date:        Fri Oct 18 17:49:02 2013 -0500
-summary:     Add more test cases for multiline comments and make them work.
-
-changeset:   26:e196723e1115
-parent:      19:33de84cde6ae
-user:        tannern@gmail.com
-date:        Fri Oct 18 16:10:53 2013 -0500
-summary:     Add fix and test for comment exception case.
-
-changeset:   25:7195b1191b3a
-parent:      23:f0a62126c3cb
-parent:      24:181df5a4fec5
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Sun Oct 27 20:22:34 2013 +0200
-summary:     Merge tests from stable
-
-changeset:   24:181df5a4fec5
-branch:      stable
-parent:      20:028edf82f6fa
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Sun Oct 27 20:21:15 2013 +0200
-summary:     Add tests contributed by @rennat
-
-changeset:   23:f0a62126c3cb
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Sun Oct 27 20:10:15 2013 +0200
-summary:     Added build status badges to README
-
-changeset:   22:2b52d5bf681f
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Sun Oct 27 19:14:12 2013 +0200
-summary:     Packaging setup and added myself as maintainer.
-
-changeset:   21:7688cc6d5fd6
-parent:      19:33de84cde6ae
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Sun Oct 27 18:50:16 2013 +0200
-summary:     added virtualenv ignores
-
-changeset:   20:028edf82f6fa
-branch:      stable
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Sun Oct 27 18:20:52 2013 +0200
-summary:     Created branch "stable" for releases.
-
-changeset:   19:33de84cde6ae
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Sat Oct 12 11:29:19 2013 -0400
-summary:     fix for #8 again
-
-changeset:   18:f7e8a16bc58f
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Thu Oct 10 21:37:54 2013 -0400
-summary:     bumped version
-
-changeset:   17:d809f1a774d8
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Thu Oct 10 21:36:04 2013 -0400
-summary:     fixed #8, which was introduced when trying to support literal regular expressions
-
-changeset:   16:6e2132ded135
-parent:      14:4734e9d8473f
-parent:      15:5368afe735f9
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Thu Oct 10 21:18:54 2013 -0400
-summary:     Merged in tikitu/jsmin (pull request #5)
-
-changeset:   15:5368afe735f9
-parent:      13:21e359733e94
-user:        Tikitu de Jager <tikitu@buzzcapture.com>
-date:        Fri Oct 04 13:41:00 2013 +0300
-summary:     added test for comment-related bug generating invalid code
-
-changeset:   14:4734e9d8473f
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Sat Oct 05 15:19:43 2013 -0400
-summary:     added mit license
-
-changeset:   13:21e359733e94
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Wed Sep 04 23:42:17 2013 -0400
-summary:     python -m jsmin
-
-changeset:   12:f73fdb895121
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Wed Sep 04 23:33:25 2013 -0400
-summary:     fixes for regex literal handling #4
-
-changeset:   11:fdfa1b187681
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Wed May 22 11:14:22 2013 -0400
-summary:     update metadata
-
-changeset:   10:d36c06472325
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Wed May 22 10:55:55 2013 -0400
-summary:     more specific classifier
-
-changeset:   9:f048c413503b
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Wed May 22 10:52:39 2013 -0400
-summary:     update url
-
-changeset:   8:81fe577fe848
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Wed May 22 10:51:09 2013 -0400
-summary:     bump version and clarify license
-
-changeset:   7:eec711287bf3
-user:        hansweltar
-date:        Mon May 13 17:23:51 2013 +0200
-summary:     Fix for #2, #3: single line comments broken
-
-changeset:   6:cbf9a04e242a
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Fri May 10 09:13:47 2013 -0400
-summary:     fix for #2
-
-changeset:   5:3a9b171f128d
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Fri May 10 08:58:22 2013 -0400
-summary:     hg ignore
-
-changeset:   4:11fd6ce3d7f9
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Fri May 10 08:57:21 2013 -0400
-summary:     this is slightly faster and consistent with other parts of the (ugly) code
-
-changeset:   3:1259c8d0901a
-user:        hansweltar
-date:        Fri May 10 14:28:41 2013 +0200
-summary:     Remove infinite loop when js ends with comment
-
-changeset:   2:a73d7e459d7a
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Wed Feb 06 12:54:32 2013 -0500
-summary:     push version for pypi
-
-changeset:   1:6169faa069f7
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Wed Feb 06 12:48:45 2013 -0500
-summary:     added homepage
-
-changeset:   0:bc644b6e8049
-user:        Dave St.Germain <dcs@adullmoment.com>
-date:        Wed Feb 06 12:42:26 2013 -0500
-summary:     initial import
-
diff --git a/debian/rules b/debian/rules
index d933ac7..f87add5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,6 @@ export PYBUILD_NAME=jsmin
 
 %:
 	dh $@ --buildsystem=pybuild --with python2,python3
+
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGELOG.txt