On 04/08/2013 07:12 PM, Scott Talbert wrote:
> Not that I can think of.  I've got congruity pretty much ready to go, too.

OK, awesome. I cleaned up my diff - there was a bunch of small things to clean
up. I also commented a lot of gen_udev_support. I then tested that udev-acl
still looked identical and tested generic_udev (it worked), and then tested
the old_udev looked correct.

It's merged, final testing would be great.

Also, I tested my 1100 as well to make sure it still worked... and that
dnsmasq was killed when we were done.

>> Then I just need to carve out some time this week to do slight branch 
>> cleanup,
>> and then cut a release.
> 
> You know you really need to move to away from CVS when you have to set 
> aside time to go branch cleanup.  :)

TRUE. I don't like CVS, but I hate SVN more, which is why we're on CVS since
those were the only two options. I do really like git though.

I'll get the release out this week.

Attached is the patch that moves all the versions I plan to move:

* ABI bump to 3
* Version bump to 1.0
* Change concordance to link directly to version 3.
* Necessary python changes

You may want to test this with Concordance.

I'll commit this along with the other stuff when I prep the release.

-- 
Phil Dibowitz                             p...@ipom.com
Open Source software and tech docs        Insanity Palace of Metallica
http://www.phildev.net/                   http://www.ipom.com/

"Be who you are and say what you feel, because those who mind don't matter
 and those who matter don't mind."
 - Dr. Seuss

Index: concordance/Makefile.am
===================================================================
RCS file: /cvsroot/concordance/concordance/concordance/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- concordance/Makefile.am	1 Aug 2010 15:28:53 -0000	1.8
+++ concordance/Makefile.am	9 Apr 2013 10:24:24 -0000
@@ -1,6 +1,6 @@
 bin_PROGRAMS = concordance
 concordance_SOURCES = concordance.c
-concordance_LDFLAGS = -lconcord
+concordance_LDFLAGS = -l:libconcord.so.3
 ACLOCAL_AMFLAGS= -I m4
 # -Wall just makes good sense
 # -ansi and -pednatic errors are needed to ensure we're compatible with
Index: concordance/concordance.c
===================================================================
RCS file: /cvsroot/concordance/concordance/concordance/concordance.c,v
retrieving revision 1.41.2.24
diff -u -r1.41.2.24 concordance.c
--- concordance/concordance.c	29 Mar 2013 20:44:01 -0000	1.41.2.24
+++ concordance/concordance.c	9 Apr 2013 10:24:24 -0000
@@ -112,7 +112,7 @@
 #define DEFAULT_FW_FILENAME_BIN "firmware.bin"
 #define DEFAULT_SAFE_FILENAME "safe.bin"
 
-const char * const VERSION = "0.23+CVS";
+const char * const VERSION = "1.0";
 
 struct options_t {
 	int binary;
Index: concordance/configure.ac
===================================================================
RCS file: /cvsroot/concordance/concordance/concordance/configure.ac,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 configure.ac
--- concordance/configure.ac	28 Aug 2010 16:45:20 -0000	1.5.2.1
+++ concordance/configure.ac	9 Apr 2013 10:24:25 -0000
@@ -1,4 +1,4 @@
-AC_INIT([concordance], [0.23], [bug-autom...@gnu.org])
+AC_INIT([concordance], [1.0], [bug-autom...@gnu.org])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_LIBTOOL
Index: libconcord/Makefile.am
===================================================================
RCS file: /cvsroot/concordance/concordance/libconcord/Makefile.am,v
retrieving revision 1.11.2.9
diff -u -r1.11.2.9 Makefile.am
--- libconcord/Makefile.am	9 Apr 2013 10:03:40 -0000	1.11.2.9
+++ libconcord/Makefile.am	9 Apr 2013 10:24:25 -0000
@@ -6,7 +6,7 @@
 	 remote_info.h web.h protocol.h remote.h usblan.h xml_headers.h \
 	 operationfile.cpp remote_mh.cpp
 include_HEADERS = libconcord.h
-libconcord_la_LDFLAGS = -version-info 2:0:0 -lusb -lzzip
+libconcord_la_LDFLAGS = -version-info 3:0:0 -lusb -lzzip
 UDEVROOT ?= /
 UDEVLIBDIR ?= $(UDEVROOT)/lib
 
Index: libconcord/configure.ac
===================================================================
RCS file: /cvsroot/concordance/concordance/libconcord/configure.ac,v
retrieving revision 1.7.2.3
diff -u -r1.7.2.3 configure.ac
--- libconcord/configure.ac	17 Mar 2012 08:03:18 -0000	1.7.2.3
+++ libconcord/configure.ac	9 Apr 2013 10:24:25 -0000
@@ -1,4 +1,4 @@
-AC_INIT([libconcord], [0.23], [bug-autom...@gnu.org])
+AC_INIT([libconcord], [1.0], [bug-autom...@gnu.org])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_LIBTOOL
Index: libconcord/bindings/python/libconcord.py
===================================================================
RCS file: /cvsroot/concordance/concordance/libconcord/bindings/python/libconcord.py,v
retrieving revision 1.9.2.5
diff -u -r1.9.2.5 libconcord.py
--- libconcord/bindings/python/libconcord.py	12 Jan 2013 23:50:33 -0000	1.9.2.5
+++ libconcord/bindings/python/libconcord.py	9 Apr 2013 10:24:25 -0000
@@ -32,7 +32,7 @@
 # Define the libconcord ABI this libconcord.py corresponds to
 # Bump this when the .so file version gets bumped
 
-ABI_VERSION = 2
+ABI_VERSION = 3
 
 # Load the DLL
 
Index: libconcord/bindings/python/setup.py
===================================================================
RCS file: /cvsroot/concordance/concordance/libconcord/bindings/python/setup.py,v
retrieving revision 1.3.2.1
diff -u -r1.3.2.1 setup.py
--- libconcord/bindings/python/setup.py	28 Aug 2010 16:45:20 -0000	1.3.2.1
+++ libconcord/bindings/python/setup.py	9 Apr 2013 10:24:25 -0000
@@ -24,7 +24,7 @@
 
 setup(
     name='libconcord',
-    version='0.23',
+    version='1.0',
     py_modules=['libconcord'],
 )
 

Attachment: signature.asc
Description: OpenPGP digital signature

------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
concordance-devel mailing list
concordance-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/concordance-devel

Reply via email to