[qrouter] 01/01: Fixed d/copyright formatting and cleaned up rules a bit

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository qrouter.

commit 7372c6f14a67bf1bd2cbfa265ec7bb19554272ba
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Mon Feb 23 07:59:11 2015 +0100

    Fixed d/copyright formatting and cleaned up rules a bit
---
 debian/changelog |  4 +++-
 debian/copyright | 26 ++++++++++++++++++++------
 debian/rules     |  5 ++---
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af3a4c3..a238cde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,9 @@ qrouter (1.3.7-1) experimental; urgency=low
       cleanly even without manually cleaning the environment first.
   * Ran "cme fix dpkg-control" to fix formatting of d/control
   * Added d/gbp.conf to always use pristine-tar
-  * Some new years in d/copyright
+  * d/copyright:
+    - Some new years and an extra email address added
+    - Moved license descriptions to the end of the file
 
  -- Ruben Undheim <ruben.undheim at gmail.com>  Fri, 20 Feb 2015 18:37:06 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 387dd70..25fc326 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,23 @@ Files: *
 Copyright: 2003 Steve Beccue
            2011-2014 Tim Edwards <tim at opencircuitdesign.com>
 License: GPL-2
+
+Files: tkcon.tcl
+Copyright: 1995-2001 Jeffrey Hobbs <jeff.hobbs at acm.org, jeff at hobbs.org>
+License: tkcon_license
+
+Files: install-sh
+Copyright: 1991 Massachusetts Institute of Technology
+License: MIT
+
+Files: debian/*
+Copyright: 2014-2015 Ruben Undheim <ruben.undheim at gmail.com>
+License: GPL-2+
+
+
+
+
+License: GPL-2
  This package 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; version 2
@@ -21,8 +38,7 @@ License: GPL-2
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-Files: tkcon.tcl
-Copyright: 1995-2001 Jeffrey Hobbs <jeff at hobbs.org>
+
 License: tkcon_license
  This software is copyrighted by Jeffrey Hobbs <jeff.hobbs at acm.org>.  The
  following terms apply to all files associated with the software unless
@@ -60,8 +76,7 @@ License: tkcon_license
   itself.  The user may feel exempt from this clause if they are below
   drinking age or think the author has already partaken of too many drinks.
 
-Files: install-sh
-Copyright: 1991 Massachusetts Institute of Technology
+
 License: MIT
  Permission to use, copy, modify, distribute, and sell this software and its
  documentation for any purpose is hereby granted without fee, provided that
@@ -73,8 +88,7 @@ License: MIT
  suitability of this software for any purpose.  It is provided "as is"
  without express or implied warranty.
 
-Files: debian/*
-Copyright: 2014-2015 Ruben Undheim <ruben.undheim at gmail.com>
+
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/rules b/debian/rules
index 682bd08..2c30f90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # The build script crashes if "-pie" is given to the build command. Therefore
 # enabling the missing hardening options with LDFLAGS_MAINT_APPEND (together
-# with the --as-needed option):
+# with the --as-needed option) instead of with
+# "DEB_BUILD_MAINT_OPTIONS = hardening=+all":
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,now -Wl,--as-needed
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@ --with autotools_dev

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qrouter.git