[singular] 01/01: fix: singular pc files

[Jerome Benoit]

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

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

commit 44ed0c82d899b5e4af09e868737083883345ba5e
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Sun Mar 15 21:07:52 2015 +0100

    fix: singular pc files
---
 debian/changelog                                   |  9 +++
 .../debianization-rename-pkgconfig_files.patch     | 67 +++++++++++++++++++++-
 2 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dc76444..595afef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+singular (4.0.1p2+ds-2~1) experimental; urgency=medium
+
+  * Debianization:
+    - debian/patches/debianization-rename-pkgconfig_files.patch, prepend
+      singular- to the singular related modules within the metainformation
+      singular pkg-config files.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Sun, 15 Mar 2015 20:03:27 +0000
+
 singular (4.0.1p2+ds-1) experimental; urgency=medium
 
   * New major release started from scratch (Closes: #764475).
diff --git a/debian/patches/debianization-rename-pkgconfig_files.patch b/debian/patches/debianization-rename-pkgconfig_files.patch
index 3eb520e..1702800 100644
--- a/debian/patches/debianization-rename-pkgconfig_files.patch
+++ b/debian/patches/debianization-rename-pkgconfig_files.patch
@@ -5,7 +5,7 @@ Description: debianization - rename pkpconfig (pc) files
 Origin: debian
 Forwarded: not-needed
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-12-28
+Last-Update: 2015-03-15
 
 --- a/Singular.pc.in
 +++ b/Singular.pc.in
@@ -70,6 +70,15 @@ Last-Update: 2014-12-28
  URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@
 --- a/libpolys/configure.ac
 +++ b/libpolys/configure.ac
+@@ -110,7 +110,7 @@
+   AC_MSG_CHECKING([  RESOURCES_LIBS?..])
+   AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
+ 
+-  PKG_REQUIRE="$PKG_REQUIRE resources"
++  PKG_REQUIRE="$PKG_REQUIRE singular-resources"
+   AC_SUBST(PKG_REQUIRE)
+ else
+   AC_MSG_RESULT(no)
 @@ -151,7 +151,7 @@
  AC_CONFIG_FILES([coeffs/Makefile])
  AC_CONFIG_FILES([polys/Makefile])
@@ -90,6 +99,15 @@ Last-Update: 2014-12-28
  AC_OUTPUT
 --- a/factory/configure.ac
 +++ b/factory/configure.ac
+@@ -145,7 +145,7 @@
+   AC_MSG_CHECKING([  RESOURCES_LIBS?..])
+   AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
+ 
+-  PKG_REQUIRE="$PKG_REQUIRE resources"
++  PKG_REQUIRE="$PKG_REQUIRE singular-resources"
+   AC_SUBST(PKG_REQUIRE)
+ else
+   AC_MSG_RESULT(no)
 @@ -400,6 +400,6 @@
  
  
@@ -145,3 +163,50 @@ Last-Update: 2014-12-28
 -pkgconfig_DATA = omalloc.pc
 +pkgconfig_DATA = singular-omalloc.pc
  
+--- a/m4/options.m4
++++ b/m4/options.m4
+@@ -95,7 +95,7 @@
+ 
+     AC_DEFINE([HAVE_OMALLOC],[1])
+ 
+-    PKG_REQUIRE="$PKG_REQUIRE omalloc"
++    PKG_REQUIRE="$PKG_REQUIRE singular-omalloc"
+     AC_SUBST(PKG_REQUIRE)
+   else
+     AC_MSG_RESULT(no)
+@@ -138,7 +138,7 @@
+   ENABLE_OMALLOC_ARG="$ENABLE_OMALLOC_ARG OMALLOC_LIBS='$OMALLOC_LIBS' OMALLOC_INCLUDES='$OMALLOC_INCLUDES'"
+   ac_configure_args="$ac_configure_args $ENABLE_OMALLOC_ARG"
+ 
+-  PKG_REQUIRE="$PKG_REQUIRE omalloc"
++  PKG_REQUIRE="$PKG_REQUIRE singular-omalloc"
+   AC_SUBST(PKG_REQUIRE)
+  else
+   AC_MSG_RESULT(no)
+@@ -171,7 +171,7 @@
+ 
+   ac_configure_args="$ac_configure_args $ENABLE_ARG"
+ 
+-  PKG_REQUIRE="$PKG_REQUIRE resources"
++  PKG_REQUIRE="$PKG_REQUIRE singular-resources"
+   AC_SUBST(PKG_REQUIRE)
+  else
+   AC_MSG_RESULT(no)
+@@ -216,7 +216,7 @@
+ 
+   ac_configure_args="$ac_configure_args $ENABLE_ARG"
+ 
+-  PKG_REQUIRE="$PKG_REQUIRE factory"
++  PKG_REQUIRE="$PKG_REQUIRE singular-factory"
+   AC_SUBST(PKG_REQUIRE)
+  fi
+ 
+@@ -273,7 +273,7 @@
+ 
+     AC_DEFINE(HAVE_FACTORY,[1],[Enable factory])
+ 
+-    PKG_REQUIRE="$PKG_REQUIRE factory"
++    PKG_REQUIRE="$PKG_REQUIRE singular-factory"
+     AC_SUBST(PKG_REQUIRE)
+   else
+     AC_MSG_RESULT(no)

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