prepare a new keyring packageplatform-0.6

4 files changed, 41 insertions, 32 deletions

diff --git a/debian/changelog b/debian/changelog
index f11ac44..4360cc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+leap-keyring (2015.01.30) unstable; urgency=medium
+
+  * Update key expiration date +1y
+  * Remove duplicate Priority line in debian/control
+  * Add build-arch and build-indep empty targets to debian/rules
+  * Updated debian/license to be dep5 compliant
+  * Updated standards version: no changes
+  * Changed gzip to pass -n to aid in reproducibility
+  * Added md5sum and sha256sum control fields
+
+ -- Micah Anderson <micah@debian.org>  Fri, 30 Jan 2015 12:49:15 -0500
+
 leap-keyring (2014.02.07) unstable; urgency=medium
 
   * Update key expiration date +1y 
diff --git a/debian/control b/debian/control
index f25f05c..67d98c5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: leap-keyring
 Priority: important
 Section: misc
 Maintainer: Micah Anderson <micah@leap.se>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.6
 Uploaders: Micah Anderson <micah@debian.org>
 
 Package: leap-keyring
-Priority: important
 Architecture: all
 Depends: gnupg (>= 1.0.6-4)
 Description: GnuPG archive key of the leap.se repository
  The riseup repository digitally signs its Release files. This package
- contains the repository key used for that.
+ contains the repository key and will be automatically installed into
+ the apt-key list on the system when installed.
diff --git a/debian/copyright b/debian/copyright
index 6e52670..ca9a282 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,29 +1,22 @@
-This is leap.se's GnuPG keyrings of archive keys.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
-This package was originally put together by Michael Vogt
-<mvo@debian.org> for Debian and has been adapted to backports.org by 
-Alexander Wirt <formorer@debian.org> and for leap.se by
-Micah Anderson <micah@leap.se>
-
-The keys in the keyrings don't fall under any copyright.  Everything
-else in the package is covered by the GNU GPL 3+.
-
-Debian support files Copyright (C) 2006 Michael Vogt <mvo@debian.org> 
-based on the debian-keyring package maintained by James Troup 
-
-Debian support files for debian-archive-keyring are free software; you
-can redistribute them and/or modify them under the terms of the GNU
-General Public License as published by the Free Software Foundation;
-either version 2, or (at your option) any later version.
-
-Debian support files for debian-archive-keyring are distributed in the
-hope that they 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 with
-your Debian system, in /usr/share/common-licenses/GPL, or with the
-Debian GNU debian-archive-keyring source package as the file COPYING.
-If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-Fifth Floor, Boston, MA 02110-1301 USA.
+Files: *
+Copyright: 2006 Michael Vogt <mvo@debian.org>, 2013-2015 LEAP Encryption Access Project
+Comment: This is leap.se's GnuPG keyrings of archive keys. This package was originally put together by Michael Vogt <mvo@debian.org> based on the debian-keyring package maintained by James Troup. It was adapted to backports.org by Alexander Wirt <formorer@debian.org> and for leap.se by Micah Anderson <micah@leap.se>
+License: GPL-3+
+ 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 3 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General Public
+ License version 3 can be found in /usr/share/common-licenses/GPL-3.
 
diff --git a/debian/rules b/debian/rules
index c72965e..27d6c62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@ install_binary=install -m 755 -s
 VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
 
 build:
+build-arch: build
+build-indep: build
 
 clean:
 	$(checkdir)
@@ -29,9 +31,11 @@ binary-indep: checkroot
 	$(install_file) README debian/tmp/usr/share/doc/leap-keyring/
 	$(install_file) debian/changelog debian/tmp/usr/share/doc/leap-keyring/changelog
 	$(install_file) debian/copyright debian/tmp/usr/share/doc/leap-keyring/
-	gzip -9v debian/tmp/usr/share/doc/leap-keyring/changelog
-	gzip -9v debian/tmp/usr/share/doc/leap-keyring/README
+	gzip -9vn debian/tmp/usr/share/doc/leap-keyring/changelog
+	gzip -9vn debian/tmp/usr/share/doc/leap-keyring/README
 
+	cd debian/tmp && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums
+	cd debian/tmp && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | xargs -r0 sha256sum > DEBIAN/sha256sums
 	dpkg-gencontrol -pleap-keyring -isp
 	chown -R root.root debian/tmp
 	chmod -R go=rX debian/tmp