[Pkg-e-commits] [SCM] Enlightenment 17 branch, master, updated. debian/0.16.999.050+svn20081207-1-3-g24c0092

[Albin Tonnerre]

The following commit has been merged in the master branch:
commit 24c00924730ae08a7a00efceb07cb9dc55f8ea7c
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date:   Fri Jan 2 18:47:01 2009 +0100

    And handle arch-dependant lintian override

diff --git a/debian/changelog b/debian/changelog
index 3bc68b1..38c966f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,9 +22,11 @@ e17 (0.16.999.050+svn20081207-1) experimental; urgency=low
   * lintian fixes:
     - add ${misc:Depends} to dependencies
     - remove e17-data.lintian-overrides, no longer needed
-    - Add overrides about setuid root programs to e17.lintian-overrides
+    - Add overrides about setuid root programs to e17.lintian-overrides.in
+  * As there is an arch-dependant lintian override, use an overrides.in and
+    handle that in debian/rules.
 
- -- Albin Tonnerre <albin.tonnerre at gmail.com>  Sat, 27 Dec 2008 14:30:42 +0100
+ -- Albin Tonnerre <albin.tonnerre at gmail.com>  Fri, 02 Jan 2009 18:46:31 +0100
 
 e17 (0.16.999.050-1) experimental; urgency=low
 
diff --git a/debian/e17.lintian-overrides b/debian/e17.lintian-overrides.in
similarity index 54%
rename from debian/e17.lintian-overrides
rename to debian/e17.lintian-overrides.in
index 4c77fde..760ff22 100644
--- a/debian/e17.lintian-overrides
+++ b/debian/e17.lintian-overrides.in
@@ -1,3 +1,3 @@
 e17: possible-gpl-code-linked-with-openssl
-e17: setuid-binary usr/lib/enlightenment/modules/cpufreq/linux-gnu-x86_64/freqset 4755 root/root
+e17: setuid-binary usr/lib/enlightenment/modules/cpufreq/ARCH_PATH/freqset 4755 root/root
 e17: setuid-binary usr/lib/enlightenment/enlightenment_sys 4755 root/root
diff --git a/debian/rules b/debian/rules
index 46c6f55..b885b44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,24 @@ include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+DEB_HOST_GNU_SYSTEM=$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+ARCH_PATH=$(DEB_HOST_GNU_SYSTEM)-$(DEB_HOST_GNU_CPU)
+
 install/e17-data::
 	gzip -9 debian/tmp/usr/share/enlightenment/doc/*.txt
 	rm debian/tmp/usr/share/enlightenment/COPYING
 
+install/e17::
+	sed "s/ARCH_PATH/$(ARCH_PATH)/" debian/e17.lintian-overrides.in > debian/e17.lintian-overrides
+
 binary-predeb/e17::
 	chmod 4755 debian/e17/usr/lib/enlightenment/enlightenment_sys
 	chmod 4755 debian/e17/usr/lib/enlightenment/modules/cpufreq/*/freqset
 
+clean/e17::
+	rm -f debian/e17.lintian-overrides
+
 DEB_INSTALL_MANPAGES_e17 := $(DEB_SRCDIR)/debian/enlightenment.1 $(DEB_SRCDIR)/debian/enlightenment_*.1
 DEB_DH_STRIP_ARGS := --dbg-package=e17-dbg
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath

-- 
Enlightenment 17