Your message dated Mon, 15 Apr 2019 06:27:00 +0000
with message-id <[email protected]>
and subject line Re: Bug#927097: unblock: simile-timeline/2.3.0+dfsg1-4
has caused the Debian Bug report #927097,
regarding unblock: simile-timeline/2.3.0+dfsg1-4
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
927097: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927097
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock package simile-timeline
Hi all,
due to Japan's Era change, simile-timeline has to be updated (#927034).
I also updated debian files without changes on installed files, except
new era of course. Full changes:
* 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
simile-timeline has one reverse dependency: debian-timeline which has no
reverse dependencies.
Since change is minimal on installed files, I think it is now risky to
update simile-timeline.
Cheers,
Xavier
unblock simile-timeline/2.3.0+dfsg1-4
diff --git a/debian/changelog b/debian/changelog
index a6a3f75..933bb5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+simile-timeline (2.3.0+dfsg1-4) unstable; urgency=medium
+
+ * Team upload
+ * Fix error in reiwa.diff patch
+
+ -- Xavier Guimard <[email protected]> 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 <[email protected]> Sun, 14 Apr 2019 22:50:28 +0200
+
simile-timeline (2.3.0+dfsg1-2) unstable; urgency=low
* Re-upload to unstable.
diff --git a/debian/control b/debian/control
index f08bc6f..bd0fb56 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
Source: simile-timeline
-Section: web
+Section: javascript
Priority: optional
Maintainer: Debian Javascript Maintainers
<[email protected]>
Uploaders: Chris Lamb <[email protected]>, W. Martin Borgert
<[email protected]>
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 --git a/debian/copyright b/debian/copyright
index 5ac123f..f7095d8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,21 +1,25 @@
-Author: David François Huynh <[email protected]>
-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 <[email protected]>
+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 <[email protected]>
-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 @@ License: BSD
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 <http://www.gnu.org/licenses/>.
- .
- 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 @@ License: MIT
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 <https://www.gnu.org/licenses/>.
+ .
+ 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 <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems the full text of the GPL-3 may be found in the file
+ `/usr/share/common-licenses/GPL-3`.
diff --git a/debian/patches/reiwa.diff b/debian/patches/reiwa.diff
new file mode 100644
index 0000000..e75bb30
--- /dev/null
+++ b/debian/patches/reiwa.diff
@@ -0,0 +1,18 @@
+Description: Add new Reiwa Era
+Author: Nobuhiro Iwamatsu <[email protected]>
+Bug-Debian: https://bugs.debian.org/927034
+Forwarded: no
+Reviewed-By: Xavier Guimard <[email protected]>
+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 --git a/debian/patches/series b/debian/patches/series
index bb8ac0f..758dc75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
ant-build-xml.patch
prevent-negative-height.patch
+reiwa.diff
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..9666076
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -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 --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..e3bec07
--- /dev/null
+++ b/debian/upstream/metadata
@@ -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 --git a/debian/watch b/debian/watch
index 4e04750..760c453 100644
--- a/debian/watch
+++ b/debian/watch
@@ -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
--- End Message ---
--- Begin Message ---
Xavier Guimard:
> Package: release.debian.org
> Severity: normal
> User: [email protected]
> Usertags: unblock
>
> Please unblock package simile-timeline
>
> Hi all,
>
> due to Japan's Era change, simile-timeline has to be updated (#927034).
> I also updated debian files without changes on installed files, except
> new era of course. Full changes:
>
> [...]
>
> Cheers,
> Xavier
>
> unblock simile-timeline/2.3.0+dfsg1-4
>
Unblocked, thanks.
~Niels
--- End Message ---
