1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
|
Description: debianization - rename pkpconfig (pc) files
Append suffix `singular-' to each Singular pkgconfig(1) file for avoiding
possible collision apart for the Singular pkgconfig file itself, while
previous renaming changes are implemented.
Origin: vendor, Debian
Forwarded: not-needed
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2021-11-21
--- a/Singular.pc.in
+++ b/Singular.pc.in
@@ -9,7 +9,7 @@
Version: @PACKAGE_VERSION@
URL: https://github.com/Singular/Sources/
-Requires: @PKG_REQUIRE@ libpolys
+Requires: @PKG_REQUIRE@ singular-libpolys
Conflicts:
Cflags: -I${multiarchincludedir}/singular -I${multiarchincludedir}/singular/singular -I${includedir}/singular -I${includedir}/singular/singular @SINGULAR_CFLAGS@
--- a/libpolys/libpolys.pc.in
+++ b/libpolys/libpolys.pc.in
@@ -4,7 +4,7 @@
includedir=@includedir@
multiarchincludedir=@includedir@/@DEB_HOST_MULTIARCH@
-Name: @PACKAGE@
+Name: Singular @PACKAGE@
Description: The Singular polynomial/coefficient arithmetic and related supporting functionality
Version: @PACKAGE_VERSION@
URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@
--- a/resources/singular_resources.pc.in
+++ b/resources/singular_resources.pc.in
@@ -4,7 +4,7 @@
includedir=@includedir@
multiarchincludedir=@includedir@/@DEB_HOST_MULTIARCH@
-Name: @PACKAGE@
+Name: Singular @PACKAGE@
Description: The Singular resources manager
Version: @PACKAGE_VERSION@
URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@
--- a/factory/factory.pc.in
+++ b/factory/factory.pc.in
@@ -4,7 +4,7 @@
includedir=@includedir@
multiarchincludedir=@includedir@/@DEB_HOST_MULTIARCH@
-Name: @PACKAGE@
+Name: Singular @PACKAGE@
Description: The Singular factorization library
Version: @PACKAGE_VERSION@
URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@
--- a/omalloc/omalloc.pc.in
+++ b/omalloc/omalloc.pc.in
@@ -4,7 +4,7 @@
includedir=@includedir@
multiarchincludedir=@includedir@/@DEB_HOST_MULTIARCH@
-Name: @PACKAGE@
+Name: Singular @PACKAGE@
Description: The Singular memory manager
Version: @PACKAGE_VERSION@
URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@
--- a/libpolys/configure.ac
+++ b/libpolys/configure.ac
@@ -123,7 +123,7 @@
AC_MSG_CHECKING([ RESOURCES_LIBS?..])
AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
- PKG_REQUIRE="$PKG_REQUIRE singular_resources"
+ PKG_REQUIRE="$PKG_REQUIRE singular-resources"
AC_SUBST(PKG_REQUIRE)
else
AC_MSG_RESULT(no)
@@ -165,5 +165,5 @@
AC_CONFIG_FILES([polys/Makefile])
AC_CONFIG_FILES([tests/Makefile])
AC_CONFIG_FILES([libpolys-config], [chmod +x libpolys-config])
-AC_CONFIG_FILES([libpolys.pc])
+AC_CONFIG_FILES([singular-libpolys.pc:libpolys.pc.in])
AC_OUTPUT
--- a/factory/configure.ac
+++ b/factory/configure.ac
@@ -140,7 +140,7 @@
AC_MSG_CHECKING([ RESOURCES_LIBS?..])
AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
- PKG_REQUIRE="$PKG_REQUIRE singular_resources"
+ PKG_REQUIRE="$PKG_REQUIRE singular-resources"
AC_SUBST(PKG_REQUIRE)
else
AC_MSG_RESULT(no)
@@ -410,6 +410,6 @@
-AC_CONFIG_FILES([Makefile include/factory/Makefile factory.pc]) # ftest/GNUmakefile
+AC_CONFIG_FILES([Makefile include/factory/Makefile singular-factory.pc:factory.pc.in]) # ftest/GNUmakefile
AC_OUTPUT
--- a/omalloc/configure.ac
+++ b/omalloc/configure.ac
@@ -597,6 +597,6 @@
dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
dnl wrap it up
dnl
-AC_CONFIG_FILES([Makefile omalloc.pc])
+AC_CONFIG_FILES([Makefile singular-omalloc.pc:omalloc.pc.in])
AC_OUTPUT
--- a/libpolys/Makefile.am
+++ b/libpolys/Makefile.am
@@ -20,7 +20,7 @@
DISTCLEANFILES = $(nodist_configheader_HEADERS)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpolys.pc
+pkgconfig_DATA = singular-libpolys.pc
%.1: %
$(HELP2MAN) \
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -22,4 +22,4 @@
DISTCLEANFILES = $(nodist_configheader_HEADERS)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = singular_resources.pc
+pkgconfig_DATA = singular-resources.pc
--- a/factory/Makefile.am
+++ b/factory/Makefile.am
@@ -308,5 +308,5 @@
##
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = factory.pc
+pkgconfig_DATA = singular-factory.pc
--- a/omalloc/Makefile.am
+++ b/omalloc/Makefile.am
@@ -84,7 +84,7 @@
omtTest_r_LDADD = libsingular-omalloc.la
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = omalloc.pc
+pkgconfig_DATA = singular-omalloc.pc
getlucky-omtTest-r: getlucky-omtTest-X.sh
$(LN_S) $< $@
--- 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)
@@ -141,7 +141,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
OMALLOC_INCLUDES="-I$ac_abs_top_srcdir"
@@ -180,7 +180,7 @@
ac_configure_args="$ac_configure_args $DEFAULT_HTMLDIR $ENABLE_ARG"
- PKG_REQUIRE="$PKG_REQUIRE singular_resources"
+ PKG_REQUIRE="$PKG_REQUIRE singular-resources"
AC_SUBST(PKG_REQUIRE)
else
AC_MSG_RESULT(no)
@@ -215,7 +215,7 @@
ac_configure_args="$ac_configure_args $ENABLE_ARG"
- PKG_REQUIRE="$PKG_REQUIRE factory"
+ PKG_REQUIRE="$PKG_REQUIRE singular-factory"
AC_SUBST(PKG_REQUIRE)
@@ -259,7 +259,7 @@
#
AC_LANG_POP([C++])
- PKG_REQUIRE="$PKG_REQUIRE factory"
+ PKG_REQUIRE="$PKG_REQUIRE singular-factory"
AC_SUBST(PKG_REQUIRE)
AM_CONDITIONAL([ENABLE_FACTORY],[test x$ENABLE_FACTORY = xyes])
--- a/resources/configure.ac
+++ b/resources/configure.ac
@@ -78,5 +78,5 @@
AX_COMPUTE_RELATIVE_PATHS([config_datadir:config_htmldir:data_to_html])
AC_DEFINE_UNQUOTED([DATA_TO_HTML_DIR],"%D/$data_to_html/html",[htmldir])
-AC_CONFIG_FILES([singular_resources.pc Makefile])
+AC_CONFIG_FILES([singular-resources.pc:singular_resources.pc.in Makefile])
AC_OUTPUT
|
