From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E21C9158019 for ; Sun, 3 Oct 2021 04:01:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A69F7E0871; Sun, 3 Oct 2021 04:01:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 89A65E0871 for ; Sun, 3 Oct 2021 04:01:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4534342B71 for ; Sun, 3 Oct 2021 04:01:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DD349134 for ; Sun, 3 Oct 2021 04:01:07 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1633233473.bd29656622f75011e723c71880ebba5844f7f518.vapier@gentoo> Subject: [gentoo-commits] proj/build-docbook-catalog:master commit in: / X-VCS-Repository: proj/build-docbook-catalog X-VCS-Files: Makefile README build-docbook-catalog X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: bd29656622f75011e723c71880ebba5844f7f518 X-VCS-Branch: master Date: Sun, 3 Oct 2021 04:01:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d5c8d4c9-261d-4fd1-889f-48d4a91b8235 X-Archives-Hash: 7d23918c91422c5f680d6717637a8b5c commit: bd29656622f75011e723c71880ebba5844f7f518 Author: Mike Frysinger gentoo org> AuthorDate: Sun Oct 3 03:57:53 2021 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sun Oct 3 03:57:53 2021 +0000 URL: https://gitweb.gentoo.org/proj/build-docbook-catalog.git/commit/?id=bd296566 update README & dist process Now that we're in git, we can simplify things a lot. Signed-off-by: Mike Frysinger gentoo.org> Makefile | 14 +++----------- README | 29 ++++------------------------- build-docbook-catalog | 9 ++------- 3 files changed, 9 insertions(+), 43 deletions(-) diff --git a/Makefile b/Makefile index b920de3..cb8634a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ -PN = build-docbook-catalog -PV = $(shell awk '/^\# .Header:/{print $$4;exit}' build-docbook-catalog) -P = $(PN)-$(PV) +# Copyright 2004-2021 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 all: @@ -14,11 +13,4 @@ install: install -d $(DESTDIR)$(SBINDIR) install -m 755 build-docbook-catalog $(DESTDIR)$(SBINDIR) -dist: - rm -rf $(P) - mkdir -p $(P) - cp -pPR build-docbook-catalog Makefile README $(P)/ - tar --posix --owner 0 --group 0 -cf - $(P) | xz -9 > $(P).tar.xz - rm -rf $(P) - -.PHONY: all clean dist install +.PHONY: all clean install diff --git a/README b/README index 8c3716d..8e1e345 100644 --- a/README +++ b/README @@ -1,31 +1,10 @@ -$Header: /usr/local/src/gentoo/gentoo-src/cvsroot/gentoo-src/build-docbook-catalog/README,v 1.2 2012/03/27 22:36:51 vapier Exp $ - This is the source for app-text/build-docbook-catalog, which is a script to regenerate the xml docbook catalog. You can find it here: - http://sources.gentoo.org/gentoo-src/build-docbook-catalog/ - -To make a release of this script, do the following: - -1. Commit your changes, create the tarball, and post it: - - make dist - cp build-docbook-catalog-*.tar.xz /usr/portage/distfiles/ - scp build-docbook-catalog-*.tar.xz dev.gentoo.org:/space/distfiles-local/ - -2. Make a new version of the build-docbook-catalog ebuild: - - ego build-docbook-catalog - cp $(ls -t1 *.ebuild | head -n 1) build-docbook-catalog-${rev}.ebuild - ekeyword ~all build-docbook-catalog-${rev}.ebuild - -3. Do the normal steps to generate a digest, mark the previous version - stable, use echangelog to add a ChangeLog entry, etc. + https://gitweb.gentoo.org/proj/build-docbook-catalog.git/ - cvs add build-docbook-catalog-${rev}.ebuild - ebuild build-docbook-catalog-${rev}.ebuild digest - echangelog - repoman commit -m "version bump to ${rev}" +To make a release of this script, create a new git tag. + git tag v2.0 -vim:sw=4 expandtab +We pull tarballs from the git site now. So update the ebuild like normal. diff --git a/build-docbook-catalog b/build-docbook-catalog index b420541..9064d72 100755 --- a/build-docbook-catalog +++ b/build-docbook-catalog @@ -1,13 +1,7 @@ #!/bin/bash -# $Header: /usr/local/src/gentoo/gentoo-src/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.21 2016/05/23 15:53:13 haubi Exp $ -# -# build-docbook-catalog: populate /etc/xml/docbook based in -# installed docbook-xml-dtd versions. -# -# Copyright 2004-2012 Gentoo Foundation +# Copyright 2004-2021 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # written by Aron Griffis -# EPREFIX= ROOTCONFDIR="${EPREFIX}"/etc/xml @@ -28,6 +22,7 @@ GETOPT=getopt usage() { cat <<-EOF Usage: ${ZERO} [options] + Regenerate the XML docbook catalog under ${ROOTCONFDIR}. Options: -r, --root ROOT path to work on