Initialize conflictSeverity variable.

[toast/confclerk.git] / confclerk.pro

diff --git a/confclerk.pro b/confclerk.pro
index 1421de301f0a4e8ce8dbdf29ad7d25bde6f7d344..22f8f79afc7d441ac529a28e581dd8b6468be044 100644 (file)
--- a/confclerk.pro
+++ b/confclerk.pro
@@ -16,11 +16,11 @@ QMAKE_EXTRA_TARGETS += changelog icon man release releaseclean tarball signature
 
 changelog.target = ChangeLog
 changelog.commands = \
-       svn up && svn2cl --group-by-day --reparagraph
+       git pull && /usr/share/gnulib/build-aux/gitlog-to-changelog > ChangeLog
 changelog.CONFIG = phony
 
 icon.target = data/$${TARGET}.png
-icon.commands = convert data/$${TARGET}.svg data/$${TARGET}.png
+icon.commands = convert -transparent white data/$${TARGET}.svg data/$${TARGET}.png
 icon.depends = data/$${TARGET}.svg
 
 man.target = data/$${TARGET}.1
@@ -30,7 +30,7 @@ man.depends = data/$${TARGET}.pod
 
 releaseclean.commands = \
  $(DEL_FILE) data/$${TARGET}.png data/$${TARGET}.1 ChangeLog $${TARGET}-$${VERSION}.tar.gz.asc
-release.depends = releaseclean tarball signature
+release.depends = distclean releaseclean tarball signature
 #releaseclean.CONFIG = phony
 
 tarball.target = $${TARGET}-$${VERSION}.tar.gz
@@ -42,7 +42,7 @@ tarball.commands = \
                $${TARGET}-$${VERSION}/$${TARGET}-$${VERSION}.tar.gz \
                $(DEL_FILE) -r $${TARGET}-$${VERSION}/$${TARGET}-$${VERSION} \
                $${TARGET}-$${VERSION}/Makefile ; \
-       tar -cz --exclude=.svn --exclude=*.tar.gz -f $$tarball.target $${TARGET}-$${VERSION} ; \
+       tar -cz --exclude=.svn --exclude=.git --exclude=*.tar.gz -f $$tarball.target $${TARGET}-$${VERSION} ; \
        $(DEL_FILE) -r $${TARGET}-$${VERSION}
 tarball.depends = changelog icon man