--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: O: gnulib -- GNU Portability Library
- From: Ian Beckwith <ianb@debian.org>
- Date: Mon, 05 Dec 2016 04:44:48 +0000
- Message-id: <20161205044448.7730.88286.reportbug@jezebel.angsthaus.erislabs.net>
Package: wnpp
Severity: normal
Hi,
I'm orphaning gnulib, it is way too long since I've kept up with
maintaining it.
The package description is:
The GNU portability library is a macro system and C declarations and
definitions for commonly-used API elements and abstracted system behaviors. It
can be used to improve portability and other functionality in your programs.
Note that the source package also produces the git-merge-changelog
package, to aid in merging GNU-style ChangeLogs.
If you adopt gnulib, consider also creating and releasing upstream
stable snapshots, and using them as a source for the debian package.
I've attached the script and HOWTO I wrote to document the process of
creating stable snapshots.
My git repo is at:
git://erislabs.net/gnulib.git
http://erislabs.net/gitweb?p=gnulib.git
Branches are:
upstream - upstream master, unmodified
stable - stable snapshots
master - debian packaging
The upstream repo is at:
git://git.savannah.gnu.org/gnulib.git
http://git.savannah.gnu.org/gitweb/?p=gnulib.git
and the upstream mailing list is:
bug-gnulib@gnu.org
https://lists.gnu.org/mailman/listinfo/bug-gnulib
any questions, ask me or maybe the upstream mailing list
cheers,
Ian.
How to make a gnulib stable snapshot
------------------------------------
by Ian Beckwith <ianb@erislabs.net>
Last Update: Tue Apr 24 2010
Latest Version: http://erislabs.net/projects/gnulib/STABLE-HOWTO.html
BRANCHES
* upstream - tracks git://git.savannah.gnu.org/gnulib.git
* stable - the stable snapshot we produce, based on upstream
* master - the debian branch, based on stable (optional)
PROCEDURE
* if you don't already have a repository:
+ clone the gnulib repo:
$ git clone git://git.savannah.gnu.org/gnulib.git
$ git branch -m master upstream
+ then either import the existing stable repo:
$ git remote add erislabs git://erislabs.net/gnulib.git
$ git fetch erislabs
$ git branch stable erislabs/stable
+ or, if that isn't possible, start from scratch:
$ git branch stable upstream
* update upstream branch:
$ git checkout upstream
$ git pull
* tag the current upstream HEAD for later use:
$ git tag snapshot-start upstream
* run the test suite:
$ git checkout upstream
$ ./gnulib-tool --create-megatestdir --with-tests --dir=t 2>&1 | tee create.out
$ cd t
$ ./do-autobuild 2>&1 | tee ../build.out
$ cd ..
* find failing tests with:
$ grep -L rc=0 t/logs/*
* report any issues to bug-gnulib@gnu.org
* merge the current upstream version into the stable branch:
$ git checkout stable
$ git merge upstream
* resolve conflicts
$ git checkout upstream <all conflicting paths except NEWS.stable>
$ git commit -a
* wait a week or so
* update upstream branch:
$ git checkout upstream
$ git pull
* create list of commits to review:
$ git log --oneline --reverse --topo-order snapshot-start..upstream > ../stable.log
* return to the stable branch
$ git checkout stable
* prepare NEWS.stable for new release.
+ add new header
+ add __NEXTCOMMITMARKER__ tag where you want commits to be logged
* for each commit in ../stable.log:
+ review each commit in ../stable.log:
$ git show commitid
+ if you want to cherry-pick that commit:
$ stable-cherry-pick commitid
(stable-cherry-pick source: http://erislabs.net/ianb/projects/gnulib/stable-cherry-pick)
+ if the cherry-pick fails:
* resolve the conflict and commit, making a note of the new commitid
* fill in the new commitid in NEWS.stable, then commit
* remove __NEXTCOMMIT__ marker from NEWS.stable, commit
* test (see above). If testsuite fails, check whether bug exists
in upstream branch, report to bug-gnulib@gnu.org.
* remove the temporary snapshot-start tag
$ git tag -d snapshot-start
* tag the new release
$ git tag stable/yyyymmdd
* create and upload tarball:
$ git archive --format=tar --prefix=gnulib-yyyymmdd-stable/ stable/yyyymmdd | gzip -9 > ../gnulib-yymmdd-stable.tar.gz
* push changes to stable git repository
* mail announcement to bug-gnulib@gnu.org
#!/bin/sh
# stable-cherry-pick -- Cherry-pick commits into current branch and
# log them to NEWS.stable. See STABLE-HOWTO for more info,
# also at http://erislabs.net/projects/gnulib/STABLE-HOWTO.html
# Copyright (C) 2009-2010 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Written by Ian Beckwith <ianb@erislabs.net> 20091114
PROGNAME="$(basename "$0")"
NEXTCOMMITMARKER="__NEXTCOMMITMARKER__"
NEWS="NEWS.stable"
TMP="$NEWS.tmp"
warn ()
{
echo "$PROGNAME: $1"
shift
while [ $# -gt 0 ]; do
echo " $1"
shift
done
}
fail ()
{
warn "$@"
exit 1
}
if [ $# -ne 1 ]; then
echo "usage: $PROGNAME COMMIT-ID"
echo " cherry-picks COMMIT-ID into current branch and logs it to $NEWS"
exit 1
fi
COMMIT="$1"
git show "$COMMIT" > /dev/null 2>&1
if [ $? -ne 0 ];then
fail "commit $COMMIT not found"
fi
SHORTCOMMIT="$(git log -1 --format=%h "$COMMIT")"
SUBJECT="$(git log -1 --format=%s "$COMMIT")"
CHERRYOUT="$(git cherry-pick -x "$COMMIT")"
CHERRYRES=$?
echo "$CHERRYOUT"
if [ $CHERRYRES -ne 0 ];then
warn "cherry-pick failed, logging without new commit-id." \
"Resolve conflicts, commit then add new commit-id to ${NEWS}."
CHERRYSHORTCOMMIT=""
else
CHERRYFULLCOMMIT=$(echo "$CHERRYOUT" | grep '^\[[^ ]\+ [a-fA-F0-9]\+\] ' |sed 's/^\[[^ ]\+ \([a-fA-F0-9]\+\)\].*/\1/;')
CHERRYSHORTCOMMIT="$(git log -1 --format=%h "$CHERRYFULLCOMMIT")"
fi
MESSAGE="[$SHORTCOMMIT]->[$CHERRYSHORTCOMMIT] $SUBJECT"
echo " * $MESSAGE"
if [ ! -f "$NEWS" ]; then
fail "$NEWS not found, not logging"
fi
if ! grep -q "$NEXTCOMMITMARKER" "$NEWS"; then
fail "commit marker $NEXTCOMMITMARKER not found in ${NEWS}, not logging"
fi
sed "/$NEXTCOMMITMARKER/Q" < "$NEWS" > "$TMP"
echo " * $MESSAGE" >> "$TMP"
sed -n "/$NEXTCOMMITMARKER/,\$p" < "$NEWS" >> "$TMP"
mv "$TMP" "$NEWS"
if [ $? -ne 0 ]; then
fail "failed to rename $TMP to $NEWS"
fi
# If cherry-pick succeeded, commit changes to $NEWS
if [ -n "$CHERRYSHORTCOMMIT" ]; then
git add "$NEWS"
git commit -m "$NEWS: log cherry-pick $MESSAGE"
fi
--- End Message ---
--- Begin Message ---
- To: 847043-close@bugs.debian.org
- Subject: Bug#847043: fixed in gnulib 20140202+stable-3
- From: Jonas Smedegaard <dr@jones.dk>
- Date: Sat, 23 Jun 2018 07:49:03 +0000
- Message-id: <E1fWdI7-000Dk9-B0@fasolo.debian.org>
Source: gnulib
Source-Version: 20140202+stable-3
We believe that the bug you reported is fixed in the latest version of
gnulib, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 847043@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jonas Smedegaard <dr@jones.dk> (supplier of updated gnulib package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 23 Jun 2018 09:23:11 +0200
Source: gnulib
Binary: gnulib git-merge-changelog
Architecture: source
Version: 20140202+stable-3
Distribution: unstable
Urgency: medium
Maintainer: build-common team <team+build-common@tracker.debian.org>
Changed-By: Jonas Smedegaard <dr@jones.dk>
Description:
git-merge-changelog - git merge driver for GNU ChangeLog files
gnulib - GNU Portability Library
Closes: 847043
Changes:
gnulib (20140202+stable-3) unstable; urgency=medium
.
* Update copyright info:
+ Fix generate copyright file deterministically.
+ Add TODO about fixing license detection of multi-licensed files.
+ Fix use license exception notation.
+ Use semantic newlines in License fields.
+ Single-space indent License fields.
+ Update coverage.
+ Use https protocol in file format URL.
+ Update source URLs.
+ Add alternate URL for upstream contact.
+ Use SPDX license shortnames.
+ Update coverage.
* Use https protocol in homepage URL.
* Update package relations:
+ Wrap and sort entries.
+ Relax to build-depend unversioned on debhelper, stop explicitly
build-depend on dpkg-dev, and relax to depend unversioned on
gettext: Needed versions satisfied even in oldstable.
* Add git-buildpackage config:
+ Enable pristine-tar.
+ Enable signed tags.
+ Filter out any .git* files.
* Update Vcs-* fields: Source moved to Salsa.
* Friendly packaging takeover, in team build-common.
Closes: Bug#847043. Thanks for past work to Ian Beckwith.
Checksums-Sha1:
3cffcbed18b9651256558903a7b51fb1c0fefff2 2085 gnulib_20140202+stable-3.dsc
f1f285b7cf4a63a25ac8cc3391121b531247e776 289636 gnulib_20140202+stable-3.debian.tar.xz
c59f6893b5a1fea46a6cbe7d678ea5bf3032b631 6443 gnulib_20140202+stable-3_amd64.buildinfo
Checksums-Sha256:
acac87dc2c0c76fec8c37a8f07bbd77e65e84d633da9f59ca8fbe1c1a392f08e 2085 gnulib_20140202+stable-3.dsc
3ce229e1ab0514e4bc289d67ed7088c48ffe456202ac10b358081940b4db54a0 289636 gnulib_20140202+stable-3.debian.tar.xz
2feae22cdb94fbd772e216abcc1cf56d4af6b8818e95d037ee18122ea815d8c0 6443 gnulib_20140202+stable-3_amd64.buildinfo
Files:
2f730a834eae1c50a9181ef3fb23b7b2 2085 devel optional gnulib_20140202+stable-3.dsc
4066dc3d6e4bc9ea5ef2e2916b1efa5d 289636 devel optional gnulib_20140202+stable-3.debian.tar.xz
d8da5b633e9d8a715778612cf4d1e5e3 6443 devel optional gnulib_20140202+stable-3_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEn+Ppw2aRpp/1PMaELHwxRsGgASEFAlst+jIACgkQLHwxRsGg
ASFOKBAAkaAgdseFmzsxJPW/HTpcrcInXfY/COiJol6Otk1DFQW5TTeENofiKPz/
hGu85E9OrwuywoaCrrUC5auA3lg6XWf45aD4JAMvTNH0YPiUe3Ow1Eb7tCukzHjN
6Ck47nSWlFN7SGBJYA+ZvGu3MOEJR8eudAzZCpltwlvrxwcnHGchwMktPEjyPW6k
Bhpc6c1vfX8YX4zoCfzl6w/pkWlg2jHc4AmP43Sni3hA8zuCCBfXJsRmLUBQQLBk
5hU7c0tQBmfKFix5PzSnN+mzs4as3zVXnWWiGniJwpqOV753cVxLyJNKLSAFWiu6
sjSGTYSIHb1j5g3rag3NIbnfgms3luWyKpNEaajCRAJRd/eveg2CmC2Aj1WpjNmk
6/LYY6EL7tgd+Ws3Teigu/gGYh0VkqwBbn3ayGsoxK4ZAvsDMcrorwMdDszzmy7t
IUf/8+cm0WTFSu8MBRKjpeNwVbQbYr5/r717qw6zxvMR757X60D19HjsAwjPVl8s
5YT+kpVy+D+aoKhTCxzee8sNIugnEPl9Z/vXVrG2Tg/KgDF6YXW9Ki9SIusBLXMO
fz/DJDzriN32ugkkaEDfPOEWOwEc9AJoWWx2EDqtm4JS+hTnBPgz3fx8g9RwEzI2
rw6G/UsubWehI05xfCMWa+k4r33Q3nRqziBEGTKCUKBi683IaOw=
=anxo
-----END PGP SIGNATURE-----
--- End Message ---