From 2d0bfad6745102dcc7258df07a612e83b356c3ed Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Fri, 14 Dec 2012 22:04:48 +0100 Subject: [PATCH] Replace with github links. --- MANIFEST.in | 3 ++- Makefile | 32 +++++++++++++------------------- doc/README.txt | 5 +++++ patool.freecode | 10 +++++----- setup.py | 4 ++-- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 77de7bc..b00a589 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,5 @@ include MANIFEST.in include COPYING doc/*.1 doc/*.txt doc/*.tmpl doc/icon/* -include Makefile *.bat *.bash-completion +include Makefile *.bash-completion +include scripts/*.bat recursive-include tests *.py diff --git a/Makefile b/Makefile index 807be6d..f3e760e 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ PYVER:=2.7 PYTHON:=python$(PYVER) APPNAME:=patool VERSION:=$(shell $(PYTHON) setup.py --version) -ARCHIVE:=$(APPNAME)-$(VERSION).tar.gz +ARCHIVE_SOURCE:=$(APPNAME)-$(VERSION).tar.gz ARCHIVE_RPM:=$(APPNAME)-$(VERSION)-1.x86_64.rpm ARCHIVE_WIN32:=$(APPNAME)-$(VERSION).exe PY_FILES_DIRS := patool setup.py patoolib tests @@ -30,34 +30,31 @@ chmod: find . -type d -exec chmod 755 {} \; dist: - git archive --format=tar --prefix=$(APPNAME)-$(VERSION)/ HEAD | gzip -9 > ../$(ARCHIVE) -# cd .. && zip -r - patool-git -x "**/.git/**" > $(HOME)/temp/share/patool-devel.zip + $(PYTHON) setup.py bdist_rpm + git archive --format=tar --prefix=$(APPNAME)-$(VERSION)/ HEAD | gzip -9 > dist/$(ARCHIVE_SOURCE) + [ ! -f ../$(ARCHIVE_WIN32) ] || cp ../$(ARCHIVE_WIN32) dist sign: - [ -f ../$(ARCHIVE).sha1 ] || sha1sum ../$(ARCHIVE) > ../$(ARCHIVE).sha1 - [ -f ../$(ARCHIVE).asc ] || gpg --detach-sign --armor ../$(ARCHIVE) - [ -f ../$(ARCHIVE_WIN32).sha1 ] || sha1sum ../$(ARCHIVE_WIN32) > ../$(ARCHIVE_WIN32).sha1 - [ -f ../$(ARCHIVE_WIN32).asc ] || gpg --detach-sign --armor ../$(ARCHIVE_WIN32) - [ -f dist/$(ARCHIVE_RPM).sha1 ] || sha1sum dist/$(ARCHIVE_RPM) > dist/$(ARCHIVE_RPM).sha1 + [ -f dist/$(ARCHIVE_SOURCE).asc ] || gpg --detach-sign --armor dist/$(ARCHIVE_SOURCE) + [ -f dist/$(ARCHIVE_WIN32).asc ] || gpg --detach-sign --armor dist/$(ARCHIVE_WIN32) [ -f dist/$(ARCHIVE_RPM).asc ] || gpg --detach-sign --armor dist/$(ARCHIVE_RPM) -upload: doc/README.md sign - rsync -avP -e ssh doc/README.md ../$(ARCHIVE)* ../$(ARCHIVE_WIN32)* dist/$(ARCHIVE_RPM)* calvin,patool@frs.sourceforge.net:/home/frs/project/p/pa/patool/$(VERSION)/ +upload: dist/README.md sign + github-upload wummel patool dist/* + make -C $(HOMEPAGE) -doc/README.md: doc/README-Download.md.tmpl doc/changelog.txt -# copying readme for sourceforge downloads +dist/README.md: doc/README-Download.md.tmpl doc/changelog.txt +# copying readme for release sed -e 's/{APPNAME}/$(APPNAME)/g' -e 's/{VERSION}/$(VERSION)/g' $< > $@ # append changelog awk '/released/ {c++}; c==2 {exit}; {print " " $$0}' doc/changelog.txt >> $@ - release: clean releasecheck dist upload git tag upstream/$(VERSION) @echo "Register at Python Package Index..." $(PYTHON) setup.py register freecode-submit < patool.freecode - releasecheck: check test @if egrep -i "xx\.|xxxx|\.xx" doc/changelog.txt > /dev/null; then \ echo "Could not release: edit doc/changelog.txt release date"; false; \ @@ -74,9 +71,6 @@ releasecheck: check test app: clean chmod $(PYTHON) setup.py py2app $(PY2APPOPTS) -rpm: - $(PYTHON) setup.py bdist_rpm - # The check programs used here are mostly local scripts on my private system. # So for other developers there is no need to execute this target. check: @@ -110,7 +104,7 @@ update-copyright: update-copyright --holder="Bastian Kleineidam" changelog: - sftrack_changelog patool calvin@users.sourceforge.net doc/changelog.txt $(DRYRUN) + github-changelog $(DRYRUN) wummel patool doc/changelog.txt -.PHONY: changelog update-copyright deb test clean count pyflakes check rpm app +.PHONY: changelog update-copyright deb test clean count pyflakes check app .PHONY: releasecheck release upload sign dist chmod all diff --git a/doc/README.txt b/doc/README.txt index 8f1e6e0..28390a5 100644 --- a/doc/README.txt +++ b/doc/README.txt @@ -32,3 +32,8 @@ patool create --verbose myfiles.zip file1.txt dir/ patool diff release1.0.tar.gz release2.0.zip patool repack linux-2.6.33.tar.gz linux-2.6.33.tar.bz2 ``` + +Website +-------- +See http://wummel.github.com/patool/ for more info and downloads. + diff --git a/patool.freecode b/patool.freecode index 0a47f3d..0b9fafe 100644 --- a/patool.freecode +++ b/patool.freecode @@ -2,11 +2,11 @@ Project: patool Version: 0.17 Release-Focus: Minor feature enhancements Hide: N -Website-URL: http://patool.sourceforge.net/ -Changelog-URL: http://patool.git.sourceforge.net/git/gitweb.cgi?p=patool/patool;a=blob;f=doc/changelog.txt;hb=HEAD -Tar/GZ-URL: http://downloads.sourceforge.net/patool/patool-${version}.tar.gz -GIT-Tree-URL: http://patool.git.sourceforge.net/ -Windows-installer-URL: http://downloads.sourceforge.net/patool/patool-${version}.win32.exe +Website-URL: http://github.com/wummel/patool +Changelog-URL: https://github.com/wummel/patool/blob/master/doc/changelog.txt +Tar/GZ-URL: https://github.com/downloads/wummel/patool/patool-${version}.tar.gz +GIT-Tree-URL: https://github.com/wummel/patool.git +Windows-installer-URL: http://github.com/downloads/wummel/patool/patool-${version}.win32.exe Support for the following archive programs has been added: Monkey's Audio Compressor handling .ape archives, diff --git a/setup.py b/setup.py index 12a25ff..4821600 100644 --- a/setup.py +++ b/setup.py @@ -270,8 +270,8 @@ installed. maintainer = MyName, maintainer_email = MyEmail, license = "GPL", - url = "http://patool.sourceforge.net/", - download_url="http://sourceforge.net/projects/patool/files/", + url = "http://wummel.github.com/patool/", + download_url="http://wummel.github.com/patool/files/", packages = ['patoolib', 'patoolib.programs'], data_files = data_files, scripts = ['patool'],