Merge lp:~kentb/ubuntu/trusty/wsmancli/cleanup-for-1262290 into lp:ubuntu/trusty/wsmancli

[Kent Baxley]

Adding cleanup for wsmancli per Main Inclusion Request process.

[Dmitry Shachnev (mitya57)]

Thanks for your work here. The bug should not be closed until the package is actually promoted to main, so I modified the changelog to not close the bug. Otherwise, looks fine, uploading.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-25 16:21:17 +0000
+++ debian/changelog	2014-01-08 18:00:22 +0000
@@ -1,3 +1,10 @@
+wsmancli (2.3.0-0ubuntu2) trusty; urgency=low
+
+  * debian/copyright: cleanup copyright file. 
+  * debian/rules: add hardening flags to satisfy inclusion in main (LP: #1262290)
+
+ -- Kent Baxley <[e-mail]>  Wed, 08 Jan 2014 11:55:27 -0600
+
 wsmancli (2.3.0-0ubuntu1) trusty; urgency=low
 
   [ Kent Baxley ]

=== modified file 'debian/copyright'
--- debian/copyright	2013-03-25 16:21:17 +0000
+++ debian/copyright	2014-01-08 18:00:22 +0000
@@ -3,10 +3,8 @@
 Source: http://sourceforge.net/projects/openwsman/
 
 Files: *
-Copyright: 2004-2006 Anas Nashif <[e-mail]>
-           2004-2006 Vadim Revyakin <[e-mail]>
-           2004-2006 Denis Sadykov <[e-mail]>
-License: Copyright (C) 2004-2006 Intel Corp. All rights reserved.
+Copyright: Copyright (C) 2004-2006 Intel Corp. All rights reserved. 
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
    - Redistributions of source code must retain the above copyright notice,

=== modified file 'debian/rules'
--- debian/rules	2013-03-25 16:21:17 +0000
+++ debian/rules	2014-01-08 18:00:22 +0000
@@ -8,6 +8,9 @@
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+DPKG_EXPORT_BUILDFLAGS=1
+include /usr/share/dpkg/buildflags.mk
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-more-warnings