From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stephen Leake Newsgroups: gmane.emacs.devel Subject: Re: ELPA ada-mode.release not updating Date: Wed, 26 Oct 2022 06:50:08 -0700 Message-ID: <86tu3qsnhr.fsf@stephe-leake.org> References: <86h6ztk0yt.fsf@stephe-leake.org> <86k04oiq5x.fsf@stephe-leake.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13681"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-devel To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Oct 26 15:52:49 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ongps-0003L7-FY for ged-emacs-devel@m.gmane-mx.org; Wed, 26 Oct 2022 15:52:48 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ongnh-0004YB-0O; Wed, 26 Oct 2022 09:50:33 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ongna-0003gh-Hw for emacs-devel@gnu.org; Wed, 26 Oct 2022 09:50:29 -0400 Original-Received: from gproxy3-pub.mail.unifiedlayer.com ([69.89.30.42]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ongnX-0002lI-Oy for emacs-devel@gnu.org; Wed, 26 Oct 2022 09:50:26 -0400 Original-Received: from cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway5.mail.pro1.eigbox.com (Postfix) with ESMTP id 18A211004560A for ; Wed, 26 Oct 2022 13:50:09 +0000 (UTC) Original-Received: from host2007.hostmonster.com ([67.20.76.71]) by cmsmtp with ESMTP id ngnIogp1qBj1kngnIoyKMI; Wed, 26 Oct 2022 13:50:09 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=cfMXElPM c=1 sm=1 tr=0 ts=63593b11 a=dWLzHQi6WpdymmZIwiVdBw==:117 a=Fln8i1WyhtedwaIJAdHvmw==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=Qawa6l4ZSaYA:10:nop_rcvd_month_year a=vvvmwbhNdt4A:10:endurance_base64_authed_username_1 a=iRZporoAAAAA:8 a=HlNqQn-_ZHUZ-C7qWPMA:9 a=6ObDuVBMAAAA:8 a=DD52fyvpOWy7haSAtJUA:9 a=mDV3o1hIAAAA:8 a=m9kQAXG1_aQ8J0YvTO0A:9 a=NOBgFS-JBQ2l-kSd6-zu:22 a=KBo1W70vtLQP-W5P4i9P:22 a=_FVE-zBwftR9WsbkzFJk:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=stephe-leake.org; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=cy4tiEq3M0+bGp8gu4QbnG/AbZO8ZTa/b5vjRMbyKK4=; b=An3neYNpMeHzhg+0USlxPOgeWG xlUT0v9Eq79czje/zcD0Nu96yM/g+DUmq2OjCRuREUJaUNHWzY+3bRoHvS6M1OFu55XZSWpprQFFU eyKvkI4/nQ447DubLqNSbmFteC4G6kZ/wYUc+niMfcytICFHgJi9LSZT/jnBwKmG/YKglQz9coeSL s/pYoQkDhx3DZaDNYMny9dV4WS0B6ypwQNUDGJwP4yo2p3P8wk2UaxZduaOA9UHp4KNefLA3LYdzl 1+Fg5qkYCQk9aysLwWFLJx9IcFQ1suPS3J9P9LCiYfCkyXP0ln3LHOqL4/iDuvOfAvwgjTMeGD0Dd Xoy5sHOA==; Original-Received: from 135-180-197-170.fiber.dynamic.sonic.net ([135.180.197.170]:62379 helo=DESKTOP-G20DCG1) by host2007.hostmonster.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1ongnI-003hS3-Kw; Wed, 26 Oct 2022 07:50:08 -0600 In-Reply-To: (Stefan Monnier's message of "Tue, 25 Oct 2022 13:46:32 -0400") X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - host2007.hostmonster.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - stephe-leake.org X-BWhitelist: no X-Source-IP: 135.180.197.170 X-Source-L: No X-Exim-ID: 1ongnI-003hS3-Kw X-Source-Sender: 135-180-197-170.fiber.dynamic.sonic.net (DESKTOP-G20DCG1) [135.180.197.170]:62379 X-Source-Auth: stephen_leake@stephe-leake.org X-Email-Count: 3 X-Source-Cap: c3RlcGhlbGU7c3RlcGhlbGU7aG9zdDIwMDcuaG9zdG1vbnN0ZXIuY29t X-Local-Domain: yes Received-SPF: pass client-ip=69.89.30.42; envelope-from=stephen_leake@stephe-leake.org; helo=gproxy3-pub.mail.unifiedlayer.com X-Spam_score_int: 16 X-Spam_score: 1.6 X-Spam_bar: + X-Spam_report: (1.6 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: "Emacs-devel" Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:298539 Archived-At: --=-=-= Content-Type: text/plain Stefan Monnier writes: >> Ok, I've pushed externals-release/ada-mode and externals-release/wisi, >> and deleted the other branches. > > Looks like it worked (it first bumped into a bug in `elpa-admin.el`, > but I got that sorted out). > >> Attached is a patch for README; ok to commit? > > AFAICT this is a patch for the `README` of the `main` branch of > `elpa.git`. There's a separate `README` in `admin` (one that's > supposed to be generic and document the functionality of the code, > e.g. mentioning "externals" there doesn't make sense there since that > name comes from the `elpa-config` file in `main` branch of `elpa.git`). > > Part of the story is explained in the first paragraph of those > `README` files. Ok, I compared the two REAMEs with ediff; there were a couple other differences, and I fixed one typo. Attached are two patches. -- -- Stephe --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=elpa-readme.diff diff --git a/README b/README index b0bb6fc67d..5952a007d0 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ #+TITLE: GNU ELPA README -#+DATE: 2022-06-05 +#+DATE: 2022-10-26 Copyright (C) 2010-2022 Free Software Foundation, Inc. \\ See the end of the file for license conditions. @@ -7,7 +7,7 @@ See the end of the file for license conditions. #+BEGIN_COMMENT This file exists in two branches ~elpa-admin~ and ~elpa~. The two version differ slightly. The introductory text before the first heading -differs and their are minor differences concerning the ~externals/*~ to +differs and there are minor differences concerning the ~externals/*~ to ~elpa/*~ transition. Please make sure you always update this file in both locations to avoid introducing additional differences. This duplication will be removed eventually. @@ -158,6 +158,14 @@ and only if the version number in the development branch indicates that it contains development code (i.e. a "snapshot" version, according to `version-to-list`). +If there is no upstream (:url is nil), the presence of :release-branch +just indicates that release and devel branches in elpa.git are desired +(the name given in :release-branch is ignored). The release branch is +named `externals-release/' for GNU ELPA and +`elpa-release/` for NonGNU ELPA. The standard package branch +externals/ is the devel branch in GNU ELPA; the standard +branch elpa/ is the devel branch in non-GNU ELPA. + ** =:ignored-files FILES= Names of files or directories that should not be included in the tarballs. @@ -171,7 +179,8 @@ having to specify it here. ** =:readme FILE= Name of the file to use as the description of the package. By default we try to use README, README.rst, README.org, or the Commentary section -in the main file. +in the main file. If ~ignore~, ignore any matching file and use the Commentary +section. ** =:news FILE= Name of the file that contains the list of changes in recent versions @@ -287,7 +296,6 @@ Delete all the files generated by =make packages/[PKGNAME]=. * Packages ** Contents of the =packages/= directory: - This directory holds the package sources, with one subdirectory for each package. @@ -414,7 +422,7 @@ and the web-pages from this source code: auto-generated from it. - Every package should have both a =Version:= /and/ a =Maintainer:=. - The =Version:= must be acceptable to =version-to-list=. -- The =URL:= header can be used to specify the website +- The =URL:= header can be used to specify the home page of the package, if it's maintained externally. - A =News:= section (or "NEWS" file) can/should be used to list the user-visible changes of each version. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=elpa-admin-readme.diff diff --git a/README b/README index 4ff305047a..62021e3ca0 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ #+TITLE: ELPA-Admin README -#+DATE: 2022-01-06 +#+DATE: 2022-10-26 Copyright (C) 2010-2022 Free Software Foundation, Inc. \\ See the end of the file for license conditions. @@ -7,7 +7,7 @@ See the end of the file for license conditions. #+BEGIN_COMMENT This file exists in two branches ~elpa-admin~ and ~elpa~. The two version differ slightly. The introductory text before the first heading -differs and their are minor differences concerning the ~externals/*~ to +differs and there are minor differences concerning the ~externals/*~ to ~elpa/*~ transition. Please make sure you always update this file in both locations to avoid introducing additional differences. This duplication will be removed eventually. @@ -19,7 +19,7 @@ the [[https://elpa.gnu.org/][GNU ELPA]] and NonGNU ELPA archives. * Getting the source Start with source that is cloned directly from Savannah. See [[https://savannah.gnu.org/git/?group=emacs][the Savannah page]] -and look for "ELPA". Using a clone of a clone does not work. +and look for "GNU ELPA". Using a clone of a clone does not work. You must then do some setup: #+begin_src shell @@ -119,6 +119,14 @@ and only if the version number in the development branch indicates that it contains development code (i.e. a "snapshot" version, according to `version-to-list`). +If there is no upstream (:url is nil), the presence of :release-branch +just indicates that release and devel branches in elpa.git are desired +(the name given in :release-branch is ignored). The release branch is +named `externals-release/' for GNU ELPA and +`elpa-release/` for NonGNU ELPA. The standard package branch +externals/ is the devel branch in GNU ELPA; the standard +branch elpa/ is the devel branch in non-GNU ELPA. + ** =:ignored-files FILES= Names of files or directories that should not be included in the tarballs. @@ -254,7 +262,8 @@ each package. Each directory in here corresponds to a package. -A nightly cron job refreshes the GNU ELPA archive from this repository. +A nightly cron job on the server hosting =elpa.gnu.org= refreshes the +GNU ELPA archive from this repository. This cron job only creates a new package when the "version" (as specified in the =Version:= header) of a package is modified. This means that you can --=-=-=--