From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1NJrox-000102-L1 for garchives@archives.gentoo.org; Sun, 13 Dec 2009 17:01:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7448E05F1; Sun, 13 Dec 2009 17:01:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A63ACE05F1 for ; Sun, 13 Dec 2009 17:01:21 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 4E7A167613 for ; Sun, 13 Dec 2009 17:01:21 +0000 (UTC) Received: from ikelos by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NJrou-0005cx-O3 for gentoo-commits@lists.gentoo.org; Sun, 13 Dec 2009 17:01:20 +0000 From: "Mike Auty (ikelos)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ikelos@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-util/bless/files: bless-0.6.0-docpath.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: bless-0.6.0-docpath.patch X-VCS-Directories: dev-util/bless/files X-VCS-Committer: ikelos X-VCS-Committer-Name: Mike Auty Content-Type: text/plain; charset=utf8 Message-Id: Sender: Mike Auty Date: Sun, 13 Dec 2009 17:01:20 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 698e631a-7262-48f8-bafd-8492d516f4e4 X-Archives-Hash: e527b6b8da336328fd1fecb2e836a9a4 ikelos 09/12/13 17:01:20 Modified: bless-0.6.0-docpath.patch Log: Fix up doc install issue (bug 296669). (Portage version: 2.2_rc56/cvs/Linux i686) Revision Changes Path 1.2 dev-util/bless/files/bless-0.6.0-docpath.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/bless/fil= es/bless-0.6.0-docpath.patch?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/bless/fil= es/bless-0.6.0-docpath.patch?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/bless/fil= es/bless-0.6.0-docpath.patch?r1=3D1.1&r2=3D1.2 Index: bless-0.6.0-docpath.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-util/bless/files/bless-0.6.0-docpat= h.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bless-0.6.0-docpath.patch 13 Dec 2009 14:07:47 -0000 1.1 +++ bless-0.6.0-docpath.patch 13 Dec 2009 17:01:20 -0000 1.2 @@ -1,103 +1,71 @@ diff --git a/Makefile.am b/Makefile.am -index 33f265b..23fcb0e 100644 +index 33f265b..346326d 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -35,10 +35,10 @@ dist-hook: +@@ -1,6 +1,9 @@ + EXTRA_DIST =3D AUTHORS COPYING NEWS README README.packaging \ + bless.mdp bless.mds bless.spec autogen.sh bless.mi +=20 ++doc_DATA =3D AUTHORS COPYING INSTALL ChangeLog NEWS \ ++ README README.packaging bless.spec ++ + SUBDIRS =3D po builder src bin data doc . tests +=20 + DIST_SUBDIRS=3D po builder src bin doc data tests +@@ -34,11 +37,5 @@ bless-builder: + dist-hook: bzr log > $(distdir)/ChangeLog =20 - install-data-local: +-install-data-local: - $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME) -+ $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSI= ON) - $(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS \ - README README.packaging bless.spec \ +- $(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS \ +- README README.packaging bless.spec \ - $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME) -+ $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) -=20 +- uninstall-local: rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME) -diff --git a/data/Makefile.am b/data/Makefile.am -index 13ea7ed..207c17a 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -12,7 +12,7 @@ PWD=3D$(shell pwd) - help_script.sh: help_script.tmpl - sed -e 's,@blessdocdir\@,$(PWD)/../doc,g' help_script.tmpl > help_scri= pt.sh - chmod +x help_script.sh -- sed -e 's,@blessdocdir\@,$(datadir)/doc/$(PACKAGE_NAME),g' help_script= .tmpl > help_script.sh.install -+ sed -e 's,@blessdocdir\@,$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERS= ION),g' help_script.tmpl > help_script.sh.install -=20 - install-data-local: - $(INSTALL) -d $(DESTDIR)$(datadir)/$(PACKAGE_NAME) diff --git a/doc/Makefile.am b/doc/Makefile.am -index b18e94a..c0e700d 100644 +index b18e94a..d7eecc6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am -@@ -1,4 +1,4 @@ +@@ -1,4 +1 @@ SUBDIRS=3D developer user -=20 - uninstall-local: +- +-uninstall-local: - rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME) -+ rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) -diff --git a/doc/developer/Makefile.am b/doc/developer/Makefile.am -index 65911f8..c13f216 100644 ---- a/doc/developer/Makefile.am -+++ b/doc/developer/Makefile.am -@@ -4,8 +4,8 @@ DOCS=3D$(srcdir)/en/*.xml \ - EXTRA_DIST=3D$(DOCS) bless-docs.source -=20 - #install-data-local:=20 --# $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/developer --# $(INSTALL_DATA) $(MD_FILES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/= developer -+# $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERS= ION)/developer -+# $(INSTALL_DATA) $(MD_FILES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-= $(PACKAGE_VERSION)/developer -=20 - #uninstall-local: --# rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/developer -+# rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/de= veloper diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am -index 729b295..b1d371d 100644 +index 729b295..58a1358 100644 --- a/doc/user/Makefile.am +++ b/doc/user/Makefile.am -@@ -10,7 +10,7 @@ noinst_SCRIPTS=3D$(OMF) +@@ -7,6 +7,11 @@ CLEANFILES=3D$(OMF) +=20 + noinst_SCRIPTS=3D$(OMF) +=20 ++docmandir=3D$(docdir)/user ++docfigsdir=3D$(docmandir)/figures ++ ++docfigs_DATA=3D$(FIGURES) ++docman_DATA=3D$(DOCS) $(wildcard *.html) =20 $(OMF): $(OMF).in if [ -x `which scrollkeeper-preinstall` ]; then \ -- scrollkeeper-preinstall file:$(datadir)/doc/$(PACKAGE_NAME)/user/b= less-manual.xml $(OMF).in $(OMF); \ -+ scrollkeeper-preinstall file:$(datadir)/doc/$(PACKAGE_NAME)-$(PACK= AGE_VERSION)/user/bless-manual.xml $(OMF).in $(OMF); \ - else \ - cp $(OMF).in $(OMF); \ - fi -@@ -27,22 +27,22 @@ dist-hook: doc +@@ -27,11 +32,6 @@ dist-hook: doc rm html_file_list =20 install-data-local: - $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user - $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures -+ $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSI= ON)/user -+ $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSI= ON)/user/figures - $(INSTALL_DATA) $(DOCS) $(wildcard *.html) \ +- $(INSTALL_DATA) $(DOCS) $(wildcard *.html) \ - $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user - $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/us= er/figures -- $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) -- $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) -+ $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user -+ $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(= PACKAGE_VERSION)/user/figures -+ $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSI= ON) -+ $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACK= AGE_VERSION) + $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) + $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) if WITH_SCROLLKEEPER -- scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) -+ scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACK= AGE_VERSION) +@@ -39,7 +39,6 @@ if WITH_SCROLLKEEPER endif =20 uninstall-local: - rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user -- rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)/$(OMF) -+ rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/use= r -+ rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(OMF) + rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)/$(OMF) if WITH_SCROLLKEEPER -- scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) -+ scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACK= AGE_VERSION) - endif -- rm -rf $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) -+ rm -rf $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION) -=20 + scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)