[debian-edu-commits] debian-edu/ 01/01: Switch to dh9 style and upload to unstable.

Holger Levsen holger at moszumanska.debian.org
Mon Oct 13 18:33:12 UTC 2014 

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to annotated tag 2014.10.13
in repository debian-edu-archive-keyring.

commit f01b6de085e07b1dbcf67171b030ca3098e971fe
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Oct 13 20:15:21 2014 +0200

    Switch to dh9 style and upload to unstable.
    
    * debian/control:
      - Bump to standards version 3.9.6, no changes _needed_.
      - Add debian/compat file (!) and set it to 9.
      - Add versioned build-dependency on debhelper >= 9.
      - Thus add ${misc:Depends} to binary packages depends.
      - Use https for Alioth cgit URL.
    * debian/rules: switch to dh9 style.
    * debian/postinst: add ##DEBHELPER## token.
    * debian/docs: add this file and include the README in it.
    * debian/install: add this file and include the keyrings in it.
---
 debian/changelog | 15 +++++++++++
 debian/compat    |  1 +
 debian/control   | 10 ++++---
 debian/docs      |  1 +
 debian/install   |  2 ++
 debian/postinst  |  2 ++
 debian/rules     | 80 +++-----------------------------------------------------
 7 files changed, 31 insertions(+), 80 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 190edbf..b8379b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+debian-edu-archive-keyring (2014.10.13) unstable; urgency=medium
+
+  * debian/control:
+    - Bump to standards version 3.9.6, no changes _needed_.
+    - Add debian/compat file (!) and set it to 9.
+    - Add versioned build-dependency on debhelper >= 9.
+    - Thus add ${misc:Depends} to binary packages depends.
+    - Use https for Alioth cgit URL.
+  * debian/rules: switch to dh9 style.
+  * debian/postinst: add ##DEBHELPER## token.
+  * debian/docs: add this file and include the README in it.
+  * debian/install: add this file and include the keyrings in it.
+
+ -- Holger Levsen <holger at debian.org>  Mon, 13 Oct 2014 20:29:32 +0200
+
 debian-edu-archive-keyring (2014.02.27) unstable; urgency=low
 
   [ Holger Levsen ]
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
index 9d5f323..9312fee 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,16 @@ Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
 Uploaders: Holger Levsen <holger at debian.org>,
  Petter Reinholdtsen <pere at debian.org>,
  Mike Gabriel <sunweaver at debian.org>,
-Standards-Version: 3.9.5
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-edu/debian-edu-archive-keyring.git;a=summary
+Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 9)
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-edu/debian-edu-archive-keyring.git
 Vcs-Git: git://anonscm.debian.org/debian-edu/debian-edu-archive-keyring.git
 
 Package: debian-edu-archive-keyring
 Architecture: all
-Depends: gnupg, apt
+Depends: ${misc:Depends},
+ gnupg,
+ apt
 Description: GnuPG archive keys of the Debian Edu archive
  The Debian Edu project digitally signs its archive's Release files.
  .
@@ -24,6 +27,7 @@ Description: GnuPG archive keys of the Debian Edu archive
 Package: debian-edu-archive-keyring-udeb
 Architecture: all
 Section: debian-installer
+Depends: ${misc:Depends}
 Recommends: gpgv-udeb
 Description: GnuPG keys of the Debian Edu archive
  The Debian Edu project digitally signs its Release files.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..5972541
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,2 @@
+keyrings/debian-edu-archive-keyring.gpg /usr/share/keyrings/
+keyrings/debian-edu-archive-removed-keys.gpg /usr/share/keyrings/
diff --git a/debian/postinst b/debian/postinst
index 1fad8f1..6c7105d 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -6,3 +6,5 @@ if [ -x /usr/bin/apt-key ]; then
     # "apt-key update" only uses /usr/share/keyrings/debian-archive-*.gpg, so we use "apt-key add"
     apt-key add /usr/share/keyrings/debian-edu-archive-keyring.gpg
 fi
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index eb8a429..c79b15b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,80 +1,6 @@
 #!/usr/bin/make -f
-# debian/rules file - for debian/keyring
-# Based on sample debian/rules file - for GNU Hello (1.3).
-# Copyright 1994,1995 by Ian Jackson.
-# Copyright 1998-2003 James Troup
-# I hereby give you perpetual unlimited permission to copy,
-# modify and relicense this file, provided that you do not remove
-# my name from the file itself.  (I assert my moral right of
-# paternity under the Copyright, Designs and Patents Act 1988.)
-# This file may have to be extensively modified
-
-install_dir=install -d -m 755
-install_file=install -m 644
-install_script=install -m 755
-install_binary=install -m 755 -s
-
-VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-
-clean:
-	$(checkdir)
-	rm -f *.bak *~ */*~ debian/files* debian/*substvars
-	rm -rf debian/tmp debian/debian-edu-archive-keyring-udeb
-
-binary-indep: checkroot
-	test -f keyrings/debian-edu-archive-keyring.gpg
-	test -f keyrings/debian-edu-archive-removed-keys.gpg
-
-	rm -rf debian/tmp
-	$(install_dir) debian/tmp/DEBIAN/
-	$(install_script) debian/postinst debian/tmp/DEBIAN/
-
-	$(install_dir) debian/tmp/usr/share/keyrings/
-	$(install_file) keyrings/debian-edu-archive-keyring.gpg debian/tmp/usr/share/keyrings/
-	$(install_file) keyrings/debian-edu-archive-removed-keys.gpg debian/tmp/usr/share/keyrings/
-
-	$(install_dir) debian/tmp/usr/share/doc/debian-edu-archive-keyring/
-	$(install_file) README debian/tmp/usr/share/doc/debian-edu-archive-keyring/
-	$(install_file) debian/changelog debian/tmp/usr/share/doc/debian-edu-archive-keyring/changelog
-	gzip -9v debian/tmp/usr/share/doc/debian-edu-archive-keyring/*
-	$(install_file) debian/copyright debian/tmp/usr/share/doc/debian-edu-archive-keyring/
-
-	cd debian/tmp && find -type f | egrep -v "^./DEBIAN/.*" | LC_ALL=C sort -z | while read file; do md5sum "$$file" | sed 's@ ./@ @'; done 1> DEBIAN/md5sums; cd - 1>/dev/null
-
-	dpkg-gencontrol -pdebian-edu-archive-keyring -isp
-	chown -R root.root debian/tmp
-	chmod -R go=rX debian/tmp
-	dpkg --build debian/tmp ..
-
-	rm -rf debian/debian-edu-archive-keyring-udeb
-	$(install_dir) debian/debian-edu-archive-keyring-udeb/DEBIAN/
-
-	$(install_dir) debian/debian-edu-archive-keyring-udeb/usr/share/keyrings/
-	$(install_file) keyrings/debian-edu-archive-keyring.gpg debian/debian-edu-archive-keyring-udeb/usr/share/keyrings/
-	$(install_file) keyrings/debian-edu-archive-removed-keys.gpg debian/debian-edu-archive-keyring-udeb/usr/share/keyrings/
-
-	# Don't let dpkg-gencontrol write incorrect guesses to debian/files.
-	# Instead, register the udeb manually.
-	dpkg-gencontrol -pdebian-edu-archive-keyring-udeb -Tdebian/debian-edu-archive-keyring-udeb.substvars -Pdebian/debian-edu-archive-keyring-udeb -isp -fdebian/files~
-	dpkg-distaddfile debian-edu-archive-keyring-udeb_$(VERSION)_all.udeb debian-installer optional
-	chown -R root.root debian/debian-edu-archive-keyring-udeb
-	chmod -R go=rX debian/debian-edu-archive-keyring-udeb
-
-	dpkg --build debian/debian-edu-archive-keyring-udeb ../debian-edu-archive-keyring-udeb_$(VERSION)_all.udeb
-
-binary-arch:
-
-# Below here is fairly generic really
-
-binary:		binary-indep binary-arch
+#!/usr/bin/make -f
 
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
+%:
+	dh $@
 
-.PHONY: build build-arch build-indep binary binary-arch binary-indep clean checkroot

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-archive-keyring.git

More information about the debian-edu-commits mailing list