[med-svn] [Git][med-team/rockhopper][master] 7 commits: Replace evil json
Andreas Tille
gitlab at salsa.debian.org
Sun May 20 06:24:40 BST 2018
Andreas Tille pushed to branch master at Debian Med / rockhopper
Commits:
481b89ef by Andreas Tille at 2018-05-20T07:11:47+02:00
Replace evil json
- - - - -
853fce60 by Andreas Tille at 2018-05-20T07:15:13+02:00
New upstream version 2.0.3+dfsg
- - - - -
6920b93f by Andreas Tille at 2018-05-20T07:15:34+02:00
Update upstream source from tag 'upstream/2.0.3+dfsg'
Update to upstream version '2.0.3+dfsg'
with Debian dir 7fdb9ac2aaa8bbeceb5904135d78915baa10a43e
- - - - -
14a9f18a by Andreas Tille at 2018-05-20T07:16:10+02:00
debhelper 11
- - - - -
456830f4 by Andreas Tille at 2018-05-20T07:16:21+02:00
Point Vcs fields to salsa.debian.org
- - - - -
0d560353 by Andreas Tille at 2018-05-20T07:16:21+02:00
Standards-Version: 4.1.4
- - - - -
b91e68ef by Andreas Tille at 2018-05-20T07:18:46+02:00
Update packaging
- - - - -
25 changed files:
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- debian/rules
- − org/json/CDL.class
- − org/json/Cookie.class
- − org/json/CookieList.class
- − org/json/HTTP.class
- − org/json/HTTPTokener.class
- − org/json/JSONArray.class
- − org/json/JSONException.class
- − org/json/JSONML.class
- − org/json/JSONObject$1.class
- − org/json/JSONObject$Null.class
- − org/json/JSONObject.class
- − org/json/JSONString.class
- − org/json/JSONStringer.class
- − org/json/JSONTokener.class
- − org/json/JSONWriter.class
- − org/json/README
- − org/json/Test$Beany.class
- − org/json/Test.class
- − org/json/XML.class
- − org/json/XMLTokener.class
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ rockhopper (2.0.3+dfsg-1) UNRELEASED; urgency=medium
* Initial release (Closes: #<bug>)
- -- Andreas Tille <tille at debian.org> Mon, 21 Aug 2017 13:12:44 +0200
+ -- Andreas Tille <tille at debian.org> Sun, 20 May 2018 07:16:21 +0200
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,20 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
Uploaders: Andreas Tille <tille at debian.org>
Section: science
Priority: optional
-Build-Depends: debhelper (>= 10)
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/rockhopper.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/rockhopper.git
+Build-Depends: debhelper (>= 11~),
+ javahelper,
+ default-jdk
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/med-team/rockhopper
+Vcs-Git: https://salsa.debian.org/med-team/rockhopper.git
Homepage: http://cs.wellesley.edu/~btjaden/Rockhopper/
Package: rockhopper
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libhtsjdk-java
+ libhtsjdk-java,
+ libjson-simple-java
Description: system for analyzing bacterial RNA-seq data
Rockhopper is a comprehensive and user-friendly system for
computational analysis of bacterial RNA-seq data. As input, Rockhopper
=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,7 @@ Upstream-Name: Rockhopper
Source: http://cs.wellesley.edu/~btjaden/Rockhopper/download.html
Files-Excluded: net/
org/broad/tribble
+ org/json
Files: *
Copyright: 2013 Brian Tjaden
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -6,4 +6,4 @@ export LC_ALL=C.UTF-8
include /usr/share/dpkg/default.mk
%:
- dh $@
+ dh $@ --with javahelper
=====================================
org/json/CDL.class deleted
=====================================
Binary files a/org/json/CDL.class and /dev/null differ
=====================================
org/json/Cookie.class deleted
=====================================
Binary files a/org/json/Cookie.class and /dev/null differ
=====================================
org/json/CookieList.class deleted
=====================================
Binary files a/org/json/CookieList.class and /dev/null differ
=====================================
org/json/HTTP.class deleted
=====================================
Binary files a/org/json/HTTP.class and /dev/null differ
=====================================
org/json/HTTPTokener.class deleted
=====================================
Binary files a/org/json/HTTPTokener.class and /dev/null differ
=====================================
org/json/JSONArray.class deleted
=====================================
Binary files a/org/json/JSONArray.class and /dev/null differ
=====================================
org/json/JSONException.class deleted
=====================================
Binary files a/org/json/JSONException.class and /dev/null differ
=====================================
org/json/JSONML.class deleted
=====================================
Binary files a/org/json/JSONML.class and /dev/null differ
=====================================
org/json/JSONObject$1.class deleted
=====================================
Binary files a/org/json/JSONObject$1.class and /dev/null differ
=====================================
org/json/JSONObject$Null.class deleted
=====================================
Binary files a/org/json/JSONObject$Null.class and /dev/null differ
=====================================
org/json/JSONObject.class deleted
=====================================
Binary files a/org/json/JSONObject.class and /dev/null differ
=====================================
org/json/JSONString.class deleted
=====================================
Binary files a/org/json/JSONString.class and /dev/null differ
=====================================
org/json/JSONStringer.class deleted
=====================================
Binary files a/org/json/JSONStringer.class and /dev/null differ
=====================================
org/json/JSONTokener.class deleted
=====================================
Binary files a/org/json/JSONTokener.class and /dev/null differ
=====================================
org/json/JSONWriter.class deleted
=====================================
Binary files a/org/json/JSONWriter.class and /dev/null differ
=====================================
org/json/README deleted
=====================================
--- a/org/json/README
+++ /dev/null
@@ -1,68 +0,0 @@
-JSON in Java [package org.json]
-
-Douglas Crockford
-douglas at crockford.com
-
-2011-02-02
-
-
-JSON is a light-weight, language independent, data interchange format.
-See http://www.JSON.org/
-
-The files in this package implement JSON encoders/decoders in Java.
-It also includes the capability to convert between JSON and XML, HTTP
-headers, Cookies, and CDL.
-
-This is a reference implementation. There is a large number of JSON packages
-in Java. Perhaps someday the Java community will standardize on one. Until
-then, choose carefully.
-
-The license includes this restriction: "The software shall be used for good,
-not evil." If your conscience cannot live with that, then choose a different
-package.
-
-The package compiles on Java 1.2 thru Java 1.4.
-
-
-JSONObject.java: The JSONObject can parse text from a String or a JSONTokener
-to produce a map-like object. The object provides methods for manipulating its
-contents, and for producing a JSON compliant object serialization.
-
-JSONArray.java: The JSONObject can parse text from a String or a JSONTokener
-to produce a vector-like object. The object provides methods for manipulating
-its contents, and for producing a JSON compliant array serialization.
-
-JSONTokener.java: The JSONTokener breaks a text into a sequence of individual
-tokens. It can be constructed from a String, Reader, or InputStream.
-
-JSONException.java: The JSONException is the standard exception type thrown
-by this package.
-
-
-JSONString.java: The JSONString interface requires a toJSONString method,
-allowing an object to provide its own serialization.
-
-JSONStringer.java: The JSONStringer provides a convenient facility for
-building JSON strings.
-
-JSONWriter.java: The JSONWriter provides a convenient facility for building
-JSON text through a writer.
-
-
-CDL.java: CDL provides support for converting between JSON and comma
-delimited lists.
-
-Cookie.java: Cookie provides support for converting between JSON and cookies.
-
-CookieList.java: CookieList provides support for converting between JSON and
-cookie lists.
-
-HTTP.java: HTTP provides support for converting between JSON and HTTP headers.
-
-HTTPTokener.java: HTTPTokener extends JSONTokener for parsing HTTP headers.
-
-XML.java: XML provides support for converting between JSON and XML.
-
-JSONML.java: JSONML provides support for converting between JSONML and XML.
-
-XMLTokener.java: XMLTokener extends JSONTokener for parsing XML text.
\ No newline at end of file
=====================================
org/json/Test$Beany.class deleted
=====================================
Binary files a/org/json/Test$Beany.class and /dev/null differ
=====================================
org/json/Test.class deleted
=====================================
Binary files a/org/json/Test.class and /dev/null differ
=====================================
org/json/XML.class deleted
=====================================
Binary files a/org/json/XML.class and /dev/null differ
=====================================
org/json/XMLTokener.class deleted
=====================================
Binary files a/org/json/XMLTokener.class and /dev/null differ
View it on GitLab: https://salsa.debian.org/med-team/rockhopper/compare/f754c48e65e099698d79f569f9311cbd10d16431...b91e68ef83bad1526abf3cd792f7f97665663821
---
View it on GitLab: https://salsa.debian.org/med-team/rockhopper/compare/f754c48e65e099698d79f569f9311cbd10d16431...b91e68ef83bad1526abf3cd792f7f97665663821
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180520/7ce2d718/attachment-0001.html>
More information about the debian-med-commit
mailing list