diff -Nru simile-timeline-2.3.0+dfsg1/debian/changelog simile-timeline-2.3.0+dfsg1/debian/changelog --- simile-timeline-2.3.0+dfsg1/debian/changelog 2015-08-21 14:07:17.000000000 +0000 +++ simile-timeline-2.3.0+dfsg1/debian/changelog 2019-04-14 21:02:19.000000000 +0000 @@ -1,3 +1,24 @@ +simile-timeline (2.3.0+dfsg1-4) unstable; urgency=medium + + * Team upload + * Fix error in reiwa.diff patch + + -- Xavier Guimard Sun, 14 Apr 2019 23:02:19 +0200 + +simile-timeline (2.3.0+dfsg1-3) unstable; urgency=medium + + * Team upload + * Add Japan's new Reiwa area (Closes: #927034) + * Ignore some lintian false positive + * Declare compliance with policy 4.3.0 + * Change section to javascript + * Fix VCS fields + * Switch debian/copyright to format 1.0 + * Update debian/watch to new repository + * Add upstream/metadata + + -- Xavier Guimard Sun, 14 Apr 2019 22:50:28 +0200 + simile-timeline (2.3.0+dfsg1-2) unstable; urgency=low * Re-upload to unstable. diff -Nru simile-timeline-2.3.0+dfsg1/debian/control simile-timeline-2.3.0+dfsg1/debian/control --- simile-timeline-2.3.0+dfsg1/debian/control 2015-08-21 14:07:17.000000000 +0000 +++ simile-timeline-2.3.0+dfsg1/debian/control 2019-04-14 20:52:54.000000000 +0000 @@ -1,13 +1,13 @@ Source: simile-timeline -Section: web +Section: javascript Priority: optional Maintainer: Debian Javascript Maintainers Uploaders: Chris Lamb , W. Martin Borgert Build-Depends: debhelper (>= 7), ant, yui-compressor -Standards-Version: 3.9.6 -Homepage: http://www.simile-widgets.org/ -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-javascript/simile-timeline.git -Vcs-Git: git://anonscm.debian.org/pkg-javascript/simile-timeline.git +Standards-Version: 4.3.0 +Vcs-Browser: https://salsa.debian.org/js-team/simile-timeline +Vcs-Git: https://salsa.debian.org/js-team/simile-timeline.git +Homepage: https://www.simile-widgets.org/ Package: libjs-simile-timeline Architecture: all diff -Nru simile-timeline-2.3.0+dfsg1/debian/copyright simile-timeline-2.3.0+dfsg1/debian/copyright --- simile-timeline-2.3.0+dfsg1/debian/copyright 2015-08-21 14:07:17.000000000 +0000 +++ simile-timeline-2.3.0+dfsg1/debian/copyright 2019-04-14 20:53:01.000000000 +0000 @@ -1,21 +1,25 @@ -Author: David François Huynh -Download: http://www.simile-widgets.org/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: simile-ajax-bundle +Upstream-Contact: David François Huynh +Source: https://github.com/simile-widgets/timeline Files: * Copyright: © 2006 The SIMILE Project 2006 -License: BSD +License: BSD-3-Clause -Files: timeline_ajax/simile-ajax-bundle.js +Files: src/ajax/api/simile-ajax-bundle.js Copyright: © The SIMILE Project 2006. All rights reserved. © 2008 John Resig -License: BSD / MIT / GPL +License: BSD-3-Clause or Expat or GPL-2 +Comment: JQuery, www.jquery.com is included in the Ajax section of this + distribution. It is covered by its own license Files: debian/* Copyright: © 2009 Chris Lamb -License: GPL-3 +License: GPL-3+ -License: BSD +License: BSD-3-Clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -40,24 +44,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -License: GPL-3 - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems the full text of the GPL-3 may be found in the file - `/usr/share/common-licenses/GPL-3`. -License: MIT +License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights @@ -75,3 +63,36 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License: GPL-2 + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems the full text of the GPL-2 may be found in the file + `/usr/share/common-licenses/GPL-2`. + +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems the full text of the GPL-3 may be found in the file + `/usr/share/common-licenses/GPL-3`. diff -Nru simile-timeline-2.3.0+dfsg1/debian/patches/reiwa.diff simile-timeline-2.3.0+dfsg1/debian/patches/reiwa.diff --- simile-timeline-2.3.0+dfsg1/debian/patches/reiwa.diff 1970-01-01 00:00:00.000000000 +0000 +++ simile-timeline-2.3.0+dfsg1/debian/patches/reiwa.diff 2019-04-14 21:01:22.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Add new Reiwa Era +Author: Nobuhiro Iwamatsu +Bug-Debian: https://bugs.debian.org/927034 +Forwarded: no +Reviewed-By: Xavier Guimard +Last-Update: 2019-04-14 + +--- a/src/webapp/api/scripts/ext/japanese-eras.js ++++ b/src/webapp/api/scripts/ext/japanese-eras.js +@@ -390,6 +390,7 @@ + { startingYear: 1868, japaneseName: '明治', romanizedName: "Meiji" }, + { startingYear: 1912, japaneseName: '大正', romanizedName: "Taishō" }, + { startingYear: 1926, japaneseName: '昭和', romanizedName: "Shōwa" }, +- { startingYear: 1989, japaneseName: '平成', romanizedName: "Heisei" } ++ { startingYear: 1989, japaneseName: '平成', romanizedName: "Heisei" }, ++ { startingYear: 2019, japaneseName: '令和', romanizedName: "Reiwa" } + ] + ); diff -Nru simile-timeline-2.3.0+dfsg1/debian/patches/series simile-timeline-2.3.0+dfsg1/debian/patches/series --- simile-timeline-2.3.0+dfsg1/debian/patches/series 2015-08-21 14:07:17.000000000 +0000 +++ simile-timeline-2.3.0+dfsg1/debian/patches/series 2019-04-14 21:00:34.000000000 +0000 @@ -1,2 +1,3 @@ ant-build-xml.patch prevent-negative-height.patch +reiwa.diff diff -Nru simile-timeline-2.3.0+dfsg1/debian/source/lintian-overrides simile-timeline-2.3.0+dfsg1/debian/source/lintian-overrides --- simile-timeline-2.3.0+dfsg1/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ simile-timeline-2.3.0+dfsg1/debian/source/lintian-overrides 2019-04-14 06:55:11.000000000 +0000 @@ -0,0 +1,7 @@ +# False positive: data +source-contains-prebuilt-javascript-object src/ajax/api/simile-ajax-bundle.js line length is 557 characters (>512) +source-is-missing src/ajax/api/simile-ajax-bundle.js line length is 557 characters (>512) +insane-line-length-in-source-file src/webapp/api/timeline-bundle.js line length is 871 characters (>512) +source-contains-prebuilt-javascript-object src/webapp/api/timeline-bundle.js line length is 871 characters (>512) +source-is-missing src/webapp/api/timeline-bundle.js line length is 871 characters (>512) +insane-line-length-in-source-file src/ajax/api/simile-ajax-bundle.js line length is 557 characters (>512) diff -Nru simile-timeline-2.3.0+dfsg1/debian/upstream/metadata simile-timeline-2.3.0+dfsg1/debian/upstream/metadata --- simile-timeline-2.3.0+dfsg1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ simile-timeline-2.3.0+dfsg1/debian/upstream/metadata 2019-04-14 20:50:05.000000000 +0000 @@ -0,0 +1,7 @@ +--- +Archive: GitHub +Bug-Database: https://github.com/simile-widgets/timeline/issues +Contact: https://github.com/simile-widgets/timeline/issues +Name: timeline +Repository: https://github.com/simile-widgets/timeline.git +Repository-Browse: https://github.com/simile-widgets/timeline diff -Nru simile-timeline-2.3.0+dfsg1/debian/watch simile-timeline-2.3.0+dfsg1/debian/watch --- simile-timeline-2.3.0+dfsg1/debian/watch 2015-08-21 14:07:17.000000000 +0000 +++ simile-timeline-2.3.0+dfsg1/debian/watch 2019-04-14 20:45:24.000000000 +0000 @@ -1,4 +1,5 @@ -version=3 -opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack)\.?\d*$/$1/,downloadurlmangle=s%.*name=(.*?)&.*%https://simile-widgets\.googlecode\.com/files/$1%,filenamemangle=s/.*name=(.*?)&.*/$1/ \ -http://code.google.com/p/simile-widgets/downloads/list?can=1&q= \ -.*name=timeline_libraries(?:-|\.|_|_v|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz|zip|7z|jar)&\S* +version=4 +opts=\ +dversionmangle=auto,\ +filenamemangle=s/.*\/v?([\d\.-]+)\.tar\.gz/node-simile-timeline-$1.tar.gz/ \ + https://github.com/simile-widgets/timeline/tags .*/archive/v?([\d\.]+).tar.gz