Omit contrib in source tarball

4 files changed, 46 insertions, 29 deletions

diff --git a/debian/changelog b/debian/changelog
index 33f7eb4..3938949 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-open-axiom (1.5.0~svn3056-1) unstable; urgency=low
+open-axiom (1.5.0~svn3056+ds-1) unstable; urgency=low
 
   * New upstream version.
   * Use xz compression for both source tarball and packages
@@ -20,9 +20,12 @@ open-axiom (1.5.0~svn3056-1) unstable; urgency=low
     no-missing-messages.patch
   * Updated d/copyright
   * Updated d/watch to use SourceForge SVN repository
+  * Omit contrib directory (that's why +ds):
+    - Unclear licenses (GPL, but which one?)
+    - It is for Windows
   * Bump standards version 3.9.3 → 3.9.4, no changes
 
- -- Igor Pashev <pashev.igor@gmail.com>  Sat, 02 Nov 2013 21:50:44 +0400
+ -- Igor Pashev <pashev.igor@gmail.com>  Sat, 02 Nov 2013 22:31:42 +0400
 
 open-axiom (1.4.1+svn~2626-2) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 4ceefe0..487d8c1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,34 +24,47 @@ License: WTFPL-2
  .
   0. You just DO WHAT THE FUCK YOU WANT TO. 
 
-Files: contrib/windows-installer/*
-Copyright: 2007-2011, Dan Martens <dan_martens@lycos.com>
- Bill Page <bill.page1@sympatico.ca>
- Alfredo Portes <alfredo.portes@gmail.com>
-License: BSD-3-clause
-
-Files: contrib/texmacs/src/texbreaker.c
- contrib/texmacs/src/useproto.h
-Copyright: 1991, Robert S. Sutor
-License: BSD-3-clause
-
-Files: contrib/texmacs/src/tm_openaxiom.c
-Copyright: 2004, Bill Page <bill.page1@sympatico.ca>
- 1999, Andrey Grozin
-License: GPL-3
-
-Files: contrib/texmacs/progs/init-openaxiom.scm
- contrib/texmacs/progs/openaxiom-input.scm
-Copyright: 1999, Joris van der Hoeven
-License: GPL-3
-
-Files: contrib/texmacs/packages/session/openaxiom.ts
-Copyright: 2002-2004, Joris van der Hoeven
-License: GPL-3
-
 Files: ./src/hyper/htsearch.cc
 Copyright: 1991-2002, The Numerical Algorithms Group Ltd
   2007-2010, Gabriel Dos Reis
   2009-2010, Alfredo Portes
 License: BSD-3-clause
 
+License: BSD-3-clause
+ OpenAxiom is derived from AXIOM, which was released as open source
+ under the BSD-style license.  All changes to OpenAxiom have been
+ released open source under the BSD-style license reproduced below.
+ .
+ Portions Copyright (C) 2007-2011, Gabriel Dos Reis
+ Portions Copyright (C) 2003-2007, The Axiom Team
+ Portions Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ .
+ - Neither the name of The Numerical Algorithms Group Ltd. nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/debian/rules b/debian/rules
index 2ec1007..1bd18cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ PACKAGE      := open-axiom
 SVN_REPO     := svn://svn.code.sf.net/p/open-axiom/code/trunk
 DEBIAN_PATH  := $(abspath $(dir $(firstword $(MAKEFILE_LIST))))
 SRC_VERSION  := $(shell dpkg-parsechangelog -l$(DEBIAN_PATH)/changelog | awk '/^Version:/ {sub(/-[^-]*/, "", $$2); print $$2}')
-SVN_REVISION := $(shell echo $(SRC_VERSION) | sed -r 's,.+svn([0-9]+),\1,')
+SVN_REVISION := $(shell echo $(SRC_VERSION) | sed -r 's,.+svn([0-9]+).*,\1,')
 TARBALL      := $(PACKAGE)_$(SRC_VERSION).orig.tar.xz
 .PHONY: get-orig-source
 get-orig-source:
@@ -28,6 +28,7 @@ get-orig-source:
 	svn export -r $(SVN_REVISION) $(SVN_REPO) \
 	get-orig-source/$(PACKAGE)-$(SRC_VERSION)
 	 tar cJf $(TARBALL) -C get-orig-source \
+		 --exclude=contrib \
 		 $(PACKAGE)-$(SRC_VERSION)
 	@rm -rf get-orig-source
 	@echo "  "$(TARBALL)" created; move it to the right destination to build the package"
diff --git a/debian/watch b/debian/watch
index 3393b47..faef222 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts=dversionmangle=s/.*svn.(\d+)(.dfsg.*)?/$1/ \
+opts=dversionmangle=s/.*svn.(\d+)(.ds.*)?/$1/ \
   http://sourceforge.net/p/open-axiom/code/HEAD/tree/trunk/ \
     /p/open-axiom/code/(\d+)/