[r-cran-highr] 03/03: guess i'm lost for now...

[Joost van Baal]

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

joostvb pushed a commit to branch master
in repository r-cran-highr.

commit e47eed2c540e52ce996a446a5948fec0a8ea19e9
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date:   Wed Jan 13 11:55:34 2016 +0100

    guess i'm lost for now...
---
 debian/control |  2 +-
 debian/rules   | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index a716c8c..8f6b860 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Git: git://anonscm.debian.org/debian-science/packages/r-cran-highr.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/r-cran-highr.git
 
 Package: r-cran-highr
-Architecture: all
+Architecture: any
 Depends: ${R:Depends}, ${misc:Depends}
 Description: Syntax Highlighting for R Source Code
  The GNU R package highr provides syntax highlighting for R source code; it
diff --git a/debian/rules b/debian/rules
index 525a2a1..cc49a73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 # Use hardening flags for linking
 include /usr/share/dpkg/buildflags.mk
@@ -9,11 +9,16 @@ makeFlags="LDFLAGS=$(LDFLAGS)"
 
 include /usr/share/R/debian/r-cran.mk
 
+#common-install::
+
 common-install-arch::
+	echo DEBUG rm -vf $(debRlib)/$(cranNameOrig)/NEWS
 	rm -vf $(debRlib)/$(cranNameOrig)/NEWS
 	# sed -i 's/#include "yaml.h"/#include <yaml.h>/' src/r-ext.h
 	# FIXME no match?
-	grep -v --fixed-strings -e '<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>' -e '<script src="http://yihui.name/knitr/js/docco-resize.js"></script>' $(debRlib)/$(cranNameOrig)/doc/highr-internals.html > $(debRlib)/$(cranNameOrig)/doc/highr-internals.html,
+	# grep -v --fixed-strings -e '  <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>' -e '  <script src="http://yihui.name/knitr/js/docco-resize.js"></script>' $(debRlib)/$(cranNameOrig)/doc/highr-internals.html > $(debRlib)/$(cranNameOrig)/doc/highr-internals.html,
+	# grep -v --fixed-strings -e '  <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>' $(debRlib)/$(cranNameOrig)/doc/highr-internals.html >$(debRlib)/$(cranNameOrig)/doc/highr-internals.html,
+	grep -v --fixed-strings -e '  <script src=\"https://code.jquery.com/jquery-2.1.1.min.js\"></script>' $(debRlib)/$(cranNameOrig)/doc/highr-internals.html >$(debRlib)/$(cranNameOrig)/doc/highr-internals.html,
 	mv $(debRlib)/$(cranNameOrig)/doc/highr-internals.html, $(debRlib)/$(cranNameOrig)/doc/highr-internals.html
 
 # --line-regexp
@@ -22,5 +27,3 @@ common-install-arch::
 #    inst/doc/highr-custom.html , highr-internals.html :
 #     <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
 #     <script src="http://yihui.name/knitr/js/docco-resize.js"></script>
-
-

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