From d6b22f4287dfd54f0ae1d9aabff56c5ad24c7eb0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 10 Jun 2015 15:48:22 -0400
Subject: merged pkgng plugin

---
 debian/changelog                   | 1 +
 doc/todo/freebsd_pkgng_plugin.mdwn | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8157f10..6e319fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 etckeeper (1.18.2) UNRELEASED; urgency=medium
 
   * Use getent utility instead of perl. (Elan Ruusamäe)
+  * Initial FreeBSD support with pkgng plugin. (William Johansson)
 
  -- Joey Hess <id@joeyh.name>  Mon, 01 Jun 2015 09:15:34 -0400
 
diff --git a/doc/todo/freebsd_pkgng_plugin.mdwn b/doc/todo/freebsd_pkgng_plugin.mdwn
index 81edb89..359f37b 100644
--- a/doc/todo/freebsd_pkgng_plugin.mdwn
+++ b/doc/todo/freebsd_pkgng_plugin.mdwn
@@ -1,3 +1,7 @@
 Get the same integration with FreeBSD pkg as with other package managers.
 
 Basic working plugin available at: <https://github.com/radhus/etckeeper/commit/f849bcc558c2c83b8738e31d2aee56d979c39555>
+
+> I've merged this. Of course it would be good to get the main Makefile
+> able to install it. Please open new todos if you have updates and thanks!
+> --[[Joey]]
-- 
cgit v1.2.3