M .hgignore +1 -7
@@ 3,13 3,7 @@
\.py[co]$
^CMakeLists\.txt\.user$
^build/
-^debian/[^/]+\.debhelper$
-^debian/[^/]+\.substvars$
-^debian/\.debhelper/
-^debian/changelog$
-^debian/debhelper-
-^debian/files
-^debian/hgv/
+^debian/
^tests/\.testtimes$
^tests/.*\.err$
M Makefile +5 -4
@@ 19,7 19,7 @@ ifneq ($(QT_VERSION_MAJOR),)
override CMAKEFLAGS += -DUSE_QT$(QT_VERSION_MAJOR)=ON
endif
-DEBVERSION = $(shell hg log -r. -T'{latesttag % "0.1~{distance}"}hg{node|short}')
+DEB_VERSION = $(shell hg log -r. -T'{latesttag % "0.1~{distance}"}hg{node|short}')
export DEB_BUILD_OPTIONS=nocheck
DESTDIR =
@@ 57,9 57,10 @@ build:
.PHONY: deb
deb:
- cp debian/changelog.release debian/changelog
- $(DEBCHANGE) -v "$(DEBVERSION)" "New snapshot build."
- $(DEBUILD) -uc -us
+ $(RM) -R debian
+ cp -pR contrib/debian-qt5 debian
+ $(DEBCHANGE) --create --package hgv -v "$(DEB_VERSION)" "New snapshot build."
+ $(DEBUILD) -uc -us --build=binary
.PHONY: clean
clean: