From: Michael Schutte <michi@uiae.at>
Date: Tue, 7 May 2013 09:42:47 +0000 (+0200)
Subject: New upstream version 1.0+hg6923
X-Git-Tag: debian/1.0+hg6924-1~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=10dd809e3c62dac9afcb5592982306ab22198f65;p=dactyl.git

New upstream version 1.0+hg6923
---

10dd809e3c62dac9afcb5592982306ab22198f65
diff --cc debian/changelog
index 4df568d,0000000..9746a1b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,39 -1,0 +1,47 @@@
++dactyl (1.0+hg6923-1) UNRELEASED; urgency=low
++
++  * New upstream revision 6923 from the upstream Mercurial repository at
++    <https://code.google.com/p/dactyl/>.
++    - Supports Iceweasel/Firefox versions up to 22.0a1, closes: #706990.
++
++ -- Michael Schutte <michi@debian.org>  Tue, 07 May 2013 11:41:31 +0200
++
 +dactyl (1.0-1) experimental; urgency=low
 +
 +  * New upstream version.
 +  * Bump Standards-Version to 3.9.3, no changes required.
 +  * Add myself to Uploaders.
 +
 + -- Jérémy Bobbio <lunar@debian.org>  Sat, 28 Jul 2012 16:29:46 +0200
 +
 +dactyl (1.0~rc1-1) unstable; urgency=low
 +
 +  * New upstream version.
 +    - Supports Iceweasel/Firefox versions up to 11.*, closes: #653433.
 +  * debian/copyright: Do not combine license text with references in the
 +    License: line.
 +  * debian/rules: Add an explicitly .PHONY “binary” rule so make does not get
 +    confused by the new binary/ directory introduced by upstream.
 +
 + -- Michael Schutte <michi@debian.org>  Wed, 28 Dec 2011 21:23:42 +0100
 +
 +dactyl (1.0~b7.1-1) unstable; urgency=low
 +
 +  * New upstream version; supports Iceweasel/Firefox versions up to 8.*.
 +  * No source changes needed for this upload, drop debian/patches/.
 +  * debian/copyright: Add Mozilla Foundation copyright on Mozmill.
 +
 + -- Michael Schutte <michi@debian.org>  Sat, 08 Oct 2011 19:41:36 +0200
 +
 +dactyl (1.0~b6-2) unstable; urgency=low
 +
 +  * Ship NEWS in /usr/share/xul-ext/pentadactyl/.  :help needs this to
 +    generate the dactyl://help/versions page, closes: #637919.
 +
 + -- Michael Schutte <michi@debian.org>  Sun, 21 Aug 2011 09:40:32 +0200
 +
 +dactyl (1.0~b6-1) unstable; urgency=low
 +
 +  * Initial release, closes: #634847.  Only build pentadactyl for now.
 +
 + -- Michael Schutte <michi@debian.org>  Tue, 26 Jul 2011 12:03:07 +0200
diff --cc debian/rules
index 200263c,0000000..fecd4ef
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,49 -1,0 +1,50 @@@
 +#!/usr/bin/make -f
 +
 +PACKAGES=pentadactyl # teledactyl melodactyl
 +VERSION=$(shell dpkg-parsechangelog | \
 +	sed -n -e '/^Version:/ { s/^Version:\s*//; s/[^a-z0-9]/_/g; p }')
 +
 +%:
 +	dh $@ --with xul-ext
 +
 +# this silliness is needed due to the binary/ directory in the project root
 +.PHONY: binary
 +binary:
 +	dh binary --with xul-ext
 +
 +override_dh_auto_build:
 +	make DIRS=$(PACKAGES) MANGLE=chrome XPI_FILES='bootstrap.js NEWS' xpi
 +
 +override_dh_auto_install:
 +	for PACKAGE in $(PACKAGES); \
 +		do install-xpi -p xul-ext-$$PACKAGE downloads/$$PACKAGE-*.xpi; \
 +		done
 +
 +override_dh_auto_clean:
 +	make DIRS=$(PACKAGES) clean
 +	for PACKAGE in $(PACKAGES); \
 +		do rm -f $$PACKAGE/chrome.zip; \
 +		done
 +
 +override_dh_installchangelogs:
 +	for PACKAGE in $(PACKAGES); \
 +		do dh_installchangelogs -p xul-ext-$$PACKAGE $$PACKAGE/NEWS; \
 +		done
 +
 +UPSTREAM_REPO=../upstream
- UPSTREAM_REVISION=pentadactyl-1.0
++UPSTREAM_REVISION=6923
 +UPSTREAM_DEST=$(shell pwd)/dactyl.tar.gz
 +
 +get-orig-source:
 +	rm -f .hg-repo-created
 +	test -d $(UPSTREAM_REPO) || ( cd `dirname $(UPSTREAM_REPO)` && \
 +		hg clone http://dactyl.googlecode.com/hg/ `basename $(UPSTREAM_REPO)` && \
 +		touch .hg-repo-created )
 +	hg --cwd $(UPSTREAM_REPO) pull
 +	hg --cwd $(UPSTREAM_REPO) update
 +	hg --cwd $(UPSTREAM_REPO) archive \
 +		-r $(UPSTREAM_REVISION) -p dactyl \
- 		-X .hgtags -X common/javascript.vim \
++		-X .hgtags -X .hgsub -X .hgsubstate -X .hgignore \
++		-X common/javascript.vim \
 +		-t tgz $(UPSTREAM_DEST)
 +	test ! -f .hg-repo-created || ( rm -rf $(UPSTREAM_REPO); rm -f .hg-repo-created )