diff options
| -rw-r--r-- | debian/changelog | 43 | ||||
| -rw-r--r-- | debian/control | 28 | ||||
| -rw-r--r-- | debian/copyright | 38 | ||||
| -rw-r--r-- | debian/doc/CONTRIBUTORS | 48 | ||||
| -rw-r--r-- | debian/docs | 2 | ||||
| -rw-r--r-- | debian/gbp.conf | 2 | ||||
| -rw-r--r-- | debian/patches/contributors.patch | 13 | ||||
| -rw-r--r-- | debian/patches/macos.patch | 52 | ||||
| -rw-r--r-- | debian/patches/python3.patch | 10 | ||||
| -rw-r--r-- | debian/patches/series | 4 | ||||
| -rw-r--r-- | debian/patches/shebang.patch | 40 | ||||
| -rwxr-xr-x | debian/rules | 24 | ||||
| -rw-r--r-- | debian/watch | 4 |
13 files changed, 236 insertions, 72 deletions
diff --git a/debian/changelog b/debian/changelog index 10d9a16..42e5b94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,42 +1,17 @@ -rcm (1.2.3-1) unstable; urgency=medium +rcm (1.3.3-3) unstable; urgency=medium - * New upstream release + * Use Python 3 for tests. (Closes: #943249) - -- Mike Burns <mburns@thoughtbot.com> Fri, 09 May 2014 14:30:57 +0200 + -- Benjamin Barenblat <bbaren@debian.org> Sun, 27 Oct 2019 22:19:00 -0400 -rcm (1.2.2-2) unstable; urgency=medium +rcm (1.3.3-2) unstable; urgency=medium - * New upstream release + * Set Multi-Arch: foreign. - -- Mike Burns <mburns@thoughtbot.com> Fri, 28 Mar 2014 16:25:24 +0100 + -- Benjamin Barenblat <bbaren@debian.org> Thu, 03 Jan 2019 20:38:01 -0500 -rcm (1.2.1-2) unstable; urgency=medium +rcm (1.3.3-1) unstable; urgency=medium - * Re-visit the Debian packaging. - * New upstream release + * Initial release. - -- Mike Burns <mburns@thoughtbot.com> Fri, 07 Mar 2014 16:27:57 +0100 - -rcm (1.2.0-1) unstable; urgency=medium - - * New upstream release - - -- Mike Burns <mburns@thoughtbot.com> Mon, 03 Feb 2014 16:58:33 +0200 - -rcm (1.1.0-1) unstable; urgency=medium - - * New upstream release. - - -- Mike Burns <mburns@thoughtbot.com> Mon, 05 Aug 2013 16:43:33 +0200 - -rcm (1.0.0-1) unstable; urgency=medium - - * New upstream release. - - -- Mike Burns <mburns@thoughtbot.com> Tue, 01 Aug 2013 16:43:33 +0200 - -rcm (0.0.2-1) unstable; urgency=medium - - * New upstream release. - - -- Mike Burns <mburns@thoughtbot.com> Tue, 23 Jul 2013 16:43:33 +0200 + -- Benjamin Barenblat <bbaren@debian.org> Thu, 20 Dec 2018 19:35:48 -0500 diff --git a/debian/control b/debian/control index bb141f5..9d0620f 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,21 @@ Source: rcm Section: utils Priority: optional -Maintainer: Mike Burns <mburns@thoughtbot.com> -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.4 -Homepage: http://thoughtbot.github.io/rcm -Vcs-Git: git://github.com/thoughtbot/rcm.git -Vcs-Browser: http://github.com/thoughtbot/rcm +Maintainer: Benjamin Barenblat <bbaren@debian.org> +Build-Depends: + debhelper (>= 10), + python3-cram, +Standards-Version: 4.4.1 +Homepage: https://github.com/thoughtbot/rcm +Vcs-Browser: https://git.benjamin.barenblat.name/debian-rcm/ +Vcs-Git: https://git.benjamin.barenblat.name/debian-rcm.git Package: rcm Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: management suite for dotfiles - You have dotfiles. Maybe you have them in a repo that you share; maybe you - have them in a privately-backed up directory; or maybe you just have them - scattered about your homedir. Regardless, this package provides a suite of - programs that will help manage an existing dotfiles collection and also start - a new one. +Multi-Arch: foreign +Depends: ${misc:Depends} +Description: tool to manage rc files (dotfiles) + rcm is a suite of tools to manage rc files (dotfiles). The tools keep dotfiles + in a single directory, managing symlinks to them from (or copies of them in) + other directories. rcm supports tagging rc files and splitting them by + hostname. It also can generate a bootstrapping script for use a new machine. diff --git a/debian/copyright b/debian/copyright index 428f888..a79822f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,14 +1,41 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: rcm -Source: git@github.com:thoughtbot/rcm.git +Upstream-Contact: Mike Burns <mburns@thoughtbot.com> +Source: https://github.com/thoughtbot/rcm +Copyright: 2013 Mike Burns <mburns@thoughtbot.com> + 2014-2015 thoughtbot +License: BSD-3-clause Files: * Copyright: 2013 Mike Burns <mburns@thoughtbot.com> -License: BSD-3 - All rights reserved. + 2014 thoughtbot +License: BSD-3-clause + +Files: debian/* +Copyright: 2018 Benjamin Barenblat <bbaren@debian.org> +License: Apache-2.0 + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + https://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems, the complete text of the Apache version 2.0 license + can be found in "/usr/share/common-licenses/Apache-2.0". + +License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + . * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright @@ -17,6 +44,7 @@ License: BSD-3 * Neither the name of Mike Burns nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + . THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A @@ -27,4 +55,4 @@ License: BSD-3 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/debian/doc/CONTRIBUTORS b/debian/doc/CONTRIBUTORS new file mode 100644 index 0000000..27ac696 --- /dev/null +++ b/debian/doc/CONTRIBUTORS @@ -0,0 +1,48 @@ + 3 Alan Yee <alyee@ucsd.edu> + 2 Andrei Dziahel <develop7@develop7.info> + 1 Anton Ilin <anton@ilin.dn.ua> + 1 Ben Stephens <BKStephens@outlook.com> + 1 Ben Turrubiates <ben@turrubiat.es> + 1 Blake Williams <blake@blakewilliams.me> + 2 Caleb Land <caleb@land.fm> + 1 Carl van Tonder <carl@supervacuo.com> + 1 Casey Rodarmor <casey@rodarmor.com> + 2 Christian Höltje <docwhat@gerf.org> + 1 Christian Höltje <docwhat@gerf.org> + 2 Christopher Koch <ckoch@cs.nmt.edu> + 1 Dan Croak <dan@thoughtbot.com> + 1 Daniel Watson <dwatson@thig.com> + 2 David Alexander <davidpaulalexander@gmail.com> + 1 Devraj Mehta <devm33@gmail.com> + 2 Eric Collins <eric@tabfugni.cc> + 3 Florian Tham <fgtham@gmail.com> + 2 George Brocklehurst <george@thoughtbot.com> + 1 Graham Bennett <graham@simulcra.org> + 2 Jarkko Kniivilä <jkniiv@gmail.com> + 1 Jason Daniel Augustine Gilliland <jdagilliland@gmail.com> + 2 Javier López <linux.kitten@gmail.com> + 1 Joe Ferris <jferris@thoughtbot.com> + 1 John Axel Eriksson <john@insane.se> + 1 Jordan Eldredge <jordaneldredge@gmail.com> + 1 Leonardo Brondani Schenkel <leonardo@schenkel.net> + 5 Martin Frost <frost@ceri.se> + 1 Matthew Horan <matt@matthoran.com> + 4 Melissa Xie <melissa@thoughtbot.com> + 1 Michael Reed <supertron421@gmail.com> + 142 Mike Burns <mburns@thoughtbot.com> + 1 Mike Burns and Eric Collins <mburns@thoughtbot.com> + 1 Nick Novitski <github@nicknovitski.com> + 6 Pablo Olmos de Aguilera Corradini <pablo@glatelier.org> + 11 Patrick Brisbin <pat@thoughtbot.com> + 1 Rafael Santos <formigarafa@gmail.com> + 2 Rebecca Meritz <rebecca@meritz.com> + 1 Roberto Pedroso <roberto@rpedroso.com> + 3 Scott Stevenson <scott@stevenson.io> + 2 Teo Ljungberg <teo@teoljungberg.com> + 1 Tyson Gach <tyson@tysongach.com> + 1 Vlad GURDIGA <gurdiga@gmail.com> + 1 Yota Toyama <raviqqe@gmail.com> + 1 Zach Latta <zach@zachlatta.com> + 1 kajisha <kajisha@gmail.com> + 1 maxice8 <thinkabit.ukim@gmail.com> + 1 wplatter-cb <39812934+wplatter-cb@users.noreply.github.com> diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..e77280e --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +NEWS.md +debian/doc/CONTRIBUTORS diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..4e94eb4 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +upstream-tag = v%(version)s diff --git a/debian/patches/contributors.patch b/debian/patches/contributors.patch new file mode 100644 index 0000000..49e0354 --- /dev/null +++ b/debian/patches/contributors.patch @@ -0,0 +1,13 @@ +From: Benjamin Barenblat <bbaren@debian.org> +Subject: Remove CONTRIBUTORS section from rcm.7 +Forwarded: not-needed + +See README.Debian. +--- a/autogen.sh ++++ b/autogen.sh +@@ -3,4 +3,4 @@ + aclocal && + autoconf && + automake --add-missing --copy && +- ./maint/autocontrib man/rcm.7.mustache ++ sed -n '/.Sh CONTRIBUTORS/q; p' man/rcm.7.mustache >man/rcm.7 diff --git a/debian/patches/macos.patch b/debian/patches/macos.patch new file mode 100644 index 0000000..b17977b --- /dev/null +++ b/debian/patches/macos.patch @@ -0,0 +1,52 @@ +From: Benjamin Barenblat <bbaren@debian.org> +Subject: Remove references to macOS from documentation +Forwarded: not-needed +--- a/man/lsrc.1 ++++ b/man/lsrc.1 +@@ -181,16 +181,6 @@ + and + .Lk http://thoughtbot.se thoughtbot + .Sh BUGS +-For macOS systems, we strongly encourage the use of the +-.Va HOSTNAME +-variable in your +-.Xr rcrc 5 . +-We use the +-.Xr hostname 1 +-program to determine the unique identifier for the host. This program is +-not specified by POSIX and can vary by system. On macOS the hostname is +-unpredictable, and can even change as part of the DHCP handshake. +-.Pp + There are a few bugs around shell globs. Anything involving an exclude + pattern is unpredictable, so use + .Fl v +--- a/man/rcm.7.mustache ++++ b/man/rcm.7.mustache +@@ -244,10 +244,6 @@ + flag. + .Pp + .Dl mkrc -B eggplant .rcrc +-.Pp +-macOS users should see the +-.Sx BUGS +-section for more details. + . + .Sh STANDALONE INSTALLATION SCRIPT + . +@@ -301,16 +297,6 @@ + .An "Mike Burns" Aq Mt mburns@thoughtbot.com + and + .Lk http://thoughtbot.se thoughtbot +-.Sh BUGS +-For macOS systems, we strongly encourage the use of the +-.Va HOSTNAME +-variable in your +-.Xr rcrc 5 . +-We use the +-.Xr hostname 1 +-program to determine the unique identifier for the host. This program is +-not specified by POSIX and can vary by system. On macOS, the hostname is +-unpredictable, and can even change as part of the DHCP handshake. + .Sh CONTRIBUTORS + .An -split + {{#contributors}} diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch new file mode 100644 index 0000000..cfa505e --- /dev/null +++ b/debian/patches/python3.patch @@ -0,0 +1,10 @@ +From: Benjamin Barenblat <bbaren@debian.org> +Subject: Use Python 3 +--- a/Makefile.am ++++ b/Makefile.am +@@ -51,4 +51,4 @@ + dist_check_SCRIPTS = $(TESTS) + dist_check_DATA = test/helper.sh + +-LOG_COMPILER = cram ++LOG_COMPILER = cram3 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..d5413b6 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +contributors.patch +macos.patch +shebang.patch +python3.patch diff --git a/debian/patches/shebang.patch b/debian/patches/shebang.patch new file mode 100644 index 0000000..9366b9b --- /dev/null +++ b/debian/patches/shebang.patch @@ -0,0 +1,40 @@ +From: Benjamin Barenblat <bbaren@debian.org> +Subject: Always use /bin/sh to run rcm +Forwarded: not-needed + +rcm only requires a POSIX-compliant shell – not Bash. The various sh +options in Debian are POSIX-compliant, and many of them are +substantially faster than Bash. Force rcm to run under /bin/sh, +regardless of what shell’s interpreting the configure script. +--- a/bin/lsrc.in ++++ b/bin/lsrc.in +@@ -1,4 +1,4 @@ +-#!@SHELL@ ++#!/bin/sh + + : ${RCM_LIB:=$(dirname "$0")/../share/rcm} + . "$RCM_LIB/rcm.sh" +--- a/bin/mkrc.in ++++ b/bin/mkrc.in +@@ -1,4 +1,4 @@ +-#!@SHELL@ ++#!/bin/sh + + : ${RCM_LIB:=$(dirname "$0")/../share/rcm} + . "$RCM_LIB/rcm.sh" +--- a/bin/rcdn.in ++++ b/bin/rcdn.in +@@ -1,4 +1,4 @@ +-#!@SHELL@ ++#!/bin/sh + + : ${RCM_LIB:=$(dirname "$0")/../share/rcm} + . "$RCM_LIB/rcm.sh" +--- a/bin/rcup.in ++++ b/bin/rcup.in +@@ -1,4 +1,4 @@ +-#!@SHELL@ ++#!/bin/sh + + : ${RCM_LIB:=$(dirname "$0")/../share/rcm} + . "$RCM_LIB/rcm.sh" diff --git a/debian/rules b/debian/rules index f7f9dcb..206bfd9 100755 --- a/debian/rules +++ b/debian/rules @@ -1,24 +1,8 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 - -# Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 - -# This has to be exported to make some magic below work. -export DH_OPTIONS - %: - dh $@ + dh $@ --no-parallel --with autoreconf -override_dh_installchangelogs: - dh_installchangelogs NEWS.md +.PHONY: override_dh_autoreconf +override_dh_autoreconf: + dh_autoreconf -- ./autogen.sh diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..98721e4 --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=4 +opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%rcm-$1.tar.gz%" \ + https://github.com/thoughtbot/rcm/tags \ + (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate |