Control: tags -1 - moreinfo
thanks
Hi Jelmer,
Am Mon, Feb 26, 2024 at 03:14:20PM +0000 schrieb Jelmer Vernooij:
> On Thu, Feb 22, 2024 at 08:30:46AM +0100, Andreas Tille wrote:
> > if upstream/metadata are added this is not added+commited to
> > the packaging repository. There is also no changelog created
> > which should be something like
> >
> > * Add upstream metadata
>
> Are you specifying --update-changelog ?
Not explicitly yet. I'm pretty sure when I started calling
lintian-brush from routine-update changelog was updated. I changed now
to:
diff --git a/debian/changelog b/debian/changelog
index 1a7aca1..4083c5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ routine-update (0.2.1) UNRELEASED; urgency=medium
* Deal with other packaging branches than master even if debian/gbp.conf
is missing
+ * Make sure changelog will be updated
-- Andreas Tille <ti...@debian.org> Thu, 22 Feb 2024 07:49:24 +0100
diff --git a/routine-update b/routine-update
index f1eaa23..b13748d 100755
--- a/routine-update
+++ b/routine-update
@@ -777,17 +777,17 @@ if grep -q -P '\t' debian/copyright ; then
dch_git_commit "No tab in license text"
fi
-LIBRUSH=$(lintian-brush 2>&1 | head -n1)
+LIBRUSH=$(lintian-brush --update-changelog 2>&1 | head -n1)
if [ "$LIBRUSH" != "No changes made." ]; then
echo "I: lintian-brush was doing some changes"
fi
-AMHINTS=$(apply-multiarch-hints 2>&1 | head -n1)
+AMHINTS=$(apply-multiarch-hints --update-changelog 2>&1 | head -n1)
if [ "$AMHINTS" != "Nothing to do." ]; then
echo "I: apply-multiarch-hints was doing some changes"
fi
-DSOBSOLETE=$(deb-scrub-obsolete 2>&1 | wc -l)
+DSOBSOLETE=$(deb-scrub-obsolete --update-changelog 2>&1 | wc -l)
if [ "$DSOBSOLETE" -gt 1 ]; then
echo "I: deb-scrub-obsolete was doing some changes"
fi
And as you can see in my other bug report
#1060338 lintian-brush: Changelog entries are lacking asterisk
there actually *are* changelog entries ... but they are more ugly
than before.
> By default lintian-brush
> autodetects whether it needs to update the changelog.
Well, this actual bug is about "if upstream/metadata are added this is
not added+commited to the packaging repository". It simply happens that
upstream/metadata is added and after lintian-brush git consideres the
local repository not clean any more since there are files that are not
yet added. You should be able to verify this by simply removing
upstream/metadata and run lintian-brush (or whatever tool finally is
adding this file.) I would not mind about a missing changelog entry but
at least the freshly created file should be added. I'm pretty sure this
is a regression since that worked before.
> You can see whether it thinks it needs to update the changelog by running
> ``detect-changelog-behaviour``.
I simply want to have a changelog entry once something was changed.
> (Also happy to take bug reports on the autodetection behaviour not working
> well,
> but in that case, please provide extra context).
This was not really the point of my bug report but if I notice something
I will file an according bug report.
Kind regards and thanks a lot for all those Janitor tools which are
really helpful.
Kind regards
Andreas.
--
http://fam-tille.de
