[debian-edu-commits] debian-edu/ 14/20: * debian/control: * bump standards version to 3.7.3, no changes needed * spell Debian Edu correctly * debian/rules: move code to check if keyrings exists to binary-arch-indep * debian/copyright: update pointer to /usr/share/common-licences/GPL-2

[Holger Levsen]

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

holger pushed a commit to branch master
in repository debian-edu-archive-keyring.

commit 15e9c6b65c1adb329a09dc6b5f00be51cdaa5329
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Feb 11 12:43:09 2008 +0000

     * debian/control:
       * bump standards version to 3.7.3, no changes needed
       * spell Debian Edu correctly
     * debian/rules: move code to check if keyrings exists to binary-arch-indep
     * debian/copyright: update pointer to /usr/share/common-licences/GPL-2
---
 debian/changelog | 10 ++++++++++
 debian/control   | 10 +++++-----
 debian/copyright |  2 +-
 debian/rules     |  9 +++------
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61c2770..8f2cb93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debian-edu-archive-keyring (2008.02.11) unstable; urgency=low
+
+  * debian/control:
+    * bump standards version to 3.7.3, no changes needed
+    * spell Debian Edu correctly
+  * debian/rules: move code to check if keyrings exists to binary-arch-indep
+  * debian/copyright: update pointer to /usr/share/common-licences/GPL-2
+
+ -- Holger Levsen <holger at debian.org>  Mon, 11 Feb 2008 13:34:19 +0100
+
 debian-edu-archive-keyring (2007.09.15) unstable; urgency=low
 
   [ Holger Levsen ]
diff --git a/debian/control b/debian/control
index 9cc69db..fe438bd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,20 +3,20 @@ Section: misc
 Priority: optional
 Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
 Uploaders: Holger Levsen <holger at debian.org>, Morten Werner Olsen <werner at debian.org>, Steffen Joeris <white at debian.org>, Martin Zobel-Helas <zobel at ftbfs.de>, Petter Reinholdtsen <pere at debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: debian-edu-archive-keyring
 Architecture: all
 Depends: gnupg
-Description: GnuPG archive keys of the Debian-Edu archive
- The Debian-Edu project digitally signs its Release files. This package
+Description: GnuPG archive keys of the Debian Edu archive
+ The Debian Edu project digitally signs its Release files. This package
  contains the archive keys used for that.
 
 Package: debian-edu-archive-keyring-udeb
 Architecture: all
 Section: debian-installer
 Recommends: gpgv-udeb
-Description: GnuPG keys of the Debian-Edu archive
- The Debian-Edu project digitally signs its Release files. This package
+Description: GnuPG keys of the Debian Edu archive
+ The Debian Edu project digitally signs its Release files. This package
  contains the archive keys used for that, in a minimal form for use
  in the installer.
diff --git a/debian/copyright b/debian/copyright
index 661e32e..ddd1212 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,7 +21,7 @@ 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
+your Debian system, in /usr/share/common-licenses/GPL-2, 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 St,
 Fifth Floor, Boston, MA  02110-1301  USA.
diff --git a/debian/rules b/debian/rules
index d47abea..58b452a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,9 @@ clean:
 	-rm -rf debian/tmp debian/debian-edu-archive-keyring-udeb
 
 binary-indep: checkroot
-	$(checkdir)
+	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/
@@ -61,11 +63,6 @@ binary-indep: checkroot
 
 binary-arch:
 
-define checkdir
-	test -f keyrings/debian-edu-archive-keyring.gpg
-	test -f keyrings/debian-edu-archive-removed-keys.gpg
-endef
-
 # Below here is fairly generic really
 
 binary:		binary-indep binary-arch

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