Merge remote-tracking branch 'origin/new/bug_8233'

diff --combined debian/rules
index cb0bc4f,f063be5..cb2eee3
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -20,6 -20,9 +20,9 @@@ override_dh_auto_install
        rm -r $(TMP)/var/run
        rm -r $(TMP)/var/lock
        rm $(TMP)/var/log/koha/README
+       rm $(TMP)/etc/koha/searchengine/solr/config.yaml
+       rm $(TMP)/etc/koha/searchengine/solr/indexes.yaml
+       rm $(TMP)/etc/koha/solr/indexes.yaml
  #     rm $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/lib/jquery/jquery.js
  #     ln -s /usr/share/javascript/jquery/jquery.js \
  #        $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/lib/jquery/jquery.js
@@@ -28,17 -31,16 +31,17 @@@
  #        $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/lib/jquery/jquery.js
        rm -r \
                $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/js/tinymce
 +              mkdir -p $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/js/tinymce/jscripts
        ln -s /usr/share/tinymce2/www \
 -              $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/js/tinymce
 +              $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/js/tinymce/jscripts/tiny_mce
        rm -r \
                $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/lib/yui
        ln -s /usr/share/javascript/yui \
                $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/lib/yui
        rm -r \
 -              $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/lib/yui
 +              $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/lib/yui
        ln -s /usr/share/javascript/yui \
 -              $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/lib/yui
 +         $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/lib/yui
        install -d $(TMP)/etc/apache2/sites-available
        install -d $(TMP)/etc/apache2/sites-enabled
        install -d $(TMP)/etc/apache2/conf.d
@@@ -51,11 -53,11 +54,11 @@@
        sed -i $(TMP)/usr/share/koha/koha-conf.xml.in \
                -e '/^ <user>/s/>.*</>_DBC_DBUSER_</' \
                -e '/^ <pass>/s/>.*</>_DBC_DBPASS_</'
 -      install -m 0644 koha-tmpl/opac-tmpl/prog/en/lib/yui/skin.css \
 -              koha-tmpl/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css \
 +      install -m 0644 koha-tmpl/opac-tmpl/lib/yui/skin.css \
 +         koha-tmpl/opac-tmpl/lib/yui/reset-fonts-grids.css \
                $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
 -      install -m 0644 koha-tmpl/opac-tmpl/prog/en/lib/yui/skin.css \
 -              koha-tmpl/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css \
 +      install -m 0644 koha-tmpl/opac-tmpl/lib/yui/skin.css \
 +         koha-tmpl/opac-tmpl/lib/yui/reset-fonts-grids.css \
                $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
        install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png \
                $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css