libftdi: (tomj) prepare 0.6 release, set library version again (#404)

diff --git a/ChangeLog b/ChangeLog
index 87d9f4c..449b988 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
 New in 0.6
 ----------
+* Set library version on .so file again
+* Configurable serial line parameters (Alain Abbas)
 * Improved filtering of status bytes (Evgeny Sinelnikov)
 * Extended FT2232C support (Uwe Bonnes)
 * Small improvement to the baudrate calculation code (Emil)
-* Error handling cleanup (Rogier Wolff)
-* Fix for kernel 2.6 USB subsystem. Detects kernel at runtime.
+* Error handling cleanup (Rogier Wolff and Intra2net)
 
 New in 0.5
 ----------

diff --git a/configure.in b/configure.in
index 99cec8b..091cae5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(configure.in)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libftdi, 0.5)
+AM_INIT_AUTOMAKE(libftdi, 0.6)
 
 AC_LANG_C
 AC_PROG_CC

diff --git a/libftdi.kdevelop b/libftdi.kdevelop
index 5e865f5..bdff7de 100644 (file)
--- a/libftdi.kdevelop
+++ b/libftdi.kdevelop
@@ -1,25 +1,34 @@
 <?xml version = '1.0'?>
 <kdevelop>
   <general>
-    <author>Gerd v. Egidy</author>
+    <author>Thomas Jarosch</author>
     <email>opensource@intra2net.com</email>
-    <version>0.3</version>
+    <version>0.6</version>
     <projectmanagement>KDevAutoProject</projectmanagement>
     <primarylanguage>C</primarylanguage>
     <keywords>
       <keyword>C</keyword>
       <keyword>Code</keyword>
     </keywords>
+    <projectdirectory>.</projectdirectory>
+    <absoluteprojectpath>false</absoluteprojectpath>
+    <description></description>
+    <ignoreparts/>
+    <secondaryLanguages/>
   </general>
   <kdevautoproject>
     <general>
       <activetarget>src/libftdi</activetarget>
-      <useconfiguration>debug</useconfiguration>
+      <useconfiguration>default</useconfiguration>
     </general>
     <run>
       <mainprogram>src/libftdi</mainprogram>
       <terminal>true</terminal>
       <directoryradio>executable</directoryradio>
+      <customdirectory>/</customdirectory>
+      <programargs></programargs>
+      <autocompile>true</autocompile>
+      <envvars/>
     </run>
     <configurations>
       <optimized>
@@ -37,12 +46,20 @@
         <f77compiler>kdevg77options</f77compiler>
         <cflags>-O0 -g3</cflags>
       </debug>
+      <default>
+        <envvars/>
+      </default>
     </configurations>
     <make>
       <envvars>
         <envvar value="1" name="WANT_AUTOCONF_2_5" />
         <envvar value="1" name="WANT_AUTOMAKE_1_6" />
       </envvars>
+      <abortonerror>false</abortonerror>
+      <numberofjobs>1</numberofjobs>
+      <dontact>false</dontact>
+      <makebin></makebin>
+      <prio>0</prio>
     </make>
   </kdevautoproject>
   <kdevdoctreeview>
@@ -94,6 +111,7 @@
     </ignoredoxygen>
   </kdevdoctreeview>
   <kdevfilecreate>
+    <filetypes/>
     <useglobaltypes>
       <type ext="c" />
       <type ext="h" />
@@ -109,6 +127,7 @@
     <tree>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
+      <showvcsfields>false</showvcsfields>
     </tree>
   </kdevfileview>
   <kdevcppsupport>
@@ -126,4 +145,42 @@
       <headerCompletionDelay>250</headerCompletionDelay>
     </codecompletion>
   </kdevcppsupport>
+  <cppsupportpart>
+    <filetemplates>
+      <interfacesuffix>.h</interfacesuffix>
+      <implementationsuffix>.cpp</implementationsuffix>
+    </filetemplates>
+  </cppsupportpart>
+  <kdevdebugger>
+    <general>
+      <programargs></programargs>
+      <gdbpath></gdbpath>
+      <dbgshell></dbgshell>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
+      <breakonloadinglibs>true</breakonloadinglibs>
+      <separatetty>false</separatetty>
+      <floatingtoolbar>false</floatingtoolbar>
+    </general>
+    <display>
+      <staticmembers>false</staticmembers>
+      <demanglenames>true</demanglenames>
+      <outputradix>10</outputradix>
+    </display>
+  </kdevdebugger>
+  <kdevdocumentation>
+    <projectdoc>
+      <docsystem></docsystem>
+      <docurl></docurl>
+      <usermanualurl></usermanualurl>
+    </projectdoc>
+  </kdevdocumentation>
+  <kdevcvsservice>
+    <recursivewhenupdate>true</recursivewhenupdate>
+    <prunedirswhenupdate>true</prunedirswhenupdate>
+    <createdirswhenupdate>true</createdirswhenupdate>
+    <recursivewhencommitremove>true</recursivewhencommitremove>
+    <revertoptions>-C</revertoptions>
+  </kdevcvsservice>
 </kdevelop>

diff --git a/libftdi.spec b/libftdi.spec
index bfe091a..1dddc35 100644 (file)
--- a/libftdi.spec
+++ b/libftdi.spec
@@ -1,7 +1,7 @@
 Summary:   Library to program and control the FTDI USB controller
 Name:      libftdi
-Version:   0.5
-Release:   2
+Version:   0.6
+Release:   1
 Copyright: LGPL
 Group:     System Environment/Libraries
 Vendor:    Intra2net AG

diff --git a/src/Makefile.am b/src/Makefile.am
index e80778e..1af8e0b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,3 +6,8 @@ INCLUDES= $(all_includes)
 lib_LTLIBRARIES =  libftdi.la
 libftdi_la_SOURCES =  ftdi.c
 include_HEADERS =  ftdi.h
+
+# Note:  If you specify a:b:c as the version in the next line,
+#  the library that is made has version (a-c).c.b.  In this
+#  example, the version is 2.1.2. (3:2:1)
+libftdi_la_LDFLAGS = -version-info 6:0:6 $(all_libraries)