[nauty] 03/03: Imported Debian patch 2.6r6+ds-1

Jerome Benoit calculus-guest at moszumanska.debian.org
Fri Jul 29 03:02:41 UTC 2016 

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

calculus-guest pushed a commit to branch master
in repository nauty.

commit efbbe1069cf7f93219c4c5514afae7e5860da8bc
Author: Jerome BENOIT <calculus at rezozer.net>
Date:   Fri Jul 29 03:15:18 2016 +0100

    Imported Debian patch 2.6r6+ds-1
---
 debian/changelog                              | 13 ++++++
 debian/control                                |  8 +++-
 debian/libnauty2-dev.links                    |  2 -
 debian/libnauty2-dev.maintscript              |  1 +
 debian/nauty.links                            |  2 -
 debian/nauty.maintscript                      |  1 +
 debian/patches/upstream-autotoolization.patch | 63 ++++++++++++++-------------
 debian/rules                                  | 21 ++++++++-
 8 files changed, 73 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e6cc71b..9e67607 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+nauty (2.6r6+ds-1) unstable; urgency=medium
+
+  * New upstream version.
+  * Debianization:
+    - debian/control:
+      - Standards Version, bump to 3.9.8;
+    - debian/rules:
+      - parallelization, introduce;
+      - symlink policy for documentation directories, set;
+      - build-arch/build-indep scheme, introduce.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Fri, 29 Jul 2016 02:14:44 +0000
+
 nauty (2.6r5+ds-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index e542554..886f8b6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Jerome Benoit <calculus at rezozer.net>
 Build-Depends:
  debhelper (>= 9), autotools-dev, libtool, dh-autoreconf, pkg-config, help2man,
  zlib1g-dev, libgmp-dev
-Standards-Version: 3.9.7
+Build-Depends-Indep:
+Standards-Version: 3.9.8
 Homepage: http://pallini.di.uniroma1.it
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/nauty.git
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/nauty.git
@@ -38,6 +39,7 @@ Description: library for graph automorphisms -- library package
 
 Package: nauty
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libnauty2 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: graphviz, nauty-doc
 Description: library for graph automorphisms -- interface and tools
@@ -59,6 +61,7 @@ Package: libnauty2-dev
 Provides: libnauty-dev
 Section: libdevel
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libnauty2 (= ${binary:Version}), ${misc:Depends}
 Conflicts: libnauty-dev
 Suggests: nauty-doc, pkg-config
@@ -82,7 +85,8 @@ Package: nauty-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libnauty2 (=${binary:Version}), nauty (=${binary:Version}), libnauty2-dev (=${binary:Version}), pdf-viewer
+Enhances: libnauty2 (=${binary:Version}), nauty (=${binary:Version}), libnauty2-dev (=${binary:Version})
+Suggests: pdf-viewer
 Multi-Arch: foreign
 Description: library for graph automorphisms -- user guide
  nauty (No AUTomorphisms, Yes?) is a set of procedures for computing
diff --git a/debian/libnauty2-dev.links b/debian/libnauty2-dev.links
deleted file mode 100644
index 4db301c..0000000
--- a/debian/libnauty2-dev.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/libnauty2/README usr/share/doc/libnauty2-dev/README
-usr/share/doc/libnauty2/README_24.gz usr/share/doc/libnauty2-dev/README_24.gz
diff --git a/debian/libnauty2-dev.maintscript b/debian/libnauty2-dev.maintscript
new file mode 100644
index 0000000..dbcc8c5
--- /dev/null
+++ b/debian/libnauty2-dev.maintscript
@@ -0,0 +1 @@
+dir_to_symlink /usr/share/doc/libnauty2-dev /usr/share/doc/libnauty2 2.6r6+ds-1~
diff --git a/debian/nauty.links b/debian/nauty.links
deleted file mode 100644
index ef9d9a1..0000000
--- a/debian/nauty.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/libnauty2/README usr/share/doc/nauty/README
-usr/share/doc/libnauty2/README_24.gz usr/share/doc/nauty/README_24.gz
diff --git a/debian/nauty.maintscript b/debian/nauty.maintscript
new file mode 100644
index 0000000..df13f68
--- /dev/null
+++ b/debian/nauty.maintscript
@@ -0,0 +1 @@
+dir_to_symlink /usr/share/doc/nauty /usr/share/doc/libnauty2 2.6r6+ds-1~
diff --git a/debian/patches/upstream-autotoolization.patch b/debian/patches/upstream-autotoolization.patch
index ccac1e0..d121a44 100644
--- a/debian/patches/upstream-autotoolization.patch
+++ b/debian/patches/upstream-autotoolization.patch
@@ -2,14 +2,14 @@ Description: upstream autotoolization
  Attempt to autotoolize nauty source.
 Origin: debian
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-04-22
+Last-Update: 2016-07-29
 
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1,5 +1,22 @@
  dnl Process this file with autoconf to produce a configure script.
 -AC_INIT(nauty-h.in)
-+AC_INIT([nauty],[2.6.5],[bdm at cs.anu.edu.au],[nauty],[http://pallini.di.uniroma1.it/])
++AC_INIT([nauty],[2.6.6],[bdm at cs.anu.edu.au],[nauty],[http://pallini.di.uniroma1.it/])
 +AC_CONFIG_MACRO_DIR([m4])
 +AC_CONFIG_AUX_DIR([autotool])
 +AC_CONFIG_SRCDIR([dreadnaut.c])
@@ -30,7 +30,7 @@ Last-Update: 2016-04-22
  
  AC_DEFUN([AX_TLS], [
    AC_MSG_CHECKING(for thread local storage (TLS) class)
-@@ -58,82 +75,89 @@
+@@ -58,84 +75,91 @@
  dnl Checks for system features
  AC_CANONICAL_HOST
  
@@ -76,6 +76,29 @@ Last-Update: 2016-04-22
 -      gccver=0.0.0
 -  fi
 -
++dnl if test x"$user_cflags" = x"" -o x"$user_cflags" = x-m32 ; then
++dnl   if test "$CC" = "icc" ; then
++dnl     AC_TRY_CFLAGS([-O3],[CFLAGS="$CFLAGS -O3"]);
++dnl     if test x"$ac_cv_try_cflags_ok" = x"no"; then
++dnl         AC_TRY_CFLAGS([-O2],[CFLAGS="$CFLAGS -O2"],[CFLAGS="$CFLAGS -O"]);
++dnl     fi
++dnl   else
++dnl     AC_TRY_CFLAGS([-O4 -Werror],[CFLAGS="$CFLAGS -O4"]);
++dnl     if test x"$ac_cv_try_cflags_ok" = x"no"; then
++dnl        AC_TRY_CFLAGS([-O3],[CFLAGS="$CFLAGS -O3"]);
++dnl        if test x"$ac_cv_try_cflags_ok" = x"no"; then
++dnl           AC_TRY_CFLAGS([-O2],[CFLAGS="$CFLAGS -O2"],[CFLAGS="$CFLAGS -O"]);
++dnl        fi
++dnl     fi
++dnl   fi
++dnl
++dnl   if test "$CC" = "gcc" ; then
++dnl       gccver=`gcc --version 2>/dev/null || echo 0.0.0`
++dnl   else
++dnl       gccver=0.0.0
++dnl   fi
++dnl
+   is_powerpc=0
 -  case "$host" in
 -   *i686-apple-darwin*)
 -	AC_TRY_CFLAGS([-fast],[CFLAGS="$MORECFLAGS -fast"]);;
@@ -88,6 +111,7 @@ Last-Update: 2016-04-22
 -   *pentium2*|*i586*)
 -	AC_TRY_CFLAGS([-march=i586],[CFLAGS="$CFLAGS -march=i586"]);;
 -   *powerpc*)
+-	is_powerpc=1
 -        machtype=`/usr/bin/machine 2>/dev/null || echo unknown`
 -        case "$machtype" in
 -	  ppc740?)
@@ -120,28 +144,6 @@ Last-Update: 2016-04-22
 -	fi;;
 -  esac
 -fi
-+dnl if test x"$user_cflags" = x"" -o x"$user_cflags" = x-m32 ; then
-+dnl   if test "$CC" = "icc" ; then
-+dnl     AC_TRY_CFLAGS([-O3],[CFLAGS="$CFLAGS -O3"]);
-+dnl     if test x"$ac_cv_try_cflags_ok" = x"no"; then
-+dnl         AC_TRY_CFLAGS([-O2],[CFLAGS="$CFLAGS -O2"],[CFLAGS="$CFLAGS -O"]);
-+dnl     fi
-+dnl   else
-+dnl     AC_TRY_CFLAGS([-O4 -Werror],[CFLAGS="$CFLAGS -O4"]);
-+dnl     if test x"$ac_cv_try_cflags_ok" = x"no"; then
-+dnl        AC_TRY_CFLAGS([-O3],[CFLAGS="$CFLAGS -O3"]);
-+dnl        if test x"$ac_cv_try_cflags_ok" = x"no"; then
-+dnl           AC_TRY_CFLAGS([-O2],[CFLAGS="$CFLAGS -O2"],[CFLAGS="$CFLAGS -O"]);
-+dnl        fi
-+dnl     fi
-+dnl   fi
-+dnl
-+dnl   if test "$CC" = "gcc" ; then
-+dnl       gccver=`gcc --version 2>/dev/null || echo 0.0.0`
-+dnl   else
-+dnl       gccver=0.0.0
-+dnl   fi
-+dnl
 +dnl   case "$host" in
 +dnl    *i686-apple-darwin*)
 +dnl 	AC_TRY_CFLAGS([-fast],[CFLAGS="$MORECFLAGS -fast"]);;
@@ -154,6 +156,7 @@ Last-Update: 2016-04-22
 +dnl    *pentium2*|*i586*)
 +dnl 	AC_TRY_CFLAGS([-march=i586],[CFLAGS="$CFLAGS -march=i586"]);;
 +dnl    *powerpc*)
++dnl 	is_powerpc=1
 +dnl         machtype=`/usr/bin/machine 2>/dev/null || echo unknown`
 +dnl         case "$machtype" in
 +dnl 	  ppc740?)
@@ -189,7 +192,7 @@ Last-Update: 2016-04-22
  
  echo CFLAGS=$CFLAGS
  echo MORECFLAGS=$MORECFLAGS
-@@ -431,6 +455,26 @@
+@@ -434,6 +458,26 @@
  edit_msg="++++++ This file is automatically generated, don't edit it by hand! ++++++"
  AC_SUBST(edit_msg)
  
@@ -1462,9 +1465,9 @@ Last-Update: 2016-04-22
 +])
 --- a/traces.h
 +++ b/traces.h
-@@ -22,6 +22,9 @@
-  *       28-Jan-16 : version ready for nauty and Traces v.2.6 distribution    *
-  *****************************************************************************/
+@@ -23,6 +23,9 @@
+  *       12-Jul-16 : bug correction (reaching degree 2 vertices)              *
+ *****************************************************************************/
  
 +#ifndef  _TRACES_H_    /* only process this file once */
 +#define  _TRACES_H_
@@ -1472,7 +1475,7 @@ Last-Update: 2016-04-22
  #include "gtools.h"
  #include "schreier.h" 
  
-@@ -61,3 +64,5 @@
+@@ -62,3 +65,5 @@
  				   TracesStats*,sparsegraph*);									
  extern void refine_tr(sparsegraph*,int*,int*,int*,int*,TracesOptions*);		
  extern void traces_freedyn(void);
diff --git a/debian/rules b/debian/rules
index a32eeed..45eaf08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,11 +16,28 @@ default:
 	@uscan --no-conf --dehs --report || true
 
 %:
-	dh $@ --with autoreconf
+	dh $@ --with autoreconf --parallel
 
-override_dh_auto_configure:
+override_dh_auto_configure-arch:
 	dh_auto_configure -- --enable-clz $(DEB_DH_AUTO_CONFIGURE_OPTS__ENABLE_TLS) --disable-ansicontrols
 
+override_dh_auto_configure-indep:
+	@true
+
+override_dh_auto_build-indep:
+	@true
+
+override_dh_auto_test-indep:
+	@true
+
+override_dh_auto_install-indep:
+	@true
+
+override_dh_installdocs:
+	dh_installdocs -pnauty --link-doc=libnauty2
+	dh_installdocs -plibnauty2-dev --link-doc=libnauty2
+	dh_installdocs --remaining-packages
+
 override_dh_installchangelogs:
 	dh_installchangelogs --keep changes24-26.txt
 

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

More information about the debian-science-commits mailing list