diff -ruN lintian-2.5.30/debian/changelog lintian-2.5.30ubuntu1/debian/changelog --- lintian-2.5.30/debian/changelog 2014-10-25 19:08:49.000000000 +0400 +++ lintian-2.5.30ubuntu1/debian/changelog 2014-11-09 13:14:56.462358260 +0300 @@ -1,3 +1,10 @@ +lintian (2.5.30ubuntu1) vivid; urgency=low + + * Merge from Debian unstable, remaining change: + - Ship pre-uglified json.js to avoid build-dep on nodejs for the tests. + + -- Dmitry Shachnev Sun, 09 Nov 2014 13:14:46 +0300 + lintian (2.5.30) unstable; urgency=medium The "welcome Axel Beckert!" release. @@ -266,6 +273,19 @@ -- Niels Thykier Thu, 02 Oct 2014 19:27:09 +0200 +lintian (2.5.27ubuntu2) utopic; urgency=medium + + * Add vivid to the list of valid Ubuntu series. + + -- Stéphane Graber Mon, 20 Oct 2014 11:43:23 -0400 + +lintian (2.5.27ubuntu1) utopic; urgency=low + + * Merge from Debian unstable, remaining change: + - Ship pre-uglified json.js to avoid build-dep on nodejs for the tests. + + -- Dmitry Shachnev Wed, 24 Sep 2014 15:03:10 +0400 + lintian (2.5.27) unstable; urgency=medium * Summary of tag changes: @@ -312,6 +332,14 @@ -- Niels Thykier Sat, 13 Sep 2014 22:48:36 +0200 +lintian (2.5.26ubuntu1) utopic; urgency=medium + + * Merge from Debian unstable, remaining changes: + - Ship pre-uglified json.js to avoid build-dep on nodejs for the + tests. + + -- Martin Pitt Mon, 08 Sep 2014 07:18:20 +0200 + lintian (2.5.26) unstable; urgency=medium * Summary of tag changes: @@ -479,6 +507,31 @@ -- Niels Thykier Sat, 06 Sep 2014 10:44:36 +0200 +lintian (2.5.25ubuntu3) utopic; urgency=medium + + * Drop files-pkgconfig test for now, it's broken on anything but amd64. + (See Debian #758529) + + -- Martin Pitt Mon, 18 Aug 2014 16:55:11 +0200 + +lintian (2.5.25ubuntu2) utopic; urgency=medium + + * Fix arch in t/tests/files-pkgconfig/tags. + + -- Martin Pitt Mon, 18 Aug 2014 13:27:35 +0200 + +lintian (2.5.25ubuntu1) utopic; urgency=medium + + * Merge from Debian unstable, remaining changes: + - Ship pre-uglified json.js to avoid build-dep on nodejs for the + tests. + * t: Fix one of the test failures caused by dpkg-source 1.17.11. + Cherry-picked from git head. + * Drop inconsistent-testsuite-field from testsuite-general check, as dpkg + now adds the field automatically. + + -- Martin Pitt Mon, 18 Aug 2014 11:53:10 +0200 + lintian (2.5.25) unstable; urgency=medium * Summary of tag changes: @@ -564,6 +617,14 @@ -- Niels Thykier Sun, 13 Jul 2014 20:36:30 +0200 +lintian (2.5.24ubuntu1) utopic; urgency=medium + + * Merge from Debian unstable, remaining changes: + - Ship pre-uglified json.js to avoid build-dep on nodejs for the + tests. + + -- Dimitri John Ledkov Tue, 08 Jul 2014 00:28:20 +0100 + lintian (2.5.24) unstable; urgency=medium * Summary of tag changes: @@ -785,6 +846,18 @@ -- Niels Thykier Sun, 30 Mar 2014 20:55:52 +0200 +lintian (2.5.22ubuntu2) utopic; urgency=medium + + * Add utopic to the list of known ubuntu releases. + + -- Dimitri John Ledkov Thu, 24 Apr 2014 00:38:02 +0100 + +lintian (2.5.22ubuntu1) trusty; urgency=medium + + * Ship pre-uglified json.js to avoid build-dep on nodejs for the tests. + + -- Adam Conrad Sat, 29 Mar 2014 04:55:14 -0600 + lintian (2.5.22) unstable; urgency=medium * Summary of tag changes: diff -ruN lintian-2.5.30/debian/control lintian-2.5.30ubuntu1/debian/control --- lintian-2.5.30/debian/control 2014-10-25 18:41:10.000000000 +0400 +++ lintian-2.5.30ubuntu1/debian/control 2014-10-26 01:54:55.000000000 +0300 @@ -1,7 +1,8 @@ Source: lintian Section: devel Priority: optional -Maintainer: Debian Lintian Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Lintian Maintainers Uploaders: Josip Rodin , Colin Watson , Russ Allbery , @@ -50,7 +51,6 @@ liburi-perl, libyaml-perl, man-db, - node-uglify, patchutils, perl, # pkg-php-tools is not available in Wheezy. However, it is only used for diff -ruN lintian-2.5.30/t/tests/cruft-minified-js/debian/debian/missing-sources/json.min.js lintian-2.5.30ubuntu1/t/tests/cruft-minified-js/debian/debian/missing-sources/json.min.js --- lintian-2.5.30/t/tests/cruft-minified-js/debian/debian/missing-sources/json.min.js 1970-01-01 03:00:00.000000000 +0300 +++ lintian-2.5.30ubuntu1/t/tests/cruft-minified-js/debian/debian/missing-sources/json.min.js 2014-09-25 11:55:47.000000000 +0400 @@ -0,0 +1,191 @@ +/* + json.js + 2012-10-08 + + Public Domain + + No warranty expressed or implied. Use at your own risk. + + This file has been superceded by http://www.JSON.org/json2.js + + See http://www.JSON.org/js.html + + This code should be minified before deployment. + See http://javascript.crockford.com/jsmin.html + + USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO + NOT CONTROL. + + This file adds these methods to JavaScript: + + object.toJSONString(whitelist) + This method produce a JSON text from a JavaScript value. + It must not contain any cyclical references. Illegal values + will be excluded. + + The default conversion for dates is to an ISO string. You can + add a toJSONString method to any date object to get a different + representation. + + The object and array methods can take an optional whitelist + argument. A whitelist is an array of strings. If it is provided, + keys in objects not found in the whitelist are excluded. + + string.parseJSON(filter) + This method parses a JSON text to produce an object or + array. It can throw a SyntaxError exception. + + The optional filter parameter is a function which can filter and + transform the results. It receives each of the keys and values, and + its return value is used instead of the original value. If it + returns what it received, then structure is not modified. If it + returns undefined then the member is deleted. + + Example: + + // Parse the text. If a key contains the string 'date' then + // convert the value to a date. + + myData = text.parseJSON(function (key, value) { + return key.indexOf('date') >= 0 ? new Date(value) : value; + }); + + This file will break programs with improper for..in loops. See + http://yuiblog.com/blog/2006/09/26/for-in-intrigue/ + + This file creates a global JSON object containing two methods: stringify + and parse. + + JSON.stringify(value, replacer, space) + value any JavaScript value, usually an object or array. + + replacer an optional parameter that determines how object + values are stringified for objects. It can be a + function or an array of strings. + + space an optional parameter that specifies the indentation + of nested structures. If it is omitted, the text will + be packed without extra whitespace. If it is a number, + it will specify the number of spaces to indent at each + level. If it is a string (such as '\t' or ' '), + it contains the characters used to indent at each level. + + This method produces a JSON text from a JavaScript value. + + When an object value is found, if the object contains a toJSON + method, its toJSON method will be called and the result will be + stringified. A toJSON method does not serialize: it returns the + value represented by the name/value pair that should be serialized, + or undefined if nothing should be serialized. The toJSON method + will be passed the key associated with the value, and this will be + bound to the object holding the key. + + For example, this would serialize Dates as ISO strings. + + Date.prototype.toJSON = function (key) { + function f(n) { + // Format integers to have at least two digits. + return n < 10 ? '0' + n : n; + } + + return this.getUTCFullYear() + '-' + + f(this.getUTCMonth() + 1) + '-' + + f(this.getUTCDate()) + 'T' + + f(this.getUTCHours()) + ':' + + f(this.getUTCMinutes()) + ':' + + f(this.getUTCSeconds()) + 'Z'; + }; + + You can provide an optional replacer method. It will be passed the + key and value of each member, with this bound to the containing + object. The value that is returned from your method will be + serialized. If your method returns undefined, then the member will + be excluded from the serialization. + + If the replacer parameter is an array of strings, then it will be + used to select the members to be serialized. It filters the results + such that only members with keys listed in the replacer array are + stringified. + + Values that do not have JSON representations, such as undefined or + functions, will not be serialized. Such values in objects will be + dropped; in arrays they will be replaced with null. You can use + a replacer function to replace those with JSON values. + JSON.stringify(undefined) returns undefined. + + The optional space parameter produces a stringification of the + value that is filled with line breaks and indentation to make it + easier to read. + + If the space parameter is a non-empty string, then that string will + be used for indentation. If the space parameter is a number, then + the indentation will be that many spaces. + + Example: + + text = JSON.stringify(['e', {pluribus: 'unum'}]); + // text is '["e",{"pluribus":"unum"}]' + + + text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t'); + // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]' + + text = JSON.stringify([new Date()], function (key, value) { + return this[key] instanceof Date ? + 'Date(' + this[key] + ')' : value; + }); + // text is '["Date(---current time---)"]' + + + JSON.parse(text, reviver) + This method parses a JSON text to produce an object or array. + It can throw a SyntaxError exception. + + The optional reviver parameter is a function that can filter and + transform the results. It receives each of the keys and values, + and its return value is used instead of the original value. + If it returns what it received, then the structure is not modified. + If it returns undefined then the member is deleted. + + Example: + + // Parse the text. Values that look like ISO date strings will + // be converted to Date objects. + + myData = JSON.parse(text, function (key, value) { + var a; + if (typeof value === 'string') { + a = +/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value); + if (a) { + return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4], + +a[5], +a[6])); + } + } + return value; + }); + + myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) { + var d; + if (typeof value === 'string' && + value.slice(0, 5) === 'Date(' && + value.slice(-1) === ')') { + d = new Date(value.slice(5, -1)); + if (d) { + return d; + } + } + return value; + }); + + + This is a reference implementation. You are free to copy, modify, or + redistribute. +*//*jslint evil: true, regexp: true, unparam: true *//*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply, + call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours, + getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join, + lastIndex, length, parse, parseJSON, prototype, push, replace, slice, + stringify, test, toJSON, toJSONString, toString, valueOf +*/// Create a JSON object only if one does not already exist. We create the +// methods in a closure to avoid creating global variables. +typeof JSON!="object"&&(JSON={}),function(){"use strict";function f(e){return e<10?"0"+e:e}function quote(e){return escapable.lastIndex=0,escapable.test(e)?'"'+e.replace(escapable,function(e){var t=meta[e];return typeof t=="string"?t:"\\u"+("0000"+e.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+e+'"'}function str(e,t){var n,r,i,s,o=gap,u,a=t[e];a&&typeof a=="object"&&typeof a.toJSON=="function"&&(a=a.toJSON(e)),typeof rep=="function"&&(a=rep.call(t,e,a));switch(typeof a){case"string":return quote(a);case"number":return isFinite(a)?String(a):"null";case"boolean":case"null":return String(a);case"object":if(!a)return"null";gap+=indent,u=[];if(Object.prototype.toString.apply(a)==="[object Array]"){s=a.length;for(n=0;n