[SCM] herwig++: Multi-purpose event generator for high energy physics branch, master, updated. upstream/2.6.0-11-g0814b3e

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 0814b3e4d0cc908369d26fd61afb595d0a8eae99
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Mon Jun 25 19:35:36 2012 +0800

    Move HerwigDefaults.rpo from herwig++-data to herwig++.
    
    The file is arch-dep.

diff --git a/debian/herwig++.install b/debian/herwig++.install
index cf662ee..2b6a244 100644
--- a/debian/herwig++.install
+++ b/debian/herwig++.install
@@ -1,2 +1,3 @@
 usr/bin/Herwig++
 usr/lib/*/Herwig++/*.so*
+usr/lib/*/Herwig++/HerwigDefaults.rpo
diff --git a/debian/patches/herwig-repo-dir.patch b/debian/patches/herwig-repo-dir.patch
new file mode 100644
index 0000000..76deb00
--- /dev/null
+++ b/debian/patches/herwig-repo-dir.patch
@@ -0,0 +1,26 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,7 +10,7 @@
+ Herwig___LDFLAGS = $(AM_LDFLAGS) -export-dynamic $(THEPEGLDFLAGS)
+ Herwig___LDADD = $(THEPEGLIB) -ldl
+ Herwig___CPPFLAGS = $(AM_CPPFLAGS) \
+--DHERWIG_PKGDATADIR="\"$(pkgdatadir)\"" \
++-DHERWIG_PKGREPODIR="\"$(pkglibdir)\"" \
+ -DHERWIG_PKGLIBDIR="\"$(pkglibdir)\"" \
+ -DTHEPEG_PKGLIBDIR="\"$(THEPEGPATH)/lib/$(DEB_HOST_MULTIARCH)/ThePEG\""
+ bin_SCRIPTS = herwig-config
+--- a/src/Herwig++.cc
++++ b/src/Herwig++.cc
+@@ -186,10 +186,10 @@
+ 
+ 
+ void HerwigRead(string reponame, string runname) {
+-#ifdef HERWIG_PKGDATADIR
++#ifdef HERWIG_PKGREPODIR
+   ifstream test(reponame.c_str());
+   if ( !test ) {
+-    reponame = string(HERWIG_PKGDATADIR) + '/' + reponame;
++    reponame = string(HERWIG_PKGREPODIR) + '/' + reponame;
+   }
+   test.close();
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 21f5402..91d0cf1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 thepeg-lib-path.patch
 siscone.patch
+herwig-repo-dir.patch
diff --git a/debian/rules b/debian/rules
index b95db49..fe449c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,8 @@ override_dh_auto_install:
 	sed -i -e 's,/.*debian/tmp,,' \
 	    debian/tmp/usr/share/Herwig++/HerwigDefaults.rpo \
 	    debian/tmp/usr/share/Herwig++/defaults/PDF.in
+	mv debian/tmp/usr/share/Herwig++/HerwigDefaults.rpo \
+	    debian/tmp/$(LIBPATH)/Herwig++/
 
 override_dh_makeshlibs:
 	dh_makeshlibs -n

-- 
herwig++: Multi-purpose event generator for high energy physics