[r-cran-zelig] 38/102: Import Debian patch 2.7-4-2

[Andreas Tille]

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

tille pushed a commit to branch master
in repository r-cran-zelig.

commit 8e577fb7edfe115c28495d3a9844f5b933b2ed9a
Author: Chris Lawrence <lawrencc at debian.org>
Date:   Tue Nov 14 02:21:42 2006 -0600

    Import Debian patch 2.7-4-2
---
 debian/changelog |  7 +++++++
 debian/rules     | 26 +++++++-------------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3c1326..e0a2298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+zelig (2.7-4-2) unstable; urgency=low
+
+  * Add a clean step to rm the (empty!) src/ directory from upstream, so R
+    doesn't think the package is architecture-specific.
+
+ -- Chris Lawrence <lawrencc at debian.org>  Tue, 14 Nov 2006 02:21:42 -0600
+
 zelig (2.7-4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index 41e5f28..4c9e65d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,24 +3,12 @@
 # debian/rules file for the Debian/GNU Linux r-cran-car package
 # Copyright 2003 by Dirk Eddelbuettel <edd at debian.org>
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/langcore.mk
+include /usr/share/R/debian/r-cran.mk
 
-## We need the CRAN (upstream) name 
-cranName	:= $(shell grep Package: DESCRIPTION | cut -f2 -d" ")
-## and we need to build a Debian Policy-conformant lower-case package name
-cranNameLC	:= $(shell echo $(cranName) | tr "[A-Z]" "[a-z]" | tr "." "-" )
-## which we can use to build the package directory 
-package		:= r-cran-zelig
-## which we use for the to-be-installed-in directory
-debRlib		:= $(CURDIR)/debian/$(package)/usr/lib/R/site-library
+# Remove bogus src directory, which makes R think this is arch-specific
+# Note that this will break if src is ever populated again... which is fine!
+clean::
+	[ -d src ] && rmdir src || true
 
-DEB_INSTALL_CHANGELOGS_ALL := README
-
-common-install-indep:: R_any_arch
-common-install-arch:: R_any_arch
-
-R_any_arch:
-		dh_installdirs		usr/lib/R/site-library
-		R CMD INSTALL -l $(debRlib) --clean .
-		rm -vf $(debRlib)/R.css $(debRlib)/$(cranName)/COPYING
+common-binary-post-install-indep::
+	rm -vf debian/r-cran-zelig/usr/lib/R/site-library/Zelig/COPYING

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