[med-svn] r22753 - trunk/packages/anfo/trunk/debian

[Andreas Tille]

Author: tille
Date: 2016-09-05 07:35:11 +0000 (Mon, 05 Sep 2016)
New Revision: 22753

Modified:
   trunk/packages/anfo/trunk/debian/README.Debian
   trunk/packages/anfo/trunk/debian/changelog
   trunk/packages/anfo/trunk/debian/copyright
   trunk/packages/anfo/trunk/debian/rules
Log:
DEP5, typos, install location


Modified: trunk/packages/anfo/trunk/debian/README.Debian
===================================================================
--- trunk/packages/anfo/trunk/debian/README.Debian	2016-09-05 06:36:33 UTC (rev 22752)
+++ trunk/packages/anfo/trunk/debian/README.Debian	2016-09-05 07:35:11 UTC (rev 22753)
@@ -15,7 +15,7 @@
    it is now effectively abandoned.  I believe it contains a few good
    ideas, but they will forever be locked in a tool of very little use.
    
-   That said, I'm flattered that you picked it up none the less, and I'll
+   That said, I'm flattered that you picked it up nonetheless, and I'll
    happily apply your patches once I get around to it.  Even if I don't use
    Anfo anymore, I still want it to compile.
    

Modified: trunk/packages/anfo/trunk/debian/changelog
===================================================================
--- trunk/packages/anfo/trunk/debian/changelog	2016-09-05 06:36:33 UTC (rev 22752)
+++ trunk/packages/anfo/trunk/debian/changelog	2016-09-05 07:35:11 UTC (rev 22753)
@@ -1,7 +1,9 @@
 anfo (0.98-5) UNRELEASED; urgency=medium
 
+  * Moved debian/upstream to debian/upstream/metadata
   * cme fix dpkg-control
   * versioned Build-Depends: d-shlibs (>= 0.77)
+  * DEP5 fixes
 
  -- Andreas Tille <tille at debian.org>  Mon, 05 Sep 2016 08:19:42 +0200
 

Modified: trunk/packages/anfo/trunk/debian/copyright
===================================================================
--- trunk/packages/anfo/trunk/debian/copyright	2016-09-05 06:36:33 UTC (rev 22752)
+++ trunk/packages/anfo/trunk/debian/copyright	2016-09-05 07:35:11 UTC (rev 22753)
@@ -5,13 +5,13 @@
 
 Files: *
 Copyright: © 2009 Udo Stenzel <udo_stenzel at eva.mpg.de>
-License: GPLv3+
+License: GPL-3+
 
-Files: src\fastlz.c src\fastlz.h
+Files: src/fastlz.c src/fastlz.h
 Copyright: © 2005-2007 Ariya Hidayat <ariya at kde.org>
 License: BSDlike
 
-Files: src\srfi-88.scm src\srfi-89.scm
+Files: src/srfi-88.scm src/srfi-89.scm
 Copyright: © 2006 Marc Feeley
 License: BSDlike
 Comment:  These files were copied nearly verbatim from
@@ -20,9 +20,9 @@
 Files: debian/*
 Copyright: © 2011 Tim Booth <tbooth at ceh.ac.uk>
            © 2013 Andreas Tille <tille at debian.org>
-License: GPLv3+
+License: GPL-3+
 
-License: GPLv3+
+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

Modified: trunk/packages/anfo/trunk/debian/rules
===================================================================
--- trunk/packages/anfo/trunk/debian/rules	2016-09-05 06:36:33 UTC (rev 22752)
+++ trunk/packages/anfo/trunk/debian/rules	2016-09-05 07:35:11 UTC (rev 22753)
@@ -4,6 +4,10 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
+DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
 	dh  $@ --with autoreconf
 
@@ -14,6 +18,7 @@
 		    --movedev debian/tmp/usr/include/* usr/include \
 		    debian/tmp/usr/lib/*/libanfo.so
 	dh_install
+	mv debian/$(DEBPKGNAME)/usr/lib/* debian/$(DEBPKGNAME)/usr/lib/$(DEBPKGNAME)
 
 override_dh_installman:
 	dh_installman
@@ -21,6 +26,6 @@
 	find debian/anfo -name anfo-sge.1 -delete
 
 # ./scm files should not be executable
-override_dh_fixperms :
+override_dh_fixperms:
 	dh_fixperms
 	find debian/anfo -perm -5 -type f \( -name '*.scm' \)  -print0 2>/dev/null | xargs -0r chmod 644