mirror/weewx
1
0
Fork 0
mirror of https://github.com/weewx/weewx.git synced 2026-05-24 17:55:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/weewx/weewx

Browse Source
This commit is contained in:
Tom Keffer
2016-10-05 05:56:35 -07:00
parent 22fdd1c2a1 41b19e3098
commit 201b93c9c3
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
makefile
View File

@@ -149,19 +149,16 @@ version:
mv docs/$$f.tmp docs/$$f; \
done
sed -e 's/version =.*/version = $(VERSION)/' weewx.conf > weewx.conf.tmp; mv weewx.conf.tmp weewx.conf
make deb-changelog
make rpm-changelog
DEBREVISION=1
DEBVER=$(VERSION)-$(DEBREVISION)
DEBCHANGED=$(shell grep "$(DEBVER)" pkg/debian/changelog)
# add a skeleton entry to deb changelog
deb-changelog:
ifeq ("$(DEBCHANGED)","")
pkg/mkchangelog.pl --action stub --format debian --release-version $(DEBVER) > pkg/debian/changelog.new
cat pkg/debian/changelog >> pkg/debian/changelog.new
mv pkg/debian/changelog.new pkg/debian/changelog
endif
if [ "`grep $(DEBVER) pkg/debian/changelog`" = "" ]; then \
pkg/mkchangelog.pl --action stub --format debian --release-version $(DEBVER) > pkg/debian/changelog.new; \
cat pkg/debian/changelog >> pkg/debian/changelog.new; \
mv pkg/debian/changelog.new pkg/debian/changelog; \
fi
# use dpkg-buildpackage to create the debian package
# -us -uc - skip gpg signature on .dsc and .changes
@@ -206,14 +203,13 @@ upload-deb:
RPMREVISION=1
RPMVER=$(VERSION)-$(RPMREVISION)
RPMCHANGED=$(shell grep "$(RPMVER)" pkg/changelog.rpm)
# add a skeleton entry to rpm changelog
rpm-changelog:
ifeq ("$(RPMCHANGED)","")
pkg/mkchangelog.pl --action stub --format redhat --release-version $(RPMVER) > pkg/changelog.rpm.new
cat pkg/changelog.rpm >> pkg/changelog.rpm.new
mv pkg/changelog.rpm.new pkg/changelog.rpm
endif
if [ "`grep $(RPMVER)1 pkg/changelog.rpm`" = "" ]; then \
pkg/mkchangelog.pl --action stub --format redhat --release-version $(RPMVER) > pkg/changelog.rpm.new; \
cat pkg/changelog.rpm >> pkg/changelog.rpm.new; \
mv pkg/changelog.rpm.new pkg/changelog.rpm; \
fi
# use rpmbuild to create the rpm package
RPMARCH=noarch