[SCM] Samba Shared Repository - branch master updated

Kai Blin kai at samba.org
Thu Aug 22 12:49:02 MDT 2013 

The branch, master has been updated
       via  573b455 pkgconfig: Do not hardcode library version numbers in pc files.
       via  a0b245c s3-pkgconfig: remove leftovers from autoconf build.
      from  db1d034 client: add missing newlines to error messages for invalid iosize parameter.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 573b455de9a45990446af26eea01539a32fef209
Author: Günther Deschner <gd at samba.org>
Date:   Thu Aug 22 15:00:32 2013 +0200

    pkgconfig: Do not hardcode library version numbers in pc files.
    
    We control version numbers via 'vnum' from the wscript_build files for all other
    libraries.  In case of libndr we already reported a wrong 0.0.1 version via
    pkgconfig while in fact the library is versioned as 0.0.2.
    
    Guenther
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Reviewed-by: Kai Blin <kai at samba.org>
    
    Autobuild-User(master): Kai Blin <kai at samba.org>
    Autobuild-Date(master): Thu Aug 22 20:48:44 CEST 2013 on sn-devel-104

commit a0b245c78271d060d59f763fb586221ec10edd7b
Author: Günther Deschner <gd at samba.org>
Date:   Thu Aug 22 14:59:08 2013 +0200

    s3-pkgconfig: remove leftovers from autoconf build.
    
    No worries, we still ship appropriate pc files for these libs.
    
    Guenther
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Reviewed-by: Kai Blin <kai at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 lib/torture/torture.pc.in             |    2 +-
 lib/util/samba-util.pc.in             |    2 +-
 librpc/ndr.pc.in                      |    2 +-
 librpc/ndr_krb5pac.pc.in              |    2 +-
 librpc/ndr_nbt.pc.in                  |    2 +-
 librpc/ndr_standard.pc.in             |    2 +-
 source3/pkgconfig/netapi.pc.in        |   14 --------------
 source3/pkgconfig/smbclient.pc.in     |   14 --------------
 source3/pkgconfig/smbsharemodes.pc.in |   14 --------------
 source3/pkgconfig/wbclient.pc.in      |   13 -------------
 10 files changed, 6 insertions(+), 61 deletions(-)
 delete mode 100644 source3/pkgconfig/netapi.pc.in
 delete mode 100644 source3/pkgconfig/smbclient.pc.in
 delete mode 100644 source3/pkgconfig/smbsharemodes.pc.in
 delete mode 100644 source3/pkgconfig/wbclient.pc.in


Changeset truncated at 500 lines:

diff --git a/lib/torture/torture.pc.in b/lib/torture/torture.pc.in
index 459b35c..e0421b0 100644
--- a/lib/torture/torture.pc.in
+++ b/lib/torture/torture.pc.in
@@ -7,6 +7,6 @@ modulesdir=${prefix}/modules/torture
 Name: torture
 Description: Samba torture (test) suite
 Requires: talloc
-Version: 0.0.1
+Version: @PACKAGE_VERSION@
 Libs: @LIB_RPATH@ -L${libdir} -ltorture
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/lib/util/samba-util.pc.in b/lib/util/samba-util.pc.in
index a49c1d0..65876c4 100644
--- a/lib/util/samba-util.pc.in
+++ b/lib/util/samba-util.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: samba-util
 Description: Samba utility functions
 Requires: talloc tevent
-Version: 0.0.1
+Version: @PACKAGE_VERSION@
 Libs: @LIB_RPATH@ -L${libdir} -lsamba-util
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/librpc/ndr.pc.in b/librpc/ndr.pc.in
index 1ee50cc..6828ac0 100644
--- a/librpc/ndr.pc.in
+++ b/librpc/ndr.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: ndr
 Description: Network Data Representation Core Library
 Requires: samba-util talloc
-Version: 0.0.1
+Version: @PACKAGE_VERSION@
 Libs: @LIB_RPATH@ -L${libdir} -lndr
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1
diff --git a/librpc/ndr_krb5pac.pc.in b/librpc/ndr_krb5pac.pc.in
index 21ecb55..597bbd1 100644
--- a/librpc/ndr_krb5pac.pc.in
+++ b/librpc/ndr_krb5pac.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: ndr-krb5pac
 Description: NDR marshallers for the KRB5 PAC formats
 Requires: ndr
-Version: 0.0.1
+Version: @PACKAGE_VERSION@
 Libs: @LIB_RPATH@ -L${libdir} -lndr-krb5pac
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1
diff --git a/librpc/ndr_nbt.pc.in b/librpc/ndr_nbt.pc.in
index 5b69699..2083e2d 100644
--- a/librpc/ndr_nbt.pc.in
+++ b/librpc/ndr_nbt.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: ndr-nbt
 Description: NDR marshallers for nbt formats
 Requires: ndr
-Version: 0.0.1
+Version: @PACKAGE_VERSION@
 Libs: @LIB_RPATH@ -L${libdir} -lndr-nbt
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1
diff --git a/librpc/ndr_standard.pc.in b/librpc/ndr_standard.pc.in
index d400ef1..97687ba 100644
--- a/librpc/ndr_standard.pc.in
+++ b/librpc/ndr_standard.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: ndr-standard
 Description: NDR marshallers for the standard set of DCE/RPC interfaces
 Requires: ndr
-Version: 0.0.1
+Version: @PACKAGE_VERSION@
 Libs: @LIB_RPATH@ -L${libdir} -lndr-standard
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1
diff --git a/source3/pkgconfig/netapi.pc.in b/source3/pkgconfig/netapi.pc.in
deleted file mode 100644
index b1f60b2..0000000
--- a/source3/pkgconfig/netapi.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Samba libnetapi
-Description: A library to control CIFS servers
-Version: 0
-URL: http://www.samba.org/
-#Libs: -L at libdir@ -lnetapi
-Libs: -lnetapi
-Libs.private: -lnetapi @KRB5_LIBS@ @LDAP_LIBS@ @LIBS@
-Cflags: -I at includedir@
-
diff --git a/source3/pkgconfig/smbclient.pc.in b/source3/pkgconfig/smbclient.pc.in
deleted file mode 100644
index 969abbe..0000000
--- a/source3/pkgconfig/smbclient.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Samba libsmbclient
-Description: A library to access CIFS servers
-Version: 0
-URL: http://www.samba.org/
-#Libs: -L at libdir@ -lsmbclient
-Libs: -lsmbclient
-Libs.private: -lsmbclient @KRB5_LIBS@ @LDAP_LIBS@ @LIBS@
-Cflags: -I at includedir@
-
diff --git a/source3/pkgconfig/smbsharemodes.pc.in b/source3/pkgconfig/smbsharemodes.pc.in
deleted file mode 100644
index 1af7d4f..0000000
--- a/source3/pkgconfig/smbsharemodes.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Samba libsmbsharemodes
-Description: A library
-Version: 0
-URL: http://www.samba.org/
-#Libs: -L at libdir@ -lsmbsharemodes
-Libs: -lsmbsharemodes
-Libs.private: -lsmbsharemodes @LIBS@
-Cflags: -I at includedir@
-
diff --git a/source3/pkgconfig/wbclient.pc.in b/source3/pkgconfig/wbclient.pc.in
deleted file mode 100644
index 158fa92..0000000
--- a/source3/pkgconfig/wbclient.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Samba libwbclient
-Description: A library to access winbindd
-Version: 0
-URL: http://www.samba.org/
-#Libs: -L at libdir@ -lwbclient
-Libs: -lwbclient
-Libs.private: -lwbclient
-Cflags: -I at includedir@


-- 
Samba Shared Repository

More information about the samba-cvs mailing list