From a56e333970670be453f76326ac9062ae0b90e899 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 20 Apr 2020 00:47:41 +0530 Subject: [PATCH] Drop embedded copy of derailed_benchmarks and use packaged version --- debian/control | 7 +------ debian/copyright | 37 ------------------------------------- debian/gbp.conf | 2 +- debian/watch | 3 --- 4 files changed, 2 insertions(+), 47 deletions(-) diff --git a/debian/control b/debian/control index 87f1fcc2e7..9b82029d7f 100644 --- a/debian/control +++ b/debian/control @@ -278,12 +278,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # Snowplow events tracking ruby-snowplow-tracker (>= 0.6.1~), # Memory benchmarks -# derailed_benchmarks (embedded) - ruby-benchmark-ips (>= 2~), - ruby-statistics, - ruby-heapy, - ruby-unicode-plot, - ruby-mini-histogram, + ruby-derailed_benchmarks, # Metrics ruby-method-source (>= 1.0~), ruby-influxdb (>= 0.2~), diff --git a/debian/copyright b/debian/copyright index fbedee4343..e3bc68d82a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -26,22 +26,6 @@ Files: debian/* Copyright: 2015-2020 Pirate Praveen License: Expat -Files: derailed_benchmarks/* -Copyright: Richard Schneeman -License: Expat - -Files: derailed-benchmarks/test/rails_app/public/javascripts/*.js -Copyright: 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -License: Expat -Comment: Full text from http://madrobby.github.io/scriptaculous/license/ - -Files: derailed-benchmarks/test/rails_app/public/javascripts/prototype.js -Copyright: 2009 The Dojo Foundation - 2009 John Resig - 2005-2010 Sam Stephenson -License: Expat or BSD-3-Clause or GPL-2 -Comment: Full text from https://github.com/jquery/sizzle/blob/1.0.0/LICENSE - Files: doc/legal/*_contributor_license_agreement.md Copyright: the Google Open Source Programs Office License: CC-BY-3.0 @@ -115,27 +99,6 @@ License: Expat 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 package; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA - . - On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. - License: GPL This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff --git a/debian/gbp.conf b/debian/gbp.conf index 723988c9ca..a25c372a0c 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,2 +1,2 @@ [DEFAULT] -component = [ 'derailed-benchmarks', 'elasticsearch-model', 'elasticsearch-rails', 'faraday-middleware-aws-signers-v4', 'snowplow-javascript-tracker' ] +component = [ 'elasticsearch-model', 'elasticsearch-rails', 'faraday-middleware-aws-signers-v4', 'snowplow-javascript-tracker' ] diff --git a/debian/watch b/debian/watch index a13212d984..f76ce23d66 100644 --- a/debian/watch +++ b/debian/watch @@ -5,9 +5,6 @@ filenamemangle=s/.*v(.*)\/.*/gitlab-$1.tar.gz/,\ dversionmangle=s/(\d)[\+]?(debian|dfsg|ds|deb|gh)\d*(\~)*(rc)*(\d)*$/$1$3$4$5/ \ " https://gitlab.com/gitlab-org/gitlab-foss/tags .*/gitlab-foss-v(\d[\d.]*)\.tar\.gz debian -opts="pgpmode=none,component=derailed-benchmarks" \ -https://gemwatch.debian.net/gitlab-derailed_benchmarks .*/gitlab-derailed_benchmarks-(.*).tar.gz ignore - opts="pgpmode=none,component=elasticsearch-model" \ https://gemwatch.debian.net/elasticsearch-model .*/elasticsearch-model-(6.1.*).tar.gz ignore