--- add-apt-key-1.0.orig/debian/rules +++ add-apt-key-1.0/debian/rules @@ -0,0 +1,13 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_INSTALL_MANPAGES_add-apt-key = add-apt-key.8 + +build/add-apt-key:: + sh debian/copyright-files/mkcopy.sh debian/copyright debian/copyright-files/PKG_PREAMBLE debian/copyright-files/PKG_NOTICE debian/copyright-files/MIT_LICENSE debian/copyright-files/UPSTREAM_NOTICE debian/copyright-files/GPL_LICENSE + docbook2x-man man/add-apt-key.8.docbook + +clean:: + rm -f add-apt-key.8 + --- add-apt-key-1.0.orig/debian/add-apt-key.install +++ add-apt-key-1.0/debian/add-apt-key.install @@ -0,0 +1,2 @@ +sbin/add-apt-key /usr/sbin/ +default/add-apt-key /etc/default/ --- add-apt-key-1.0.orig/debian/README.Debian +++ add-apt-key-1.0/debian/README.Debian @@ -0,0 +1,27 @@ +add-apt-key for Debian +---------------------- + +This command line tool can be used to add a GPG +key to your APT key ring. + +Note that for a graphical to add to the APT key ring +you may consider the APT Key Manager (package "gui-apt-key"). + + +On the use of /etc/default/add-apt-key +-------------------------------------- + +Generally speaking gpg has a facility for selecting the +default keyserver. See also gnupg(1). However, due to +a current upstream bug in gnupg: + +https://bugs.launchpad.net/ubuntu/+source/gnupg/+bug/76983 + +Without deliberately setting the --keyserver option the +operation will fail for installations for which the +/root/.gnupg/gpg.conf file has not been setup appropriately. +Therefore this alternate mechanism will remain in place +until the upstream bug is closed so that users may have +a pleasant "out of the box" experience. + + -- Tom Marble , Sun, 4 Feb 2007 14:30:59 -0600 --- add-apt-key-1.0.orig/debian/changelog +++ add-apt-key-1.0/debian/changelog @@ -0,0 +1,41 @@ +add-apt-key (1.0-0.5) feisty; urgency=low + + * Changed release to feisty (closed changelog too early last time :) + * Added upstream author to copyright (copyright-files/PKG_PREAMBLE) + * Reformatted GPL reference (copyright-files/GPL_LICENSE) + + -- Tom Marble Thu, 15 Feb 2007 17:29:41 -0600 + +add-apt-key (1.0-0.4) feisty; urgency=low + + * Added example generated debian/copyright file + + -- Tom Marble Sun, 4 Feb 2007 15:20:15 -0600 + +add-apt-key (1.0-0.3) feisty; urgency=low + + * Changed to creating add-apt-key-1.0 as an "upstream" package + * Moved README comments to README.Debian + * added mkcopy.sh script for creating copyright file + * updated upstream location + + -- Tom Marble Sun, 4 Feb 2007 11:12:12 -0600 + +add-apt-key (1.0-0.2) feisty; urgency=low + + * Added LICENSE file for this native package + * Added AUTHORS file + * Added author to debian/copyright + * Rewriting control has been removed + * Comment in README about the rationale for /etc/default/add-apt-key + * Added the --keyserver option + * Updated the manpage source (now as docbook) + * Changed rules to generate the man page as part of the build + + -- Tom Marble Fri, 2 Feb 2007 13:05:06 -0600 + +add-apt-key (1.0-0.1) feisty; urgency=low + + * Initial Release + + -- Tom Marble Thu, 1 Feb 2007 16:24:40 -0600 --- add-apt-key-1.0.orig/debian/control +++ add-apt-key-1.0/debian/control @@ -0,0 +1,17 @@ +Source: add-apt-key +Section: admin +Priority: optional +Maintainer: Tom Marble +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5) +Build-Depends-Indep: docbook2x +Standards-Version: 3.7.2 + +Package: add-apt-key +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, apt, gnupg +Description: Command line tool to add GPG keys to the APT keyring + The command add-apt-key provides a convenient command line interface + which will add a new GPG key to your APT keyring. + . + Those who are more graphically inclined may prefer the package + gui-apt-key. --- add-apt-key-1.0.orig/debian/compat +++ add-apt-key-1.0/debian/compat @@ -0,0 +1 @@ +5 --- add-apt-key-1.0.orig/debian/copyright +++ add-apt-key-1.0/debian/copyright @@ -0,0 +1,49 @@ +This package was debianized by Tom Marble on +Thu, 1 Feb 2007 16:24:40 -0600 + +Upstream downloaded from: + https://add-apt-key.dev.java.net/ + + - - - - - copyright notice and license for Debian packaging - - - - - + +Copyright © 2007 Sun Microsystems, Inc. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + - - - - - copyright notice and license for upstream - - - - - + +Copyright © 2007 Sun Microsystems, Inc. + +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, or +(at your option) any later version. + +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, N: MA 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- add-apt-key-1.0.orig/debian/copyright-files/mkcopy.sh +++ add-apt-key-1.0/debian/copyright-files/mkcopy.sh @@ -0,0 +1,102 @@ +#!/bin/bash +# mkcopy.sh will construct a debian/copyright file +# usage: mkcopy.sh copyright preamble pkg-notice pkg-license \ +# upstream-notice upstream-license [third-party-notices...] +# +# BACKGROUND +# In some cases it is desirable to clearly identify the license +# for debian packaging as distinct from that of upstream (and any +# possible third party components). This script has been created +# the purpose of generating a clean debian/copyright with the +# conventions as suggested by debian-legal: +# http://lists.debian.org/debian-legal/2006/04/msg00251.html +# +# The inputs to this script are filenames for: +# copyright - the output copyright file to be generated +# preamble - the packaging preamble file (debianizer, upstream source) +# pkg-notice - copyright notice for the packaging +# pkg-license - license for the packaging +# upstream-notice - copyright notice for upstream +# upstream-license - license for upstream +# it is important to note that Debian systems must *not* include the +# full GPL, but rather a notice and reference to +# /usr/share/common-licenses/GPL +# third-party-notices - (optional) third party license(s) + +program=`basename $0` +sep=" - - - - - " + +usage() +{ + rv=$1 + cat >&2 <<-EOF + usage: $program copyright preamble pkg-notice pkg-license upstream-notice upstream-license [third-party-notices...] + EOF + exit $rv +} + +checkfiles() { + for i in $*; do + if [ ! -f $i ]; then + echo "${program}: cannot find file: $i" + exit 1 + fi + done +} + +savefile() { + # save previous version + if [ -f $1 ]; then + mv $1 $1.1 + fi +} + +generate() { + rm -f $copyright + cat $pkg_preamble >> $copyright + echo " " >> $copyright + + echo "$sep copyright notice and license for Debian packaging $sep" >> $copyright + echo " " >> $copyright + cat $pkg_notice >> $copyright + echo " " >> $copyright + cat $pkg_license >> $copyright + echo " " >> $copyright + + echo "$sep copyright notice and license for upstream $sep" >> $copyright + echo " " >> $copyright + cat $upstream_notice >> $copyright + echo " " >> $copyright + cat $upstream_license >> $copyright + echo " " >> $copyright + + if [ "$#" -gt 0 ]; then + echo "$sep third party copyright notice(s) and license(s) $sep" >> $copyright + fi + + while [ "$#" -gt 0 ]; do + echo " " >> $copyright + cat $1 >> $copyright + echo " " >> $copyright + echo "$sep third party copyright notice(s) and license(s) $sep" >> $copyright + shift + done +} + +[ "$#" -ge 6 ] || usage 1 +copyright=$1 +shift +checkfiles $* +pkg_preamble=$1 +shift +pkg_notice=$1 +shift +pkg_license=$1 +shift +upstream_notice=$1 +shift +upstream_license=$1 +shift +# savefile $copyright +generate $* + --- add-apt-key-1.0.orig/debian/copyright-files/UPSTREAM_NOTICE +++ add-apt-key-1.0/debian/copyright-files/UPSTREAM_NOTICE @@ -0,0 +1 @@ +Copyright © 2007 Sun Microsystems, Inc. --- add-apt-key-1.0.orig/debian/copyright-files/PKG_PREAMBLE +++ add-apt-key-1.0/debian/copyright-files/PKG_PREAMBLE @@ -0,0 +1,8 @@ +This package was debianized by Tom Marble on +Thu, 1 Feb 2007 16:24:40 -0600 + +It was downloaded from https://add-apt-key.dev.java.net/ + +Upstream Author: Tom Marble + + --- add-apt-key-1.0.orig/debian/copyright-files/MIT_LICENSE +++ add-apt-key-1.0/debian/copyright-files/MIT_LICENSE @@ -0,0 +1,18 @@ +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- add-apt-key-1.0.orig/debian/copyright-files/PKG_NOTICE +++ add-apt-key-1.0/debian/copyright-files/PKG_NOTICE @@ -0,0 +1 @@ +Copyright © 2007 Sun Microsystems, Inc. --- add-apt-key-1.0.orig/debian/copyright-files/GPL_LICENSE +++ add-apt-key-1.0/debian/copyright-files/GPL_LICENSE @@ -0,0 +1,16 @@ + 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, or + (at your option) any later version. + + 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 GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'.