[graywolf] 02/02: New upstream release with fixed license issue

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository graywolf.

commit 9338889953c4dee4aef6be9a15a6e46cf8ea0d1e
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Tue Jul 28 10:09:44 2015 +0200

    New upstream release with fixed license issue
---
 debian/changelog                     |  8 ++++++++
 debian/copyright                     | 10 +++-------
 debian/patches/03_link_library.patch | 17 -----------------
 debian/patches/series                |  1 -
 4 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa3615b..9cf456b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+graywolf (0.1.2-1) unstable; urgency=low
+
+  * New upstream release
+    - Fixed debian/copyright
+    - Removed debian/patches/03_link_library.patch applied upstream
+
+ -- Ruben Undheim <ruben.undheim at gmail.com>  Tue, 28 Jul 2015 10:07:52 +0200
+
 graywolf (0.1.1-1) unstable; urgency=low
 
   * Initial release (Closes: #789467)
diff --git a/debian/copyright b/debian/copyright
index 488e37d..5ccd989 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,7 @@ License: GPL-2+_with_Yale_conditions
 
 Files: src/Ylib/radixsort.c
 Copyright: 1990 The Regents of the University of California.
-License: BSD-4-clause
+License: BSD-3-clause
 
 Files: src/Ylib/quicksort.c
 Copyright: 1983 Berkeley
@@ -77,7 +77,7 @@ License: GPL-2+_with_Yale_conditions
  POSSIBILITY OF THE FOREGOING.
 
 
-License: BSD-4-clause
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -86,11 +86,7 @@ License: BSD-4-clause
  2. 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.
- 3. All advertising materials mentioning features or use of this software
-    must display the following acknowledgement:
-    This product includes software developed by the University of
-    California, Berkeley and its contributors.
- 4. Neither the name of the University nor the names of its contributors
+ 3. Neither the name of the University nor the names of its contributors
     may be used to endorse or promote products derived from this software
     without specific prior written permission.
  .
diff --git a/debian/patches/03_link_library.patch b/debian/patches/03_link_library.patch
deleted file mode 100644
index bfc4100..0000000
--- a/debian/patches/03_link_library.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: The library should also be linked with libx11
-Forwarded: will do
-Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: graywolf/src/Ylib/CMakeLists.txt
-===================================================================
---- graywolf.orig/src/Ylib/CMakeLists.txt	2015-07-22 19:09:51.517261921 +0200
-+++ graywolf/src/Ylib/CMakeLists.txt	2015-07-22 19:09:57.644233189 +0200
-@@ -5,6 +5,9 @@
- 
- add_library(ycadgraywolf SHARED assign.c buster.c cleanup.c colors.c deck.c dialog.c draw.c dset.c edcolors.c file.c getftime.c graph.c grid.c hash.c heap.c list.c log.c matrix.c menus.c message.c mst.c mytime.c okmalloc.c path.c plot.c program.c project.c queue.c quicksort.c radixsort.c rand.c rbtree.c relpath.c set.c stat.c stats.c string.c svd.c system.c time.c timer.c trans.c wgraphics.c ydebug.c yreadpar.c )
- 
-+target_link_libraries(ycadgraywolf X11)
-+target_link_libraries(ycadgraywolf m)
-+
- set_target_properties(ycadgraywolf PROPERTIES VERSION 0.0.0 SOVERSION 0)
- 
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include)
diff --git a/debian/patches/series b/debian/patches/series
index 365ca71..aab2c2e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_no_rpath_in_debian_package.patch
 02_dont_create_link.patch
-03_link_library.patch
 04_install_directory_multiarch.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/graywolf.git