From b7721ae6544f4d33d25fda35dc3a900f7d06a675 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez <ruben@trisquel.info> Date: Sat, 4 Feb 2017 13:12:08 -0500 Subject: [PATCH] Updated SIGNKEY and REPOKEY in helpers that needed it Conflicts: helpers/make-firejail helpers/make-libsodium helpers/make-midori helpers/make-mozilla-kde-support helpers/make-scilab --- helpers/make-cabal-install-1.20 | 2 +- helpers/make-ddccontrol | 2 +- helpers/make-ddccontrol-db | 2 +- helpers/make-debian-reference | 1 - helpers/make-electrum | 2 +- helpers/make-eviacam | 3 ++- helpers/make-filteraudio | 2 +- helpers/make-ghc-7.8.3 | 2 +- helpers/make-handbrake | 3 ++- helpers/make-icecat | 1 + helpers/make-pkglab | 1 - helpers/make-qelectrotech | 2 +- helpers/make-qtox | 2 +- helpers/make-tor | 2 +- helpers/make-toxcore | 2 +- helpers/make-toxic | 2 +- helpers/make-utox | 2 +- helpers/make-youtube-dl | 2 +- helpers/make-zam-plugins | 1 - 19 files changed, 18 insertions(+), 18 deletions(-) diff --git a/helpers/make-cabal-install-1.20 b/helpers/make-cabal-install-1.20 index 1836475d..38e3e4b5 100644 --- a/helpers/make-cabal-install-1.20 +++ b/helpers/make-cabal-install-1.20 @@ -17,7 +17,7 @@ VERSION=1 EXTERNAL='deb-src http://ppa.launchpad.net/hvr/ghc/ubuntu $UPSTREAM main' -SIGNKEY=FF3AEACEF6F88286 +REPOKEY=FF3AEACEF6F88286 . ./config diff --git a/helpers/make-ddccontrol b/helpers/make-ddccontrol index b45b4107..5dc22e3f 100644 --- a/helpers/make-ddccontrol +++ b/helpers/make-ddccontrol @@ -19,7 +19,7 @@ VERSION=1 EXTERNAL='deb-src http://ftp.us.debian.org/debian jessie main' -SIGNKEY="7638D0442B90D010" + . ./config changelog "Imported into Trisquel" diff --git a/helpers/make-ddccontrol-db b/helpers/make-ddccontrol-db index b45b4107..5dc22e3f 100644 --- a/helpers/make-ddccontrol-db +++ b/helpers/make-ddccontrol-db @@ -19,7 +19,7 @@ VERSION=1 EXTERNAL='deb-src http://ftp.us.debian.org/debian jessie main' -SIGNKEY="7638D0442B90D010" + . ./config changelog "Imported into Trisquel" diff --git a/helpers/make-debian-reference b/helpers/make-debian-reference index 18717b20..dc0915d8 100644 --- a/helpers/make-debian-reference +++ b/helpers/make-debian-reference @@ -19,7 +19,6 @@ # One release to rule them all :) EXTERNAL='deb-src http://ftp.es.debian.org/debian/ jessie main' -SIGNKEY="46925553" VERSION=1 diff --git a/helpers/make-electrum b/helpers/make-electrum index 8d8db2c4..2d457b46 100644 --- a/helpers/make-electrum +++ b/helpers/make-electrum @@ -19,7 +19,7 @@ VERSION=1 EXTERNAL="deb-src http://ftp.debian.org/debian testing main" -SIGNKEY="46925553" +SIGNKEY="1F637893" apt-get install --force-yes -y debian-archive-keyring diff --git a/helpers/make-eviacam b/helpers/make-eviacam index 6f837065..b4a93a17 100644 --- a/helpers/make-eviacam +++ b/helpers/make-eviacam @@ -19,7 +19,8 @@ VERSION=1 EXTERNAL='deb-src http://ppa.launchpad.net/cesar-crea-si/eviacam/ubuntu $UPSTREAM main' -SIGNKEY="14C5A991" +SIGNKEY="87CE47C2" +REPOKEY="6C9D15D314C5A991" . ./config diff --git a/helpers/make-filteraudio b/helpers/make-filteraudio index 9ed61c15..6e88ad27 100644 --- a/helpers/make-filteraudio +++ b/helpers/make-filteraudio @@ -17,7 +17,7 @@ VERSION=1 EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main' -SIGNKEY=D1386E5F3FC3365C +REPOKEY=D1386E5F3FC3365C . ./config diff --git a/helpers/make-ghc-7.8.3 b/helpers/make-ghc-7.8.3 index 9eff1905..1d302b21 100644 --- a/helpers/make-ghc-7.8.3 +++ b/helpers/make-ghc-7.8.3 @@ -17,7 +17,7 @@ VERSION=1 EXTERNAL='deb-src http://ppa.launchpad.net/hvr/ghc/ubuntu $UPSTREAM main' -SIGNKEY=FF3AEACEF6F88286 +REPOKEY=FF3AEACEF6F88286 . ./config diff --git a/helpers/make-handbrake b/helpers/make-handbrake index 3e688185..09a88265 100644 --- a/helpers/make-handbrake +++ b/helpers/make-handbrake @@ -19,7 +19,8 @@ VERSION=1 EXTERNAL='deb-src http://ppa.launchpad.net/stebbins/handbrake-snapshots/ubuntu/ $UPSTREAM main' -SIGNKEY="816950D8" +SIGNKEY="30CC05C8" +REPOKEY="8771ADB0816950D8" . ./config diff --git a/helpers/make-icecat b/helpers/make-icecat index 60e43598..b9622a95 100644 --- a/helpers/make-icecat +++ b/helpers/make-icecat @@ -20,6 +20,7 @@ VERSION=1 EXTERNAL='deb-src http://devel.trisquel.info/repos/packages/icecat/ GNU main' SIGNKEY="D7E04784" +REPOKEY="3C76EED7D7E04784" . ./config diff --git a/helpers/make-pkglab b/helpers/make-pkglab index 2f018b77..e2e639cf 100644 --- a/helpers/make-pkglab +++ b/helpers/make-pkglab @@ -19,7 +19,6 @@ VERSION=1 EXTERNAL='deb-src http://ftp.us.debian.org/debian stable main' -SIGNKEY="46925553" . ./config diff --git a/helpers/make-qelectrotech b/helpers/make-qelectrotech index f4cd9624..4c0f6a83 100644 --- a/helpers/make-qelectrotech +++ b/helpers/make-qelectrotech @@ -19,7 +19,7 @@ VERSION=1 EXTERNAL='deb-src http://debian.qelectrotech.org/qet/debian/ stable main' -SIGNKEY="BC9F825E1D4FB6C1" +REPOKEY="BC9F825E1D4FB6C1" . ./config diff --git a/helpers/make-qtox b/helpers/make-qtox index 9ed61c15..6e88ad27 100644 --- a/helpers/make-qtox +++ b/helpers/make-qtox @@ -17,7 +17,7 @@ VERSION=1 EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main' -SIGNKEY=D1386E5F3FC3365C +REPOKEY=D1386E5F3FC3365C . ./config diff --git a/helpers/make-tor b/helpers/make-tor index d1f5930b..65f8f0f3 100644 --- a/helpers/make-tor +++ b/helpers/make-tor @@ -19,7 +19,7 @@ VERSION=1 EXTERNAL='deb-src http://deb.torproject.org/torproject.org trusty main' -SIGNKEY="886DDD89" +REPOKEY="74A941BA219EC810" . ./config diff --git a/helpers/make-toxcore b/helpers/make-toxcore index 9ed61c15..646ac85d 100644 --- a/helpers/make-toxcore +++ b/helpers/make-toxcore @@ -17,7 +17,7 @@ VERSION=1 EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main' -SIGNKEY=D1386E5F3FC3365C +REPOKEY="D1386E5F3FC3365C" . ./config diff --git a/helpers/make-toxic b/helpers/make-toxic index 9ed61c15..646ac85d 100644 --- a/helpers/make-toxic +++ b/helpers/make-toxic @@ -17,7 +17,7 @@ VERSION=1 EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main' -SIGNKEY=D1386E5F3FC3365C +REPOKEY="D1386E5F3FC3365C" . ./config diff --git a/helpers/make-utox b/helpers/make-utox index 9ed61c15..646ac85d 100644 --- a/helpers/make-utox +++ b/helpers/make-utox @@ -17,7 +17,7 @@ VERSION=1 EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main' -SIGNKEY=D1386E5F3FC3365C +REPOKEY="D1386E5F3FC3365C" . ./config diff --git a/helpers/make-youtube-dl b/helpers/make-youtube-dl index 8aa1be5b..59f2801a 100644 --- a/helpers/make-youtube-dl +++ b/helpers/make-youtube-dl @@ -19,7 +19,7 @@ VERSION=1 EXTERNAL='deb-src http://ppa.launchpad.net/nilarimogard/webupd8/ubuntu $UPSTREAM main' -SIGNKEY="531EE72F4C9D234C" +REPOKEY="531EE72F4C9D234C" . ./config diff --git a/helpers/make-zam-plugins b/helpers/make-zam-plugins index dd5e55fa..d1682eec 100644 --- a/helpers/make-zam-plugins +++ b/helpers/make-zam-plugins @@ -19,7 +19,6 @@ VERSION=1 EXTERNAL='deb-src http://ftp.debian.org/debian testing main' -SIGNKEY="8B48AD6246925553" . ./config -- GitLab