[med-svn] [Git][med-team/igraph][master] 2 commits: Debian patch 0.9.1+ds-1: set to UNRELEASED

Jérôme Benoit gitlab at salsa.debian.org
Sun Apr 11 21:24:13 BST 2021 


Jérôme Benoit pushed to branch master at Debian Med / igraph


Commits:
0de5fb45 by Jerome Benoit at 2021-04-11T13:50:45+02:00
Debian patch 0.9.1+ds-1: set to UNRELEASED

- - - - -
520dff62 by Jerome Benoit at 2021-04-11T22:22:39+02:00
Debian patch 0.9.1+ds-1: doc: introduce

- - - - -


9 changed files:

- debian/changelog
- debian/control
- debian/libigraph.manpages → debian/libigraph-dev.manpages
- + debian/libigraph-doc.doc-base
- debian/libigraph-examples.install → debian/libigraph-doc.install
- + debian/patches/debianization-doc-local_fonts.patch
- debian/patches/series
- debian/rules
- debian/tests/control


Changes:

=====================================
debian/changelog
=====================================
@@ -1,15 +1,17 @@
-igraph (0.9.1+ds-1) experimental; urgency=medium
+igraph (0.9.1+ds-1) UNRELEASED; urgency=medium
 
   * New upstream minor version (major changes)
   * Debianization:
     - d/control:
       - SO version, bump to version 2;
+      - Build-Depends-Indep field, introduce;
       - Build-Depends field:
         - cmake, add (migration to cmake);
         - jdupes, discard (no more needed);
       - Package libigraph2:
         - introduce (bumped SO version, see above);
         - Conflicts and Replaces fields, discard;
+      - Package libigraph-examples, renamed libigraph-doc;
     - d/copyright:
       - Files-Excluded field, refresh;
       - Debian Files:
@@ -32,16 +34,18 @@ igraph (0.9.1+ds-1) experimental; urgency=medium
       - d/p/upstream-fix-lintian-spelling_error_in_binary.patch, refresh;
       - d/p/upstream-fixed-{git-interfer-nomore,cmake-check,XSOVERSION},patch,
         fixed by and imported from upstream (thanks to upstream team);
-      - d/p/debianization.patch, introduce;
+      - d/p/debianization{,-doc-local_fonts}.patch, introduce;
       - d/p/soversion.patch, SO version manage via d/p/debianization.patch;
       - d/p/upstream-enhance-external_suitesparse.patch, obsoleted;
       - d/p/do_not_make_anything_in_doc.patch, obsoleted;
       - d/p/enable_removing_third_party_code.patch, obsoleted;
     - d/adhoc/examples/*, refresh;
+    - d/libigraph-dev.manpages, introduce;
+    - d/libigraph-doc.{install,doc-base}, introduce;
     - d/libigraph1.symbols.amd64, temporarily discard (new and not fixed ABI);
     - d/libigraph-examples.links, obsoleted.
 
- -- Jerome Benoit <calculus at rezozer.net>  Sat, 10 Apr 2021 18:35:33 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Sun, 11 Apr 2021 20:10:08 +0000
 
 igraph (0.8.5+ds1-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -19,6 +19,9 @@ Build-Depends: debhelper-compat (= 13),
                libglpk-dev,
                libf2c2-dev,
                liblzma-dev
+Build-Depends-Indep: xmlto,
+                     source-highlight,
+										 fonts-font-awesome
 Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/med-team/igraph
 Vcs-Git: https://salsa.debian.org/med-team/igraph.git
@@ -45,23 +48,36 @@ Section: libdevel
 Depends: libigraph2 (= ${binary:Version}),
          ${devlibs:Depends},
          ${misc:Depends}
+Suggests: libigraph-doc, pkg-config
 Multi-Arch: same
 Description: library for creating and manipulating graphs - development files
  igraph is a library for creating and manipulating graphs.
  It is intended to be as powerful (ie. fast) as possible to enable the
  analysis of large graphs.
  .
- This package contains the include files and static library for igraph.
+ This package contains the include files and static library for the igraph
+ C library.
 
-Package: libigraph-examples
+Package: libigraph-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
-Suggests: libsuitesparse-dev
+Depends: fonts-font-awesome, ${misc:Depends}
+Suggests: libigraph-dev (= ${binary:Version}), libsuitesparse-dev, www-browser
+Replaces: libigraph-examples (<< 0.9)
+Breaks: libigraph-examples (<< 0.9)
 Multi-Arch: foreign
-Description: library for creating and manipulating graphs - example files
+Description: library for creating and manipulating graphs - reference manual
  igraph is a library for creating and manipulating graphs.
  It is intended to be as powerful (ie. fast) as possible to enable the
  analysis of large graphs.
  .
- This package contains the examples and tests for igraph.
+ This package provides the reference manual for the igraph C library;
+ it also contains examples and tutorial material.
+
+Package: libigraph-examples
+Architecture: all
+Section: oldlibs
+Depends: libigraph-doc, ${misc:Depends}
+Multi-Arch: foreign
+Description: transitional package
+ This is a transitional package. It can safely be removed.


=====================================
debian/libigraph.manpages → debian/libigraph-dev.manpages
=====================================


=====================================
debian/libigraph-doc.doc-base
=====================================
@@ -0,0 +1,9 @@
+Document: libigraph
+Title: igraph C library
+Author: Gábor Csárdi, Tamás Nepusz, Vincent Traag, Szabolcs Horvát, Fabio Zanini
+Abstract: This manual documents how to use the igraph C Library
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libigraph-dev/html/index.html
+Files: /usr/share/doc/libigraph-dev/html/*.html


=====================================
debian/libigraph-examples.install → debian/libigraph-doc.install
=====================================
@@ -1,3 +1,4 @@
 examples usr/share/doc/libigraph-dev
 tests/benchmarks usr/share/doc/libigraph-dev/examples
 debian/adhoc/examples usr/share/doc/libigraph-dev
+_build_shared/doc/html usr/share/doc/libigraph-dev


=====================================
debian/patches/debianization-doc-local_fonts.patch
=====================================
@@ -0,0 +1,17 @@
+Description: debianization: use local fonts
+Origin: debian
+Forwarded: not-needed
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2021-04-11
+
+--- a/doc/gtk-doc.xsl
++++ b/doc/gtk-doc.xsl
+@@ -98,7 +98,7 @@
+             content="GTK-Doc V{$gtkdoc.version} (XML mode)"/>
+     </xsl:if>
+     <link rel="stylesheet" href="style.css" type="text/css"/>
+-	<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" type="text/css"/>
++	<link rel="stylesheet" href="/usr/share/fonts-font-awesome/css/font-awesome.min.css" type="text/css"/>
+ 
+       <!-- copied from the html.head template in the docbook stylesheets
+            we don't want links for all refentrys, thats just too much


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@ upstream-fixed-cmake-check.patch
 upstream-fix-lintian-spelling_error_in_binary.patch
 debianization.patch
 debianization-suitesparse-header_folder.patch
+debianization-doc-local_fonts.patch


=====================================
debian/rules
=====================================
@@ -8,7 +8,7 @@ BUILDIR_STATIC=_build_static
 BUILDIR_SHARED=_build_shared
 
 %:
-	dh $@ --buildsystem=cmake
+	dh $@ --buildsystem=cmake --builddirectory=$(BUILDIR_SHARED)
 
 #	--enable-debug
 
@@ -29,24 +29,33 @@ override_dh_auto_configure:
 	dh_auto_configure -B$(BUILDIR_SHARED) -- -DBUILD_SHARED_LIBS=ON  $(CONF_FLAGS)
 	dh_auto_configure -B$(BUILDIR_STATIC) -- -DBUILD_SHARED_LIBS=OFF $(CONF_FLAGS)
 
-override_dh_auto_build:
-	dh_auto_build -B$(BUILDIR_STATIC)
-	dh_auto_build -B$(BUILDIR_SHARED)
+override_dh_auto_build-indep:
+	make -C $(BUILDIR_SHARED)/doc html
+	make -C $(BUILDIR_SHARED)/doc clean
 
-override_dh_auto_test:
-	dh_auto_test -B$(BUILDIR_STATIC)
-	dh_auto_test -B$(BUILDIR_SHARED)
+override_dh_auto_build-arch:
+	dh_auto_build -a -B$(BUILDIR_STATIC)
+	dh_auto_build -a -B$(BUILDIR_SHARED)
 
-override_dh_auto_install:
-	dh_auto_install -B$(BUILDIR_STATIC)
-	dh_auto_install -B$(BUILDIR_SHARED)
+override_dh_auto_test-indep:
+
+override_dh_auto_test-arch:
+	dh_auto_test -a -B$(BUILDIR_STATIC)
+	dh_auto_test -a -B$(BUILDIR_SHARED)
+
+override_dh_auto_install-indep:
+
+override_dh_auto_install-arch:
+	dh_auto_install -a -B$(BUILDIR_STATIC)
+	dh_auto_install -a -B$(BUILDIR_SHARED)
 
 UPS_VERSION := $(firstword $(subst +, ,$(DEB_VERSION)))
 UPS_LISTOF_EXAMPLE__FULLNAME := $(wildcard examples/simple/*.c)
 UPS_LISTOF_PRIVATE_EXAMPLE := igraph_es_fromto.c
 DEB_LISTOF_XEXAMPLE        := $(sort $(UPS_LISTOF_PRIVATE_EXAMPLE))
 DEB_DH_INSTALL_INDEP_XLIST := $(patsubst %.c,%.,$(DEB_LISTOF_XEXAMPLE))
-DEB_DH_INSTALL_INDEP_EXAMPLESDIR := $(CURDIR)/debian/libigraph-examples/usr/share/doc/libigraph-dev/examples
+DEB_DH_INSTALL_INDEP_DOCDIR := $(CURDIR)/debian/libigraph-doc/usr/share/doc/libigraph-dev
+DEB_DH_INSTALL_INDEP_EXAMPLESDIR := $(DEB_DH_INSTALL_INDEP_DOCDIR)/examples
 override_dh_install-indep:
 	dh_install -i $(addprefix -X,$(DEB_DH_INSTALL_INDEP_XLIST))
 	cp -vp -t $(DEB_DH_INSTALL_INDEP_EXAMPLESDIR)/simple $(CURDIR)/tests/unit/test_utilities.inc


=====================================
debian/tests/control
=====================================
@@ -1,8 +1,8 @@
 Test-Command: debian/tests/check simple
-Depends: libigraph-dev, libsuitesparse-dev, libigraph-examples, build-essential, pkg-config
+Depends: libigraph-dev, libsuitesparse-dev, libigraph-doc, build-essential, pkg-config
 
 Test-Command: debian/tests/check tutorial
-Depends: libigraph-dev, libigraph-examples, build-essential, pkg-config
+Depends: libigraph-dev, libigraph-doc, build-essential, pkg-config
 
 Test-Command: debian/tests/check benchmarks
-Depends: libigraph-dev, libigraph-examples, build-essential, pkg-config
+Depends: libigraph-dev, libigraph-doc, build-essential, pkg-config



View it on GitLab: https://salsa.debian.org/med-team/igraph/-/compare/71fea23d4124fadbbc2cf610475d3dc0f0e16c41...520dff62c4b29df05901522e3c02ec83ac3b1fcf

-- 
View it on GitLab: https://salsa.debian.org/med-team/igraph/-/compare/71fea23d4124fadbbc2cf610475d3dc0f0e16c41...520dff62c4b29df05901522e3c02ec83ac3b1fcf
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210411/50e02467/attachment-0001.htm>

More information about the debian-med-commit mailing list