[libsecret] docs: Don't overcomplicate things with the major version in docs



commit 4c08fe293366222256b1ff5660a4aeebb7c21762
Author: Stef Walter <stefw redhat com>
Date:   Mon Jun 29 14:39:33 2015 +0200

    docs: Don't overcomplicate things with the major version in docs
    
    Just hard code '1' instead of using variable substitution.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=751400

 configure.ac                                  |    1 -
 docs/reference/libsecret/Makefile.am          |    3 +--
 docs/reference/libsecret/libsecret-using.sgml |    9 ++++-----
 3 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4424681..cfe6dce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,7 +275,6 @@ AC_CONFIG_FILES([
        Makefile
        docs/reference/libsecret/Makefile
        docs/reference/libsecret/version.xml
-       docs/reference/libsecret/version-major.xml
        po/Makefile.in
        po/Makefile
        libsecret/libsecret.pc
diff --git a/docs/reference/libsecret/Makefile.am b/docs/reference/libsecret/Makefile.am
index 410a23e..26401e9 100644
--- a/docs/reference/libsecret/Makefile.am
+++ b/docs/reference/libsecret/Makefile.am
@@ -97,8 +97,7 @@ include $(top_srcdir)/gtk-doc.make
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST += \
-       version.xml.in \
-       version-major.xml.in
+       version.xml.in
 
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
diff --git a/docs/reference/libsecret/libsecret-using.sgml b/docs/reference/libsecret/libsecret-using.sgml
index d047f67..3043e1e 100644
--- a/docs/reference/libsecret/libsecret-using.sgml
+++ b/docs/reference/libsecret/libsecret-using.sgml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
-<!ENTITY major SYSTEM "version-major.xml">
 ]>
 <part id="using">
 <title>Using libsecret in builds or scripts</title>
@@ -11,11 +10,11 @@
 
 <para>Like other GNOME libraries, <application>libsecret</application> uses
 <application>pkg-config</application> to provide compiler options. The package
-name is "<literal>libsecret-&major;</literal>". So in your
+name is "<literal>libsecret-1</literal>". So in your
 <literal>configure.ac</literal> script,you might specify something like:</para>
 
 <informalexample><programlisting>
-PKG_CHECK_MODULES(LIBSECRET, [libsecret-&major; >= 1.0])
+PKG_CHECK_MODULES(LIBSECRET, [libsecret-1 >= 1.0])
 AC_SUBST(LIBSECRET_CFLAGS)
 AC_SUBST(LIBSECRET_LIBS)
 </programlisting></informalexample>
@@ -88,13 +87,13 @@ schema = Secret.Schema.new("org.mock.Schema",
 <title>Vala: Compiling with libsecret</title>
 
 <para>
-The package name is "<literal>libsecret-&major;</literal>". You can use it like
+The package name is "<literal>libsecret-1</literal>". You can use it like
 this in your <literal>Makefile.am</literal> file:
 </para>
 
 <informalexample><programlisting>
 AM_VALAFLAGS = \
-       --pkg=libsecret-&major;
+       --pkg=libsecret-1
 </programlisting></informalexample>
 
 <para>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]