[med-svn] r20533 - trunk/packages/loki/trunk/debian

[Andreas Tille]

Author: tille
Date: 2015-11-24 18:51:24 +0000 (Tue, 24 Nov 2015)
New Revision: 20533

Modified:
   trunk/packages/loki/trunk/debian/changelog
   trunk/packages/loki/trunk/debian/copyright
   trunk/packages/loki/trunk/debian/rules
Log:
DEP5 fix and upload to unstable


Modified: trunk/packages/loki/trunk/debian/changelog
===================================================================
--- trunk/packages/loki/trunk/debian/changelog	2015-11-24 18:47:45 UTC (rev 20532)
+++ trunk/packages/loki/trunk/debian/changelog	2015-11-24 18:51:24 UTC (rev 20533)
@@ -1,10 +1,12 @@
-loki (2.4.7.4-6) UNRELEASED; urgency=medium
+loki (2.4.7.4-6) unstable; urgency=medium
 
   * cme fix dpkg-control
   * apply install target only for architecture dependent target
     Closes: #806070
+  * Add DEP3 header
+  * DEP5 fix
 
- -- Andreas Tille <tille at debian.org>  Tue, 24 Nov 2015 19:18:45 +0100
+ -- Andreas Tille <tille at debian.org>  Tue, 24 Nov 2015 19:34:27 +0100
 
 loki (2.4.7.4-5) unstable; urgency=low
 

Modified: trunk/packages/loki/trunk/debian/copyright
===================================================================
--- trunk/packages/loki/trunk/debian/copyright	2015-11-24 18:47:45 UTC (rev 20532)
+++ trunk/packages/loki/trunk/debian/copyright	2015-11-24 18:51:24 UTC (rev 20533)
@@ -6,14 +6,14 @@
 
 Files: *
 Copyright: 1997-2004 Simon C. Heath <heath at cng.fr>
-License: BSD
+License: BSD-2-clause
 
 Files: debian/*
 Copyright: 2003-2004 Carleos Artime <carleos at uniovi.es>
            2008-2012 Andreas Tille <tille at debian.org>
-License: BSD
+License: BSD-2-clause
 
-License: BSD
+License: BSD-2-clause
  Loki source is available under a modified version of the BSD license:
  .
  Redistribution and use in source and binary forms, with or without

Modified: trunk/packages/loki/trunk/debian/rules
===================================================================
--- trunk/packages/loki/trunk/debian/rules	2015-11-24 18:47:45 UTC (rev 20532)
+++ trunk/packages/loki/trunk/debian/rules	2015-11-24 18:51:24 UTC (rev 20533)
@@ -18,6 +18,12 @@
 %:
 	dh $@
 
+override_dh_auto_configure-arch:
+	dh_auto_configure -- --exec_prefix=$(CURDIR)/debian/loki/usr
+
+override_dh_auto_configure-indep:
+	# do nothing here
+
 override_dh_auto_install-arch:
 	dh_auto_install -a
 	make install prefix=$(CURDIR)/debian/loki/usr bindir=$(CURDIR)/debian/loki/usr/bin LDFLAGS="$(LDFLAGS)"