[med-svn] r13014 - in trunk/packages/R/r-cran-igraph/trunk/debian: . patches source
Ivo Maintz
ivomaintz-guest at alioth.debian.org
Fri Feb 15 14:30:53 UTC 2013
Author: ivomaintz-guest
Date: 2013-02-15 14:30:53 +0000 (Fri, 15 Feb 2013)
New Revision: 13014
Added:
trunk/packages/R/r-cran-igraph/trunk/debian/patches/
trunk/packages/R/r-cran-igraph/trunk/debian/patches/hardening.patch
trunk/packages/R/r-cran-igraph/trunk/debian/patches/series
trunk/packages/R/r-cran-igraph/trunk/debian/patches/spelling.patch
trunk/packages/R/r-cran-igraph/trunk/debian/source/
trunk/packages/R/r-cran-igraph/trunk/debian/source/format
trunk/packages/R/r-cran-igraph/trunk/debian/upstream
Modified:
trunk/packages/R/r-cran-igraph/trunk/debian/changelog
trunk/packages/R/r-cran-igraph/trunk/debian/compat
trunk/packages/R/r-cran-igraph/trunk/debian/control
trunk/packages/R/r-cran-igraph/trunk/debian/copyright
trunk/packages/R/r-cran-igraph/trunk/debian/rules
Log:
upstream update
hardening works now
tested with sbuild
ready for upload
Modified: trunk/packages/R/r-cran-igraph/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-igraph/trunk/debian/changelog 2013-02-15 12:45:19 UTC (rev 13013)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/changelog 2013-02-15 14:30:53 UTC (rev 13014)
@@ -1,3 +1,12 @@
+igraph (0.6.4-1) UNRELEASED; urgency=low
+
+ * update from upstream
+ * updated debian/copyright
+ * enabled hardening
+ * renamed the source to the R name "igraph"
+
+ -- Ivo Maintz <ivo at maintz.de> Fri, 15 Feb 2013 13:56:42 +0100
+
r-cran-igraph (0.5.2-2-1) unstable; urgency=low
* Initial release (closes: #546936).
Modified: trunk/packages/R/r-cran-igraph/trunk/debian/compat
===================================================================
--- trunk/packages/R/r-cran-igraph/trunk/debian/compat 2013-02-15 12:45:19 UTC (rev 13013)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/compat 2013-02-15 14:30:53 UTC (rev 13014)
@@ -1 +1 @@
-5
+9
Modified: trunk/packages/R/r-cran-igraph/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-igraph/trunk/debian/control 2013-02-15 12:45:19 UTC (rev 13013)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/control 2013-02-15 14:30:53 UTC (rev 13014)
@@ -1,17 +1,18 @@
-Source: r-cran-igraph
+Source: igraph
Section: gnu-r
Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
-Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 5.0.0), cdbs, r-base-dev
-Standards-Version: 3.8.3
+Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>,
+ Ivo Maintz <ivo at maintz.de>
+Build-Depends: debhelper (>= 9.0.0), cdbs, r-base-dev, r-cran-matrix
+Standards-Version: 3.9.4
Homepage: http://cneurocvs.rmki.kfki.hu/igraph
Package: r-cran-igraph
Architecture: any
-Depends: ${shlibs:Depends}, r-base-core
+Depends: ${shlibs:Depends}, ${R:Depends}, ${misc:Depends}
Description: GNU R package for igraph
Routines for simple graphs and network analysis. igraph can handle large
- graphs very well and provides functions for generating random and regular
+ graphs very well and provides functions for generating random and regular
graphs, graph visualization, centrality indices and much more.
Modified: trunk/packages/R/r-cran-igraph/trunk/debian/copyright
===================================================================
--- trunk/packages/R/r-cran-igraph/trunk/debian/copyright 2013-02-15 12:45:19 UTC (rev 13013)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/copyright 2013-02-15 14:30:53 UTC (rev 13014)
@@ -1,19 +1,63 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Debianized-By: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Debianized-Date: Wed, 16 Sep 2009 17:21:29 +0200
-Original-Source: http://igraph.sf.net
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: igraph
+Source: http://cran.r-project.org/src/contrib
-
Files: *
-Copyright:
- Copyright © 2005-2008 Gabor Csardi, Tamas Nepusz
-License: GPL-2+
- The Debian packaging is licensed under the GPL-2 or any later version,
- see `/usr/share/common-licenses/GPL-2'
+Copyright: 2012 Gabor Csardi <csardi.gabor at gmail.com>
+License: GPL-2.0+
+Files: inst/html_library.tcl
+Copyright: 1995 Sun Microsystems Stephen Uhler <stephen.uhler at sun.com>
+License: Sun Microsystems, Inc
+ Sun Microsystems, Inc. The following terms apply to all files
+ associated with the software unless explicitly disclaimed in individual
+ files.
+ .
+ The authors hereby grant permission to use, copy, modify, distribute,
+ and license this software and its documentation for any purpose, provided
+ that existing copyright notices are retained in all copies and that this
+ notice is included verbatim in any distributions. No written agreement,
+ license, or royalty fee is required for any of the authorized uses.
+ Modifications to this software may be copyrighted by their authors
+ and need not follow the licensing terms described here, provided that
+ the new terms are clearly indicated on the first page of each file where
+ they apply.
+ .
+ IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+ FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+ DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ .
+ THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
+ IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+ NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+ MODIFICATIONS.
+ .
+ RESTRICTED RIGHTS: Use, duplication or disclosure by the government
+ is subject to the restrictions as set forth in subparagraph (c) (1) (ii)
+ of the Rights in Technical Data and Computer Software Clause as DFARS
+ 252.227-7013 and FAR 52.227-19.
+
Files: debian/*
-Copyright:
- Copyright 2009, Mathieu Malaterre <mathieu.malaterre at gmail.com>
-License: GPL-2+
- The Debian packaging is licensed under the GPL-2 or any later version,
- see `/usr/share/common-licenses/GPL-2'
+Copyright: 2009 Mathieu Malaterre <mathieu.malaterre at gmail.com>
+License: GPL-2.0+
+
+License: GPL-2.0+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Added: trunk/packages/R/r-cran-igraph/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/R/r-cran-igraph/trunk/debian/patches/hardening.patch (rev 0)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/patches/hardening.patch 2013-02-15 14:30:53 UTC (rev 13014)
@@ -0,0 +1,26 @@
+Description: hardening
+ added some code to use hardening makeflags
+ .
+ r-cran-igraph (0.6.4-1) UNRELEASED; urgency=low
+ .
+ * update from upstream
+ * updated debian/copyright
+Author: Ivo Maintz <ivo at maintz.de>
+
+---
+Last-Update: <2013-02-15>
+
+--- r-cran-igraph-0.6.4.orig/src/Makevars.in
++++ r-cran-igraph-0.6.4/src/Makevars.in
+@@ -1,9 +1,9 @@
+ PKG_CFLAGS=-DUSING_R -I. -Ics -Iglpk -Iglpk/amd -Iglpk/colamd -Iplfit \
+ @CPPFLAGS@ @CFLAGS@ -DNDEBUG \
+ -DPACKAGE_VERSION=\"@PACKAGE_VERSION@\" -DINTERNAL_ARPACK \
+- -DIGRAPH_THREAD_LOCAL=/**/
++ -DIGRAPH_THREAD_LOCAL=/**/ $(shell dpkg-buildflags --get CPPFLAGS)
+ PKG_CXXFLAGS= -DUSING_R -DIGRAPH_THREAD_LOCAL=/**/ -DNDEBUG
+-PKG_LIBS=@XML2_LIBS@ @GMP_LIBS@ @GLPK_LIBS@ $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
++PKG_LIBS=@XML2_LIBS@ @GMP_LIBS@ @GLPK_LIBS@ $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) -Wl,-z,relro
+
+ all: $(SHLIB)
+
Added: trunk/packages/R/r-cran-igraph/trunk/debian/patches/series
===================================================================
--- trunk/packages/R/r-cran-igraph/trunk/debian/patches/series (rev 0)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/patches/series 2013-02-15 14:30:53 UTC (rev 13014)
@@ -0,0 +1,2 @@
+spelling.patch
+hardening.patch
Added: trunk/packages/R/r-cran-igraph/trunk/debian/patches/spelling.patch
===================================================================
--- trunk/packages/R/r-cran-igraph/trunk/debian/patches/spelling.patch (rev 0)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/patches/spelling.patch 2013-02-15 14:30:53 UTC (rev 13014)
@@ -0,0 +1,17 @@
+Description: spelling error
+ .
+Author: Ivo Maintz <ivo at maintz.de>
+
+---
+Last-Update: <2012-09-07>
+
+--- r-cran-igraph-0.6.4.orig/src/drl_layout.cpp
++++ r-cran-igraph-0.6.4/src/drl_layout.cpp
+@@ -410,7 +410,7 @@ int igraph_layout_drl_options_init(igrap
+ options->simmer_damping_mult = 0;
+
+ default:
+- IGRAPH_ERROR("Unkown DrL template", IGRAPH_EINVAL);
++ IGRAPH_ERROR("Unknown DrL template", IGRAPH_EINVAL);
+ break;
+ }
Modified: trunk/packages/R/r-cran-igraph/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-cran-igraph/trunk/debian/rules 2013-02-15 12:45:19 UTC (rev 13013)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/rules 2013-02-15 14:30:53 UTC (rev 13014)
@@ -1,9 +1,19 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# debian/rules file for the Debian/GNU Linux r-cran-qtl package
-# Copyright 2003-2006 by Dirk Eddelbuettel <edd at debian.org>
+# -*- makefile -*-
include /usr/share/R/debian/r-cran.mk
get-orig-source:
uscan --force-download --verbose
+
+clean::
+ rm -f src/Makevars src/config.h
+ dh_clean
+
+install/$(package)::
+ rm -f debian/$(package)/usr/lib/R/site-library/igraph/LICENSE
+ rm -f debian/$(package)/usr/lib/R/site-library/igraph/html_library.license.terms
+ mkdir -p debian/$(package)/usr/share/pixmaps/igraph
+ mv debian/$(package)/usr/lib/R/site-library/igraph/*.gif debian/$(package)/usr/share/pixmaps/igraph/
+ mv debian/$(package)/usr/lib/R/site-library/igraph/tkigraph_help/*.gif debian/$(package)/usr/share/pixmaps/igraph/
+ dh_installchangelogs -k NEWS
Added: trunk/packages/R/r-cran-igraph/trunk/debian/source/format
===================================================================
--- trunk/packages/R/r-cran-igraph/trunk/debian/source/format (rev 0)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/source/format 2013-02-15 14:30:53 UTC (rev 13014)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: trunk/packages/R/r-cran-igraph/trunk/debian/upstream
===================================================================
--- trunk/packages/R/r-cran-igraph/trunk/debian/upstream (rev 0)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/upstream 2013-02-15 14:30:53 UTC (rev 13014)
@@ -0,0 +1,7 @@
+Archive: CRAN
+Contact: Gabor Csardi <csardi.gabor at gmail.com>
+Download: http://cran.r-project.org/src/contrib/
+Homepage: http://cran.r-project.org/web/packages/igraph/
+CRAN: igraph
+Name: igraph
+Watch: http://cran.r-project.org/src/contrib/igraph_([\d.-]*)\.tar.gz
More information about the debian-med-commit
mailing list