summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-05 12:20:39 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-09-05 12:20:39 -0400
commited7da04cc121ecb9654bcb163dcd479006c26ab9 (patch)
tree05ec5a88add8cc0ccab8fe121d89cf0dabd4139c
parent5e2b864befc960b49b51fec6e8cddc32553a03b3 (diff)
Fix Feeds display in build flags.
-rw-r--r--BuildFlags.hs2
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/version_doesn__39__t_show___34__Feeds__34___but_podcasting_feature_working.mdwn2
3 files changed, 3 insertions, 2 deletions
diff --git a/BuildFlags.hs b/BuildFlags.hs
index c14bfef11..384590c57 100644
--- a/BuildFlags.hs
+++ b/BuildFlags.hs
@@ -48,7 +48,7 @@ buildFlags = filter (not . null)
#ifdef WITH_DNS
, "DNS"
#endif
-#ifdef WITH_FEEDS
+#ifdef WITH_FEED
, "Feeds"
#endif
]
diff --git a/debian/changelog b/debian/changelog
index bf715455a..0511fa950 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ git-annex (4.20130828) UNRELEASED; urgency=low
rather than the hybrid approach. See documentation for advantages
and disadvantages, but encryption=hybrid is the recommended scheme still.
(Thanks, guilhem for the patch.)
+ * Fix Feeds display in build flags.
-- Joey Hess <joeyh@debian.org> Tue, 27 Aug 2013 11:03:00 -0400
diff --git a/doc/bugs/version_doesn__39__t_show___34__Feeds__34___but_podcasting_feature_working.mdwn b/doc/bugs/version_doesn__39__t_show___34__Feeds__34___but_podcasting_feature_working.mdwn
index 06f8a75b9..64e83526f 100644
--- a/doc/bugs/version_doesn__39__t_show___34__Feeds__34___but_podcasting_feature_working.mdwn
+++ b/doc/bugs/version_doesn__39__t_show___34__Feeds__34___but_podcasting_feature_working.mdwn
@@ -25,4 +25,4 @@ importfeed http://feeds.feedburner.com/OpenMetalcast/ogg
....<downloads the episodes etc>
"""]]
-> Forgot I had to manually add that. [[done]] --[[Joey]]
+> Forgot I had to manually add that. [[done]] (really this time!) --[[Joey]]