Skip to content

Commit 0aca59d

Browse files
vbwagnerdmpgpro
authored andcommitted
Use PGPRO_VERSION for tarball and sgml docs.
Fixed bug reporting address. Use PGPRO_VERSION when generate version.sgml Conflicts: doc/src/sgml/problems.sgml
1 parent bba9543 commit 0aca59d

File tree

4 files changed

+12
-47
lines changed

4 files changed

+12
-47
lines changed

GNUmakefile.in

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,11 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
7676

7777
##########################################################################
7878

79-
distdir = postgrespro-$(VERSION)
79+
ifeq ($PGPRO_VERSION,)
80+
distdir = postgrespro-$(VERSION)
81+
else
82+
distdir = postgrespro-$(PGPRO_VERSION)
83+
endif
8084
dummy = =install=
8185
garbage = =* "#"* ."#"* *~* *.orig *.rej core postgrespro-*
8286

doc/src/sgml/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ endif
141141
# changes.
142142
version.sgml: $(top_srcdir)/configure
143143
{ \
144-
echo "<!ENTITY version \"$(VERSION)\">"; \
144+
echo "<!ENTITY version \"$(PGPRO_VERSION)\">"; \
145145
echo "<!ENTITY majorversion \"$(MAJORVERSION)\">"; \
146146
} > $@
147147

doc/src/sgml/problems.sgml

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -295,27 +295,13 @@
295295
<title>Where to Report Bugs</title>
296296

297297
<para>
298-
In general, send bug reports to the bug report mailing list at
299-
<email>pgsql-bugs@postgresql.org</email>.
298+
In general, send bug reports to the bug report our support email
299+
address at
300+
<email>bugs@postgrespro.ru</email>.
300301
You are requested to use a descriptive subject for your email
301302
message, perhaps parts of the error message.
302303
</para>
303304

304-
<para>
305-
Another method is to fill in the bug report web-form available
306-
at the project's
307-
<ulink url="http://www.postgresql.org/">web site</ulink>.
308-
Entering a bug report this way causes it to be mailed to the
309-
<email>pgsql-bugs@postgresql.org</email> mailing list.
310-
</para>
311-
312-
<para>
313-
If your bug report has security implications and you'd prefer that it
314-
not become immediately visible in public archives, don't send it to
315-
<literal>pgsql-bugs</literal>. Security issues can be
316-
reported privately to <email>security@postgresql.org</email>.
317-
</para>
318-
319305
<para>
320306
Do not send bug reports to any of the user mailing lists, such as
321307
<email>pgsql-sql@postgresql.org</email> or
@@ -334,33 +320,5 @@
334320
discussion about your bug report on <literal>pgsql-hackers</literal>,
335321
if the problem needs more review.
336322
</para>
337-
338-
<para>
339-
If you have a problem with the documentation, the best place to report it
340-
is the documentation mailing list <email>pgsql-docs@postgresql.org</email>.
341-
Please be specific about what part of the documentation you are unhappy
342-
with.
343-
</para>
344-
345-
<para>
346-
If your bug is a portability problem on a non-supported platform,
347-
send mail to <email>pgsql-hackers@postgresql.org</email>,
348-
so we (and you) can work on
349-
porting <productname>PostgreSQL</productname> to your platform.
350-
</para>
351-
352-
<note>
353-
<para>
354-
Due to the unfortunate amount of spam going around, all of the above
355-
email addresses are closed mailing lists. That is, you need to be
356-
subscribed to a list to be allowed to post on it. (You need not be
357-
subscribed to use the bug-report web form, however.)
358-
If you would like to send mail but do not want to receive list traffic,
359-
you can subscribe and set your subscription option to <literal>nomail</>.
360-
For more information send mail to
361-
<email>majordomo@postgresql.org</email>
362-
with the single word <literal>help</> in the body of the message.
363-
</para>
364-
</note>
365323
</sect2>
366324
</sect1>

src/Makefile.global.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ VERSION = @PACKAGE_VERSION@
4040
MAJORVERSION = @PG_MAJORVERSION@
4141
VERSION_NUM = @PG_VERSION_NUM@
4242

43+
PGPRO_VERSION = @PGPRO_VERSION@
44+
PGPRO_PACKAGE_NAME = @PGPRO_PACKAGE_NAME@
45+
4346
# Set top_srcdir, srcdir, and VPATH.
4447
ifdef PGXS
4548
top_srcdir = $(top_builddir)

0 commit comments

Comments
 (0)