diff options
25 files changed, 301 insertions, 51 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..5d425843 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +debian/changelog merge=dpkg-mergechangelogs @@ -12,6 +12,8 @@ propellor.1 .lock .lastchecked .stack-work/* +/debian/files +/debian/propellor.substvars .cabal-sandbox/ .dir-locals.el cabal.sandbox.config diff --git a/debian/changelog b/debian/changelog index 261989c2..bab6d596 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,34 @@ propellor (3.0.4) unstable; urgency=medium -- Joey Hess <id@joeyh.name> Sun, 22 May 2016 15:54:49 -0400 +propellor (3.0.3-2) unstable; urgency=medium + + * Use CDBS & haskell-devscripts to build new binary packages + libghc-propellor-{dev,prof,doc}. + * Add X-Description: field to debian/control. + * Add patch removing README.Debian from propellor.cabal. + * Re-arrange files in debian/ to deal with multiple binary packages. + - Use debian/propellor.manpages and debian/propellor.docs instead of + overrides in debian/rules. + - Add Lintian overrides duplicate-{short,long}-description. + - Rename README.Debian, lintian-overrides to correspond to particular + binary packages. + - Add libghc-propellor-{dev,prof,doc}.links duplicating propellor.links. + * Binary package propellor now depends on libghc-propellor-dev. + This fixes using propellor as a library, as set up by propellor --init + option B. Closes: + https://propellor.branchable.com/todo/propellor_--init_option_B_failure/ + * Update Source: field and copyright year in debian/copyright. + + -- Sean Whitton <spwhitton@spwhitton.name> Sat, 07 May 2016 10:59:53 -0700 + +propellor (3.0.3-1) unstable; urgency=medium + + * Package new upstream release. + * Bump standards version to 3.9.8 (no changes required). + + -- Sean Whitton <spwhitton@spwhitton.name> Sun, 01 May 2016 17:12:29 -0700 + propellor (3.0.3) unstable; urgency=medium * Remove Propellor.DotDir from the propellor library, as its use of @@ -31,6 +59,13 @@ propellor (3.0.2) unstable; urgency=medium -- Joey Hess <id@joeyh.name> Sat, 30 Apr 2016 15:46:50 -0400 +propellor (3.0.1-1) unstable; urgency=medium + + * Package new upstream release. + * Remove obsolete debian/NEWS to minimise confusion. + + -- Sean Whitton <spwhitton@spwhitton.name> Wed, 06 Apr 2016 07:20:20 -0700 + propellor (3.0.1) unstable; urgency=medium * propellor --init now runs cabal sandbox init if cabal has been @@ -41,6 +76,13 @@ propellor (3.0.1) unstable; urgency=medium -- Joey Hess <id@joeyh.name> Tue, 05 Apr 2016 13:35:54 -0400 +propellor (3.0.0-1) unstable; urgency=medium + + * New upstream version. + * Create debian/NEWS to detail a caveat when upgrading to this new version. + + -- Sean Whitton <spwhitton@spwhitton.name> Sun, 03 Apr 2016 11:35:35 -0700 + propellor (3.0.0) unstable; urgency=medium * Property types have been improved to indicate what systems they target. @@ -118,6 +160,12 @@ propellor (3.0.0) unstable; urgency=medium -- Joey Hess <id@joeyh.name> Sat, 02 Apr 2016 15:33:26 -0400 +propellor (2.17.2-1) unstable; urgency=low + + * New upstream version. + + -- Sean Whitton <spwhitton@spwhitton.name> Thu, 31 Mar 2016 17:26:19 -0700 + propellor (2.17.2) unstable; urgency=medium * When new dependencies are added to propellor or the propellor config, @@ -129,6 +177,12 @@ propellor (2.17.2) unstable; urgency=medium -- Joey Hess <id@joeyh.name> Wed, 30 Mar 2016 15:45:08 -0400 +propellor (2.17.1-1) unstable; urgency=medium + + * New upstream version. + + -- Sean Whitton <spwhitton@spwhitton.name> Tue, 29 Mar 2016 08:30:00 -0700 + propellor (2.17.1) unstable; urgency=medium * Avoid generating excessively long paths to the unix socket file @@ -173,6 +227,16 @@ propellor (2.17.0) unstable; urgency=medium -- Joey Hess <id@joeyh.name> Thu, 24 Mar 2016 14:53:31 -0400 +propellor (2.16.0-1) unstable; urgency=medium + + * New upstream version. + * Create changelog symlink with dh_link instead of in debian/rules. + In accordance with policy 12.3: a package cannot assume the existence of + /usr/share/doc. + * Bump standards version to 3.9.7 (no changes required). + + -- Sean Whitton <spwhitton@spwhitton.name> Sun, 28 Feb 2016 17:02:24 -0700 + propellor (2.16.0) unstable; urgency=medium * Obnam: Only let one backup job run at a time when a host has multiple @@ -194,6 +258,12 @@ propellor (2.16.0) unstable; urgency=medium -- Joey Hess <id@joeyh.name> Sat, 27 Feb 2016 13:31:57 -0400 +propellor (2.15.4-1) unstable; urgency=medium + + * New upstream version. + + -- Sean Whitton <spwhitton@spwhitton.name> Sat, 13 Feb 2016 11:52:53 -0700 + propellor (2.15.4) unstable; urgency=medium * Build /usr/src/propellor/propellor.git reproducibly, @@ -212,6 +282,13 @@ propellor (2.15.4) unstable; urgency=medium -- Joey Hess <id@joeyh.name> Thu, 11 Feb 2016 12:49:10 -0400 +propellor (2.15.3-1) unstable; urgency=medium + + * New upstream version. + * Fix override of Lintian tag debian-watch-may-check-gpg-signature. + + -- Sean Whitton <spwhitton@spwhitton.name> Tue, 12 Jan 2016 19:41:07 -0700 + propellor (2.15.3) unstable; urgency=medium * Added Git.bareRepoDefaultBranch property @@ -220,6 +297,13 @@ propellor (2.15.3) unstable; urgency=medium -- Joey Hess <id@joeyh.name> Tue, 12 Jan 2016 12:37:22 -0400 +propellor (2.15.2-1) unstable; urgency=medium + + * New upstream version. + * Fix duplicate Section: in debian/control file. + + -- Sean Whitton <spwhitton@spwhitton.name> Mon, 04 Jan 2016 12:14:47 +0000 + propellor (2.15.2) unstable; urgency=medium * Added GNUPGBIN environment variable or git.program git config @@ -232,6 +316,16 @@ propellor (2.15.2) unstable; urgency=medium -- Joey Hess <id@joeyh.name> Sun, 03 Jan 2016 16:56:26 -0400 +propellor (2.15.1-1) unstable; urgency=medium + + * New upstream version. + * Add watch file. + * Fix specification of packaging branch in Vcs-Git: variable. + * Silence xargs during package build when hothasktags is not installed. + Patch accepted upstream for next upstream release. + + -- Sean Whitton <spwhitton@spwhitton.name> Sun, 03 Jan 2016 17:05:27 +0000 + propellor (2.15.1) unstable; urgency=medium * Added git configs propellor.spin-branch and propellor.forbid-dirty-spin. @@ -246,6 +340,13 @@ propellor (2.15.1) unstable; urgency=medium -- Joey Hess <id@joeyh.name> Sat, 19 Dec 2015 16:43:09 -0400 +propellor (2.15.0-1) unstable; urgency=medium + + * Adopt propellor package (Closes: #768634). + * Switch dpkg-source format to 3.0 (quilt). + + -- Sean Whitton <spwhitton@spwhitton.name> Sun, 13 Dec 2015 11:33:02 -0700 + propellor (2.15.0) unstable; urgency=medium * Added UncheckedProperty type, along with unchecked to indicate a diff --git a/debian/control b/debian/control index 9194b6c2..b90d9d49 100644 --- a/debian/control +++ b/debian/control @@ -1,50 +1,132 @@ Source: propellor Section: admin Priority: optional -Build-Depends: - debhelper (>= 9), - git, - ghc (>= 7.6), - cabal-install, - libghc-async-dev, - libghc-missingh-dev, - libghc-hslogger-dev, - libghc-unix-compat-dev, - libghc-ansi-terminal-dev, - libghc-ifelse-dev, - libghc-network-dev, - libghc-mtl-dev, - libghc-transformers-dev, - libghc-exceptions-dev (>= 0.6), - libghc-stm-dev, - libghc-text-dev, - libghc-concurrent-output-dev, -Maintainer: Joey Hess <id@joeyh.name> +Build-Depends: + cabal-install, + cdbs, + debhelper (>= 9), + ghc (>= 7.6), + git, + haskell-devscripts, + libghc-ansi-terminal-dev, + libghc-ansi-terminal-prof, + libghc-async-dev, + libghc-async-prof, + libghc-concurrent-output-dev, + libghc-concurrent-output-prof, + libghc-exceptions-dev (>= 0.6), + libghc-exceptions-prof (>= 0.6), + libghc-hslogger-dev, + libghc-hslogger-prof, + libghc-ifelse-dev, + libghc-ifelse-prof, + libghc-missingh-dev, + libghc-missingh-prof, + libghc-mtl-dev, + libghc-mtl-prof, + libghc-network-dev, + libghc-network-prof, + libghc-stm-dev, + libghc-stm-prof, + libghc-text-dev, + libghc-text-prof, + libghc-transformers-dev, + libghc-transformers-prof, + libghc-unix-compat-dev, + libghc-unix-compat-prof, +Maintainer: Sean Whitton <spwhitton@spwhitton.name> Standards-Version: 3.9.8 -Vcs-Git: git://git.joeyh.name/propellor -Homepage: http://propellor.branchable.com/ +Homepage: https://propellor.branchable.com/ +Vcs-Git: https://git.spwhitton.name/propellor -b debian +Vcs-Browser: https://git.spwhitton.name/?p=propellor.git;a=summary +X-Description: property-based host configuration management in haskell + Propellor ensures that the system it's run in satisfies a list of + properties, taking action as necessary when a property is not yet met. + . + It is configured using haskell. + . + The easiest way to get started with propellor is to install the binary package + `propellor' and run `propellor --init'. + +Package: libghc-propellor-dev +Section: haskell +Architecture: any +Depends: + ${haskell:Depends}, + ${misc:Depends}, + ${shlibs:Depends}, +Recommends: + ${haskell:Recommends}, +Suggests: + ${haskell:Suggests}, +Conflicts: + ${haskell:Conflicts}, +Provides: + ${haskell:Provides}, +Description: ${haskell:ShortDescription}${haskell:ShortBlurb} + ${haskell:LongDescription} + . + ${haskell:Blurb} + +Package: libghc-propellor-doc +Architecture: all +Section: doc +Depends: + ${haskell:Depends}, + ${misc:Depends}, +Recommends: + ${haskell:Recommends}, +Suggests: + ${haskell:Suggests}, +Conflicts: + ${haskell:Conflicts}, +Description: ${haskell:ShortDescription}${haskell:ShortBlurb} + ${haskell:LongDescription} + . + ${haskell:Blurb} + +Package: libghc-propellor-prof +Section: haskell +Architecture: any +Depends: + ${haskell:Depends}, + ${misc:Depends}, +Recommends: + ${haskell:Recommends}, +Suggests: + ${haskell:Suggests}, +Conflicts: + ${haskell:Conflicts}, +Provides: + ${haskell:Provides}, +Description: ${haskell:ShortDescription}${haskell:ShortBlurb} + ${haskell:LongDescription} + . + ${haskell:Blurb} Package: propellor Architecture: any -Section: admin -Depends: ${misc:Depends}, ${shlibs:Depends}, - ghc (>= 7.4), - cabal-install, - libghc-async-dev, - libghc-missingh-dev, - libghc-hslogger-dev, - libghc-unix-compat-dev, - libghc-ansi-terminal-dev, - libghc-ifelse-dev, - libghc-network-dev, - libghc-mtl-dev, - libghc-transformers-dev, - libghc-exceptions-dev (>= 0.6), - libghc-stm-dev, - libghc-text-dev, - libghc-concurrent-output-dev, - git, - make, +Depends: + cabal-install, + ghc (>= 7.4), + git, + libghc-ansi-terminal-dev, + libghc-async-dev, + libghc-concurrent-output-dev, + libghc-exceptions-dev (>= 0.6), + libghc-hslogger-dev, + libghc-ifelse-dev, + libghc-missingh-dev, + libghc-mtl-dev, + libghc-network-dev, + libghc-propellor-dev, + libghc-stm-dev, + libghc-text-dev, + libghc-transformers-dev, + libghc-unix-compat-dev, + make, + ${misc:Depends}, + ${shlibs:Depends}, Description: property-based host configuration management in haskell Propellor ensures that the system it's run in satisfies a list of properties, taking action as necessary when a property is not yet met. diff --git a/debian/copyright b/debian/copyright index 9a430c61..ed919d3c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,8 +1,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Source: native package +Source: https://propellor.branchable.com/ Files: * -Copyright: © 2010-2015 Joey Hess <id@joeyh.name> and contributors +Copyright: © 2010-2016 Joey Hess <id@joeyh.name> and contributors License: BSD-2-clause License: BSD-2-clause diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 00000000..aeb3b43a --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,10 @@ +[DEFAULT] +upstream-branch = master +debian-branch = debian +upstream-tag = %(version)s +debian-tag = debian/%(version)s + +#postbuild = lintian $GBP_CHANGES_FILE +color = on +compression = xz +compression-level = 9 diff --git a/debian/libghc-propellor-dev.links b/debian/libghc-propellor-dev.links new file mode 100644 index 00000000..d4d34298 --- /dev/null +++ b/debian/libghc-propellor-dev.links @@ -0,0 +1 @@ +/usr/share/doc/libghc-propellor-dev/changelog.Debian.gz /usr/share/doc/libghc-propellor-dev/changelog.gz diff --git a/debian/libghc-propellor-dev.lintian-overrides b/debian/libghc-propellor-dev.lintian-overrides new file mode 100644 index 00000000..6f4a12f5 --- /dev/null +++ b/debian/libghc-propellor-dev.lintian-overrides @@ -0,0 +1,2 @@ +# merged with Debian changelog +no-upstream-changelog diff --git a/debian/libghc-propellor-doc.links b/debian/libghc-propellor-doc.links new file mode 100644 index 00000000..9bdc7bd7 --- /dev/null +++ b/debian/libghc-propellor-doc.links @@ -0,0 +1 @@ +/usr/share/doc/libghc-propellor-doc/changelog.Debian.gz /usr/share/doc/libghc-propellor-doc/changelog.gz diff --git a/debian/libghc-propellor-doc.lintian-overrides b/debian/libghc-propellor-doc.lintian-overrides new file mode 100644 index 00000000..6f4a12f5 --- /dev/null +++ b/debian/libghc-propellor-doc.lintian-overrides @@ -0,0 +1,2 @@ +# merged with Debian changelog +no-upstream-changelog diff --git a/debian/libghc-propellor-prof.links b/debian/libghc-propellor-prof.links new file mode 100644 index 00000000..3c2bbb38 --- /dev/null +++ b/debian/libghc-propellor-prof.links @@ -0,0 +1 @@ +/usr/share/doc/libghc-propellor-prof/changelog.Debian.gz /usr/share/doc/libghc-propellor-prof/changelog.gz diff --git a/debian/libghc-propellor-prof.lintian-overrides b/debian/libghc-propellor-prof.lintian-overrides new file mode 100644 index 00000000..6f4a12f5 --- /dev/null +++ b/debian/libghc-propellor-prof.lintian-overrides @@ -0,0 +1,2 @@ +# merged with Debian changelog +no-upstream-changelog diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 25d3d4c3..e69de29b 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1 +0,0 @@ -binary-or-shlib-defines-rpath diff --git a/debian/patches/0001-remove-README.Debian-from-propellor.cabal.patch b/debian/patches/0001-remove-README.Debian-from-propellor.cabal.patch new file mode 100644 index 00000000..d28bbeb8 --- /dev/null +++ b/debian/patches/0001-remove-README.Debian-from-propellor.cabal.patch @@ -0,0 +1,23 @@ +From: Sean Whitton <spwhitton@spwhitton.name> +Date: Sat, 7 May 2016 08:47:15 -0700 +Subject: remove README.Debian from propellor.cabal +Forwarded: not-needed + +README.Debian has been renamed propellor.README.Debian to avoid its installation +in /usr/share/doc/libghc-propellor-dev. +--- + propellor.cabal | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/propellor.cabal b/propellor.cabal +index e931e3d..6cb5a4c 100644 +--- a/propellor.cabal ++++ b/propellor.cabal +@@ -22,7 +22,6 @@ Extra-Source-Files: + contrib/post-merge-hook + stack.yaml + debian/changelog +- debian/README.Debian + debian/compat + debian/control + debian/copyright diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..518b48b8 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-remove-README.Debian-from-propellor.cabal.patch diff --git a/debian/README.Debian b/debian/propellor.README.Debian index 851add5d..851add5d 100644 --- a/debian/README.Debian +++ b/debian/propellor.README.Debian diff --git a/debian/propellor.docs b/debian/propellor.docs new file mode 100644 index 00000000..2b234d90 --- /dev/null +++ b/debian/propellor.docs @@ -0,0 +1 @@ +doc/README.mdwn diff --git a/debian/propellor.links b/debian/propellor.links new file mode 100644 index 00000000..c92b1705 --- /dev/null +++ b/debian/propellor.links @@ -0,0 +1 @@ +/usr/share/doc/propellor/changelog.Debian.gz /usr/share/doc/propellor/changelog.gz diff --git a/debian/propellor.lintian-overrides b/debian/propellor.lintian-overrides new file mode 100644 index 00000000..7ce43aae --- /dev/null +++ b/debian/propellor.lintian-overrides @@ -0,0 +1,6 @@ +binary-or-shlib-defines-rpath +hardening-no-relro +# the binary package names make the distinctions clear +duplicate-long-description +# the binary package names make the distinctions clear +duplicate-short-description diff --git a/debian/propellor.manpages b/debian/propellor.manpages new file mode 100644 index 00000000..263e13a3 --- /dev/null +++ b/debian/propellor.manpages @@ -0,0 +1 @@ +propellor.1 diff --git a/debian/rules b/debian/rules index a71212db..b5eea986 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,15 @@ #!/usr/bin/make -f +# don't install CHANGELOG as it duplicates d/changelog +DEB_INSTALL_CHANGELOGS_ALL=-XCHANGELOG + # Avoid using cabal, as it writes to $HOME export CABAL=./Setup -%: - dh $@ - -override_dh_auto_build: +build/propellor:: $(MAKE) build -override_dh_installdocs: - dh_installdocs doc/README.mdwn -override_dh_installman: - dh_installman propellor.1 +install/propellor:: + DESTDIR=$(CURDIR)/debian/propellor $(MAKE) install + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/hlibrary.mk diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 00000000..d5de3046 --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,5 @@ +debian-watch-may-check-gpg-signature +# the binary package names make the distinctions clear +duplicate-long-description +# the binary package names make the distinctions clear +duplicate-short-description diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 00000000..fdf8d52d --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +extend-diff-ignore = "(^|/)(\.cabal-sandbox|docsets|\.dir-locals\.el|cabal\.sandbox\.config)" diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..2d76ff3a --- /dev/null +++ b/debian/watch @@ -0,0 +1,5 @@ +# note that the tarball this watch file finds is not upstream's official release +# tarball (which does not exist) + +version=3 +https://hackage.haskell.org/package/propellor /package/propellor-.+/propellor-(.+).tar.gz |