diff -Nru launchpad-getkeys-0.3.2/debian/changelog launchpad-getkeys-0.3.3/debian/changelog --- launchpad-getkeys-0.3.2/debian/changelog 2011-11-07 19:35:28.000000000 +0000 +++ launchpad-getkeys-0.3.3/debian/changelog 2014-07-17 11:27:37.000000000 +0000 @@ -1,3 +1,13 @@ +launchpad-getkeys (0.3.3-1~webupd8~2) trusty; urgency=medium + + * switch to apt-key + * mention that the tool imports missing keys but does not fix + broken keys + * bump standards to 3.9.5 + * some packaging fixes + + -- Alin Andrei Thu, 17 Jul 2014 14:18:37 +0200 + launchpad-getkeys (0.3.2-1~webupd8~oneiric) oneiric; urgency=low * try to use apt proxy by default diff -Nru launchpad-getkeys-0.3.2/debian/control launchpad-getkeys-0.3.3/debian/control --- launchpad-getkeys-0.3.2/debian/control 2010-12-09 09:28:13.000000000 +0000 +++ launchpad-getkeys-0.3.3/debian/control 2014-07-17 11:27:32.000000000 +0000 @@ -3,14 +3,17 @@ Priority: extra Maintainer: Alin Andrei Build-Depends: debhelper (>= 7) -Standards-Version: 3.8.3 +Standards-Version: 3.9.5 Package: launchpad-getkeys Architecture: all Depends: ${misc:Depends} -Description: Installs Launchpad keys for the PPAs in your software sources - This package provides a script capable of automatically downloading - the GPG keys for all your PPAs, even if you are behind a firewall that - blocks port 11371. +Description: Import missing GPG keys automatically . - Run it: sudo launchpad-getkeys + This package provides a script capable of automatically + downloading the missing GPG keys for all your PPAs, even if you are + behind a firewall that blocks port 11371. + . + The tool does not fix broken keys! + . + To use it, run: sudo launchpad-getkeys diff -Nru launchpad-getkeys-0.3.2/debian/rules launchpad-getkeys-0.3.3/debian/rules --- launchpad-getkeys-0.3.2/debian/rules 2010-05-28 16:35:50.000000000 +0000 +++ launchpad-getkeys-0.3.3/debian/rules 2014-07-17 11:23:58.000000000 +0000 @@ -1,92 +1,4 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - - - - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - #$(MAKE) - #docbook-to-man debian/launchpad-getkeys.sgml > launchpad-getkeys.1 - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - #$(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Add here commands to install the package into debian/launchpad-getkeys. - #$(MAKE) DESTDIR=$(CURDIR)/debian/launchpad-getkeys install - - -# Build architecture-dependent files here. -binary-arch: install -# We have nothing to do by default. - -# Build architecture-independent files here. -binary-indep: install - dh_testdir - dh_testroot - dh_installchangelogs - install --mode=755 -t debian/launchpad-getkeys/usr/bin launchpad-getkeys -# dh_installdocs -# dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo -# dh_installman - dh_link -# dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb -i -- -Zlzma - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +%: + dh $@ diff -Nru launchpad-getkeys-0.3.2/debian/source/format launchpad-getkeys-0.3.3/debian/source/format --- launchpad-getkeys-0.3.2/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ launchpad-getkeys-0.3.3/debian/source/format 2014-07-17 11:24:30.000000000 +0000 @@ -0,0 +1 @@ +3.0 (native) diff -Nru launchpad-getkeys-0.3.2/launchpad-getkeys launchpad-getkeys-0.3.3/launchpad-getkeys --- launchpad-getkeys-0.3.2/launchpad-getkeys 2011-11-07 19:35:14.000000000 +0000 +++ launchpad-getkeys-0.3.3/launchpad-getkeys 2014-07-17 11:22:31.000000000 +0000 @@ -12,6 +12,8 @@ launchpad-getkeys is an utility to automatically import all Lunchpad PPAs missing GPG keys. +The tool does not fix broken keys. + Usage: * use without any parameter to automatically import all the missing GPG keys @@ -80,9 +82,9 @@ while read curline; do GPGKEYTOGET=$(echo $curline | grep NO_PUBKEY | sed -e 's/.*: \|NO_PUBKEY //g') if [[ $KEYSERVER ]]; then - gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg --keyring /etc/apt/trusted.gpg --primary-keyring /etc/apt/trusted.gpg --keyserver hkp://$KEYSERVER --keyserver-options http-proxy=$PROXY --recv $GPGKEYTOGET + apt-key adv --keyserver hkp://$KEYSERVER --keyserver-options http-proxy=$PROXY --recv-keys $GPGKEYTOGET else - gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg --keyring /etc/apt/trusted.gpg --primary-keyring /etc/apt/trusted.gpg --keyserver hkp://keyserver.ubuntu.com:80 --keyserver-options http-proxy=$PROXY --recv $GPGKEYTOGET + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --keyserver-options http-proxy=$PROXY --recv-keys $GPGKEYTOGET fi let n=n+1 done < /tmp/updateresults @@ -90,7 +92,10 @@ echo " launchpad-getkeys has finished importing all missing GPG keys. Try running "sudo apt-get update" - you shouldn't see any key -errors anymore" +errors any more. +............................................................. +Note that launchpad-getkeys imports missing GPG keys but does +not fix broken keys." else echo " There are no missing GPG keys!"