[med-svn] r18143 - in trunk/packages/R/r-cran-igraph/trunk/debian: . patches

Thu Sep 25 16:23:14 UTC 2014

Author: tille
Date: 2014-09-25 16:23:13 +0000 (Thu, 25 Sep 2014)
New Revision: 18143

Removed:
   trunk/packages/R/r-cran-igraph/trunk/debian/patches/hardening.patch
Modified:
   trunk/packages/R/r-cran-igraph/trunk/debian/changelog
   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/patches/series
   trunk/packages/R/r-cran-igraph/trunk/debian/patches/spelling.patch
   trunk/packages/R/r-cran-igraph/trunk/debian/rules
Log:
Some upgrade of packaging (package needed for r-cran-boolnet upgrade)


Modified: trunk/packages/R/r-cran-igraph/trunk/debian/changelog
===================================================================

--- trunk/packages/R/r-cran-igraph/trunk/debian/changelog	2014-09-25 15:55:26 UTC (rev 18142)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/changelog	2014-09-25 16:23:13 UTC (rev 18143)
@@ -1,3 +1,9 @@
+r-cran-igraph (0.7.1-1) unstable; urgency=low
+
+  * updated to new version
+
+ -- Andreas Tille <tille at debian.org>  Thu, 25 Sep 2014 18:00:25 +0200
+
 r-cran-igraph (0.6.5.1-1) UNRELEASED; urgency=low
 
   * update from upstream
@@ -6,7 +12,7 @@
 
  -- Ivo Maintz <ivo at maintz.de>  Fri, 12 Apr 2013 14:02:22 +0200
 
-r-cran-igraph (0.5.2-2-1) unstable; urgency=low
+r-cran-igraph (0.5.2-2-1) UNRELEASED; urgency=low
 
   * Initial release (closes: #546936).
 

Modified: trunk/packages/R/r-cran-igraph/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-igraph/trunk/debian/control	2014-09-25 15:55:26 UTC (rev 18142)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/control	2014-09-25 16:23:13 UTC (rev 18143)
@@ -1,22 +1,24 @@
 Source: r-cran-igraph
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>,
+           Ivo Maintz <ivo at maintz.de>,
+           Andreas Tille <tille at debian.org>
 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>,
- Ivo Maintz <ivo at maintz.de>
 Build-Depends: debhelper (>= 9.0.0),
- cdbs,
- r-base-dev (>= 3.0.0),
- r-cran-matrix
-Standards-Version: 3.9.4
+               cdbs,
+               r-base-dev (>= 3.0.0),
+               r-cran-matrix
+Standards-Version: 3.9.6
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-cran-igraph/trunk/
+Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/R/r-cran-igraph/trunk/
 Homepage: http://cneurocvs.rmki.kfki.hu/igraph
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/R/r-cran-igraph/trunk/
-Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/R/r-cran-igraph/trunk/
 
 Package: r-cran-igraph
 Architecture: any
-Depends: ${shlibs:Depends}, ${R:Depends}, ${misc:Depends}
+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

Modified: trunk/packages/R/r-cran-igraph/trunk/debian/copyright
===================================================================
--- trunk/packages/R/r-cran-igraph/trunk/debian/copyright	2014-09-25 15:55:26 UTC (rev 18142)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/copyright	2014-09-25 16:23:13 UTC (rev 18143)
@@ -3,12 +3,12 @@
 Source: http://cran.r-project.org/src/contrib
 
 Files: *
-Copyright: 2012 Gabor Csardi <csardi.gabor at gmail.com>
+Copyright: 2010-2014 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
+License: Sun
  Sun Microsystems, Inc.  The following terms apply to all files
  associated with the software unless explicitly disclaimed in individual
  files.
@@ -43,6 +43,8 @@
 
 Files: debian/*
 Copyright: 2009 Mathieu Malaterre <mathieu.malaterre at gmail.com>
+           2013 Ivo Maintz <ivo at maintz.de>
+           2014 Andreas Tille <tille at debian.org>
 License: GPL-2.0+
 
 License: GPL-2.0+

Deleted: trunk/packages/R/r-cran-igraph/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/R/r-cran-igraph/trunk/debian/patches/hardening.patch	2014-09-25 15:55:26 UTC (rev 18142)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/patches/hardening.patch	2014-09-25 16:23:13 UTC (rev 18143)
@@ -1,26 +0,0 @@
-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)
- 

Modified: trunk/packages/R/r-cran-igraph/trunk/debian/patches/series
===================================================================
--- trunk/packages/R/r-cran-igraph/trunk/debian/patches/series	2014-09-25 15:55:26 UTC (rev 18142)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/patches/series	2014-09-25 16:23:13 UTC (rev 18143)
@@ -1,2 +1 @@
 spelling.patch
-hardening.patch

Modified: trunk/packages/R/r-cran-igraph/trunk/debian/patches/spelling.patch
===================================================================
--- trunk/packages/R/r-cran-igraph/trunk/debian/patches/spelling.patch	2014-09-25 15:55:26 UTC (rev 18142)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/patches/spelling.patch	2014-09-25 16:23:13 UTC (rev 18143)
@@ -5,9 +5,9 @@
 ---
 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
+--- a/src/drl_layout.cpp
++++ b/src/drl_layout.cpp
+@@ -417,7 +417,7 @@ int igraph_layout_drl_options_init(igrap
      options->simmer_damping_mult = 0;
      
    default:
@@ -15,3 +15,4 @@
 +    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	2014-09-25 15:55:26 UTC (rev 18142)
+++ trunk/packages/R/r-cran-igraph/trunk/debian/rules	2014-09-25 16:23:13 UTC (rev 18143)
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export DEB_BUILD_HARDENING=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 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


