[OpenLayers-Commits] r5637 - in sandbox/crschmidt/debian: . patches
commits at openlayers.org
commits at openlayers.org
Thu Jan 3 02:41:54 EST 2008
Author: crschmidt
Date: 2008-01-03 02:41:54 -0500 (Thu, 03 Jan 2008)
New Revision: 5637
Removed:
sandbox/crschmidt/debian/patches/remove_jsmin.dpatch
Modified:
sandbox/crschmidt/debian/changelog
sandbox/crschmidt/debian/patches/00list
sandbox/crschmidt/debian/rules
sandbox/crschmidt/debian/watch
Log:
Change the upstream tarball via get-orig-source target in rules to remove
jsmin, which is non-free.
Modified: sandbox/crschmidt/debian/changelog
===================================================================
--- sandbox/crschmidt/debian/changelog 2008-01-03 06:57:38 UTC (rev 5636)
+++ sandbox/crschmidt/debian/changelog 2008-01-03 07:41:54 UTC (rev 5637)
@@ -1,6 +1,6 @@
-openlayers (2.5-1) unstable; urgency=low
+openlayers (2.5~dfsg-1) unstable; urgency=low
* Initial release (Closes: #430359)
- -- Christopher Schmidt <crschmidt at metacarta.com> Sat, 29 Dec 2007 07:17:03 -0500
+ -- Christopher Schmidt <crschmidt at metacarta.com> Thu, 3 Jan 2008 02:38:45 -0500
Modified: sandbox/crschmidt/debian/patches/00list
===================================================================
--- sandbox/crschmidt/debian/patches/00list 2008-01-03 06:57:38 UTC (rev 5636)
+++ sandbox/crschmidt/debian/patches/00list 2008-01-03 07:41:54 UTC (rev 5637)
@@ -1,3 +1,2 @@
apache_license_fixes
-remove_jsmin
update_build
Deleted: sandbox/crschmidt/debian/patches/remove_jsmin.dpatch
===================================================================
--- sandbox/crschmidt/debian/patches/remove_jsmin.dpatch 2008-01-03 06:57:38 UTC (rev 5636)
+++ sandbox/crschmidt/debian/patches/remove_jsmin.dpatch 2008-01-03 07:41:54 UTC (rev 5637)
@@ -1,503 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## remove_jsmin.dpatch by <crschmidt at localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad OpenLayers-2.5~/tools/jsmin.c OpenLayers-2.5/tools/jsmin.c
---- OpenLayers-2.5~/tools/jsmin.c 2006-09-09 11:46:17.000000000 -0400
-+++ OpenLayers-2.5/tools/jsmin.c 1969-12-31 19:00:00.000000000 -0500
-@@ -1,272 +0,0 @@
--/* jsmin.c
-- 2006-05-04
--
--Copyright (c) 2002 Douglas Crockford (www.crockford.com)
--
--Permission is hereby granted, free of charge, to any person obtaining a copy of
--this software and associated documentation files (the "Software"), to deal in
--the Software without restriction, including without limitation the rights to
--use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
--of the Software, and to permit persons to whom the Software is furnished to do
--so, subject to the following conditions:
--
--The above copyright notice and this permission notice shall be included in all
--copies or substantial portions of the Software.
--
--The Software shall be used for Good, not Evil.
--
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--SOFTWARE.
--*/
--
--#include <stdlib.h>
--#include <stdio.h>
--
--static int theA;
--static int theB;
--static int theLookahead = EOF;
--
--
--/* isAlphanum -- return true if the character is a letter, digit, underscore,
-- dollar sign, or non-ASCII character.
--*/
--
--static int
--isAlphanum(int c)
--{
-- return ((c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') ||
-- (c >= 'A' && c <= 'Z') || c == '_' || c == '$' || c == '\\' ||
-- c > 126);
--}
--
--
--/* get -- return the next character from stdin. Watch out for lookahead. If
-- the character is a control character, translate it to a space or
-- linefeed.
--*/
--
--static int
--get()
--{
-- int c = theLookahead;
-- theLookahead = EOF;
-- if (c == EOF) {
-- c = getc(stdin);
-- }
-- if (c >= ' ' || c == '\n' || c == EOF) {
-- return c;
-- }
-- if (c == '\r') {
-- return '\n';
-- }
-- return ' ';
--}
--
--
--/* peek -- get the next character without getting it.
--*/
--
--static int
--peek()
--{
-- theLookahead = get();
-- return theLookahead;
--}
--
--
--/* next -- get the next character, excluding comments. peek() is used to see
-- if a '/' is followed by a '/' or '*'.
--*/
--
--static int
--next()
--{
-- int c = get();
-- if (c == '/') {
-- switch (peek()) {
-- case '/':
-- for (;;) {
-- c = get();
-- if (c <= '\n') {
-- return c;
-- }
-- }
-- case '*':
-- get();
-- for (;;) {
-- switch (get()) {
-- case '*':
-- if (peek() == '/') {
-- get();
-- return ' ';
-- }
-- break;
-- case EOF:
-- fprintf(stderr, "Error: JSMIN Unterminated comment.\n");
-- exit(1);
-- }
-- }
-- default:
-- return c;
-- }
-- }
-- return c;
--}
--
--
--/* action -- do something! What you do is determined by the argument:
-- 1 Output A. Copy B to A. Get the next B.
-- 2 Copy B to A. Get the next B. (Delete A).
-- 3 Get the next B. (Delete B).
-- action treats a string as a single character. Wow!
-- action recognizes a regular expression if it is preceded by ( or , or =.
--*/
--
--static void
--action(int d)
--{
-- switch (d) {
-- case 1:
-- putc(theA, stdout);
-- case 2:
-- theA = theB;
-- if (theA == '\'' || theA == '"') {
-- for (;;) {
-- putc(theA, stdout);
-- theA = get();
-- if (theA == theB) {
-- break;
-- }
-- if (theA <= '\n') {
-- fprintf(stderr,
--"Error: JSMIN unterminated string literal: %c\n", theA);
-- exit(1);
-- }
-- if (theA == '\\') {
-- putc(theA, stdout);
-- theA = get();
-- }
-- }
-- }
-- case 3:
-- theB = next();
-- if (theB == '/' && (theA == '(' || theA == ',' || theA == '=' ||
-- theA == ':' || theA == '[' || theA == '!' || theA == '&' ||
-- theA == '|')) {
-- putc(theA, stdout);
-- putc(theB, stdout);
-- for (;;) {
-- theA = get();
-- if (theA == '/') {
-- break;
-- } else if (theA =='\\') {
-- putc(theA, stdout);
-- theA = get();
-- } else if (theA <= '\n') {
-- fprintf(stderr,
--"Error: JSMIN unterminated Regular Expression literal.\n", theA);
-- exit(1);
-- }
-- putc(theA, stdout);
-- }
-- theB = next();
-- }
-- }
--}
--
--
--/* jsmin -- Copy the input to the output, deleting the characters which are
-- insignificant to JavaScript. Comments will be removed. Tabs will be
-- replaced with spaces. Carriage returns will be replaced with linefeeds.
-- Most spaces and linefeeds will be removed.
--*/
--
--static void
--jsmin()
--{
-- theA = '\n';
-- action(3);
-- while (theA != EOF) {
-- switch (theA) {
-- case ' ':
-- if (isAlphanum(theB)) {
-- action(1);
-- } else {
-- action(2);
-- }
-- break;
-- case '\n':
-- switch (theB) {
-- case '{':
-- case '[':
-- case '(':
-- case '+':
-- case '-':
-- action(1);
-- break;
-- case ' ':
-- action(3);
-- break;
-- default:
-- if (isAlphanum(theB)) {
-- action(1);
-- } else {
-- action(2);
-- }
-- }
-- break;
-- default:
-- switch (theB) {
-- case ' ':
-- if (isAlphanum(theA)) {
-- action(1);
-- break;
-- }
-- action(3);
-- break;
-- case '\n':
-- switch (theA) {
-- case '}':
-- case ']':
-- case ')':
-- case '+':
-- case '-':
-- case '"':
-- case '\'':
-- action(1);
-- break;
-- default:
-- if (isAlphanum(theA)) {
-- action(1);
-- } else {
-- action(3);
-- }
-- }
-- break;
-- default:
-- action(1);
-- break;
-- }
-- }
-- }
--}
--
--
--/* main -- Output any command line arguments as comments
-- and then minify the input.
--*/
--extern int
--main(int argc, char* argv[])
--{
-- int i;
-- for (i = 1; i < argc; i += 1) {
-- fprintf(stdout, "// %s\n", argv[i]);
-- }
-- jsmin();
-- return 0;
--}
-diff -urNad OpenLayers-2.5~/tools/jsmin.py OpenLayers-2.5/tools/jsmin.py
---- OpenLayers-2.5~/tools/jsmin.py 2007-04-02 12:46:34.000000000 -0400
-+++ OpenLayers-2.5/tools/jsmin.py 1969-12-31 19:00:00.000000000 -0500
-@@ -1,216 +0,0 @@
--#!/usr/bin/python
--
--# This code is original from jsmin by Douglas Crockford, it was translated to
--# Python by Baruch Even. The original code had the following copyright and
--# license.
--#
--# /* jsmin.c
--# 2007-01-08
--#
--# Copyright (c) 2002 Douglas Crockford (www.crockford.com)
--#
--# Permission is hereby granted, free of charge, to any person obtaining a copy of
--# this software and associated documentation files (the "Software"), to deal in
--# the Software without restriction, including without limitation the rights to
--# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
--# of the Software, and to permit persons to whom the Software is furnished to do
--# so, subject to the following conditions:
--#
--# The above copyright notice and this permission notice shall be included in all
--# copies or substantial portions of the Software.
--#
--# The Software shall be used for Good, not Evil.
--#
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--# SOFTWARE.
--# */
--
--from StringIO import StringIO
--
--def jsmin(js):
-- ins = StringIO(js)
-- outs = StringIO()
-- JavascriptMinify().minify(ins, outs)
-- str = outs.getvalue()
-- if len(str) > 0 and str[0] == '\n':
-- str = str[1:]
-- return str
--
--def isAlphanum(c):
-- """return true if the character is a letter, digit, underscore,
-- dollar sign, or non-ASCII character.
-- """
-- return ((c >= 'a' and c <= 'z') or (c >= '0' and c <= '9') or
-- (c >= 'A' and c <= 'Z') or c == '_' or c == '$' or c == '\\' or (c is not None and ord(c) > 126));
--
--class UnterminatedComment(Exception):
-- pass
--
--class UnterminatedStringLiteral(Exception):
-- pass
--
--class UnterminatedRegularExpression(Exception):
-- pass
--
--class JavascriptMinify(object):
--
-- def _outA(self):
-- self.outstream.write(self.theA)
-- def _outB(self):
-- self.outstream.write(self.theB)
--
-- def _get(self):
-- """return the next character from stdin. Watch out for lookahead. If
-- the character is a control character, translate it to a space or
-- linefeed.
-- """
-- c = self.theLookahead
-- self.theLookahead = None
-- if c == None:
-- c = self.instream.read(1)
-- if c >= ' ' or c == '\n':
-- return c
-- if c == '': # EOF
-- return '\000'
-- if c == '\r':
-- return '\n'
-- return ' '
--
-- def _peek(self):
-- self.theLookahead = self._get()
-- return self.theLookahead
--
-- def _next(self):
-- """get the next character, excluding comments. peek() is used to see
-- if a '/' is followed by a '/' or '*'.
-- """
-- c = self._get()
-- if c == '/':
-- p = self._peek()
-- if p == '/':
-- c = self._get()
-- while c > '\n':
-- c = self._get()
-- return c
-- if p == '*':
-- c = self._get()
-- while 1:
-- c = self._get()
-- if c == '*':
-- if self._peek() == '/':
-- self._get()
-- return ' '
-- if c == '\000':
-- raise UnterminatedComment()
--
-- return c
--
-- def _action(self, action):
-- """do something! What you do is determined by the argument:
-- 1 Output A. Copy B to A. Get the next B.
-- 2 Copy B to A. Get the next B. (Delete A).
-- 3 Get the next B. (Delete B).
-- action treats a string as a single character. Wow!
-- action recognizes a regular expression if it is preceded by ( or , or =.
-- """
-- if action <= 1:
-- self._outA()
--
-- if action <= 2:
-- self.theA = self.theB
-- if self.theA == "'" or self.theA == '"':
-- while 1:
-- self._outA()
-- self.theA = self._get()
-- if self.theA == self.theB:
-- break
-- if self.theA <= '\n':
-- raise UnterminatedStringLiteral()
-- if self.theA == '\\':
-- self._outA()
-- self.theA = self._get()
--
--
-- if action <= 3:
-- self.theB = self._next()
-- if self.theB == '/' and (self.theA == '(' or self.theA == ',' or
-- self.theA == '=' or self.theA == ':' or
-- self.theA == '[' or self.theA == '?' or
-- self.theA == '!' or self.theA == '&' or
-- self.theA == '|'):
-- self._outA()
-- self._outB()
-- while 1:
-- self.theA = self._get()
-- if self.theA == '/':
-- break
-- elif self.theA == '\\':
-- self._outA()
-- self.theA = self._get()
-- elif self.theA <= '\n':
-- raise UnterminatedRegularExpression()
-- self._outA()
-- self.theB = self._next()
--
--
-- def _jsmin(self):
-- """Copy the input to the output, deleting the characters which are
-- insignificant to JavaScript. Comments will be removed. Tabs will be
-- replaced with spaces. Carriage returns will be replaced with linefeeds.
-- Most spaces and linefeeds will be removed.
-- """
-- self.theA = '\n'
-- self._action(3)
--
-- while self.theA != '\000':
-- if self.theA == ' ':
-- if isAlphanum(self.theB):
-- self._action(1)
-- else:
-- self._action(2)
-- elif self.theA == '\n':
-- if self.theB in ['{', '[', '(', '+', '-']:
-- self._action(1)
-- elif self.theB == ' ':
-- self._action(3)
-- else:
-- if isAlphanum(self.theB):
-- self._action(1)
-- else:
-- self._action(2)
-- else:
-- if self.theB == ' ':
-- if isAlphanum(self.theA):
-- self._action(1)
-- else:
-- self._action(3)
-- elif self.theB == '\n':
-- if self.theA in ['}', ']', ')', '+', '-', '"', '\'']:
-- self._action(1)
-- else:
-- if isAlphanum(self.theA):
-- self._action(1)
-- else:
-- self._action(3)
-- else:
-- self._action(1)
--
-- def minify(self, instream, outstream):
-- self.instream = instream
-- self.outstream = outstream
-- self.theA = None
-- self.thaB = None
-- self.theLookahead = None
--
-- self._jsmin()
-- self.instream.close()
--
--if __name__ == '__main__':
-- import sys
-- jsm = JavascriptMinify()
-- jsm.minify(sys.stdin, sys.stdout)
Modified: sandbox/crschmidt/debian/rules
===================================================================
--- sandbox/crschmidt/debian/rules 2008-01-03 06:57:38 UTC (rev 5636)
+++ sandbox/crschmidt/debian/rules 2008-01-03 07:41:54 UTC (rev 5637)
@@ -8,6 +8,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname )
+
+
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -98,8 +101,19 @@
dh_md5sums
dh_builddeb
+
binary-arch: build install
# nothing is architecture dependent
binary: binary-indep binary-arch
+
+get-orig-source:
+ export USVERSION=`uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p'`
+ cd ${DEBIAN_DIR}/..
+ @test -d ../tarballs || mkdir -p ../tarballs
+ wget -O ../tarballs/OpenLayers-$(USVERSION).tar.gz http://openlayers.org/download/OpenLayers-$(USVERSION).tar.gz
+ tar -zxf ../tarballs/OpenLayers-$(USVERSION).tar.gz -C ../tarballs
+ rm ../tarballs/OpenLayers-$(USVERSION)/tools/jsmin.*
+ tar -czf ../tarballs/OpenLayers-$(USVERSION)~dfsg.orig.tar.gz ../tarballs/OpenLayers-$(USVERSION)
+
.PHONY: build clean binary-indep binary-arch binary install configure
Modified: sandbox/crschmidt/debian/watch
===================================================================
--- sandbox/crschmidt/debian/watch 2008-01-03 06:57:38 UTC (rev 5636)
+++ sandbox/crschmidt/debian/watch 2008-01-03 07:41:54 UTC (rev 5637)
@@ -1,3 +1,2 @@
version=3
-
-http://openlayers.org/ OpenLayers-(.*)\.tar\.gz
+http://openlayers.org/ /download/OpenLayers-(.*)\.tar\.gz
More information about the Commits
mailing list