Fixed i18n system.

Renamed pbd3 back to pbd, since it's version 4.1 now.
Very minor fixes


git-svn-id: svn://localhost/ardour2/trunk@656 d708f5d6-7413-0410-9779-e7cbd77b26cf

70 files changed, 24 insertions, 24 deletions

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index f5f1272fb8..8df33c1f60 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -198,7 +198,7 @@ ardour.Merge ([
 	     libraries['lrdf'],
 	     libraries['samplerate'],
 	     libraries['sigc2'],
-	     libraries['pbd3'],
+	     libraries['pbd'],
 	     libraries['soundtouch'],
 	     libraries['midi++2'],
 	     libraries['glib2'],
diff --git a/libs/gtkmm2ext/SConscript b/libs/gtkmm2ext/SConscript
index b70aea3d40..5d8489f103 100644
--- a/libs/gtkmm2ext/SConscript
+++ b/libs/gtkmm2ext/SConscript
@@ -9,7 +9,7 @@ Import('env final_prefix install_prefix libraries i18n')
 gtkmm2ext = env.Copy()
 gtkmm2ext.Merge ([ 
     libraries['sigc2'], 
-    libraries['pbd3'],
+    libraries['pbd'],
     libraries['midi++2'],
     libraries['gtk2'],
     libraries['glibmm2'],
diff --git a/libs/midi++2/SConscript b/libs/midi++2/SConscript
index 928372909c..63a3b04f8d 100644
--- a/libs/midi++2/SConscript
+++ b/libs/midi++2/SConscript
@@ -7,7 +7,7 @@ import glob
 Import('env libraries install_prefix')
 
 midi2 = env.Copy()
-midi2.Merge([ libraries['sigc2'], libraries['xml'], libraries['glib2'], libraries['pbd3'] ])
+midi2.Merge([ libraries['sigc2'], libraries['xml'], libraries['glib2'], libraries['pbd'] ])
 
 domain = 'midipp'
 
diff --git a/libs/pbd3/.cvsignore b/libs/pbd/.cvsignore
index e9a15e81e9..e9a15e81e9 100644
--- a/libs/pbd3/.cvsignore
+++ b/libs/pbd/.cvsignore
diff --git a/libs/pbd3/AUTHORS b/libs/pbd/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/libs/pbd3/AUTHORS
+++ b/libs/pbd/AUTHORS
diff --git a/libs/pbd3/COPYING b/libs/pbd/COPYING
index d60c31a97a..d60c31a97a 100644
--- a/libs/pbd3/COPYING
+++ b/libs/pbd/COPYING
diff --git a/libs/pbd3/ChangeLog b/libs/pbd/ChangeLog
index 59e92915ba..59e92915ba 100644
--- a/libs/pbd3/ChangeLog
+++ b/libs/pbd/ChangeLog
diff --git a/libs/pbd3/NEWS b/libs/pbd/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/libs/pbd3/NEWS
+++ b/libs/pbd/NEWS
diff --git a/libs/pbd3/README b/libs/pbd/README
index e69de29bb2..e69de29bb2 100644
--- a/libs/pbd3/README
+++ b/libs/pbd/README
diff --git a/libs/pbd3/SConscript b/libs/pbd/SConscript
index cebb2472aa..a9166d9505 100644
--- a/libs/pbd3/SConscript
+++ b/libs/pbd/SConscript
@@ -6,18 +6,18 @@ import glob
 
 Import('env libraries i18n install_prefix')
 
-pbd3 = env.Copy()
+pbd = env.Copy()
 
 domain = 'libpbd'
 
-pbd3.Append(DOMAIN=domain,MAJOR=4,MINOR=1,MICRO=0)
-pbd3.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"")
-pbd3.Append(CXXFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
-pbd3.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
-pbd3.Append(PACKAGE=domain)
-pbd3.Append(POTFILE=domain + '.pot')
+pbd.Append(DOMAIN=domain,MAJOR=4,MINOR=1,MICRO=0)
+pbd.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"")
+pbd.Append(CXXFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
+pbd.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+pbd.Append(PACKAGE=domain)
+pbd.Append(POTFILE=domain + '.pot')
 
-pbd3_files = Split("""
+pbd_files = Split("""
 basename.cc
 base_ui.cc
 convert.cc
@@ -39,30 +39,30 @@ whitespace.cc
 xml++.cc
 """)
 
-conf = Configure(pbd3)
+conf = Configure(pbd)
 if conf.CheckFunc('getmntent'):
     conf.env.Append(CCFLAGS="-DHAVE_GETMNTENT")
 if conf.CheckCHeader('execinfo.h'):
     conf.env.Append(CXXFLAGS="-DHAVE_EXECINFO")
-pbd3 = conf.Finish()
+pbd = conf.Finish()
 
-pbd3.Merge ([ libraries['sigc2'], libraries['xml'], libraries['glibmm2'], libraries['glib2'] ])
+pbd.Merge ([ libraries['sigc2'], libraries['xml'], libraries['glibmm2'], libraries['glib2'] ])
 
-pbd3.VersionBuild(['version.cc','pbd/version.h'], 'SConscript')
+pbd.VersionBuild(['version.cc','pbd/version.h'], 'SConscript')
 
-libpbd3 = pbd3.SharedLibrary('pbd', pbd3_files)
-Default(libpbd3)
+libpbd = pbd.SharedLibrary('pbd', pbd_files)
+Default(libpbd)
 
-mount_env = Environment(CCFLAGS='-DTEST_MOUNTPOINT -Ilibs/pbd3')
+mount_env = Environment(CCFLAGS='-DTEST_MOUNTPOINT -Ilibs/pbd')
 mount_env.Program('mountpoint', 'mountpoint.cc')
 
 if env['NLS']:
-    i18n (pbd3, pbd3_files, env)
+    i18n (pbd, pbd_files, env)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libpbd3))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libpbd))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'i18n.h', 'gettext.h', 'pbd/abstract_ui.cc' ] +
-                                     pbd3_files +
+                                     pbd_files +
                                      glob.glob('po/*.po') +
                                      glob.glob('pbd/*.h')))
diff --git a/libs/pbd3/base_ui.cc b/libs/pbd/base_ui.cc
index d3c8d5e4c7..d3c8d5e4c7 100644
--- a/libs/pbd3/base_ui.cc
+++ b/libs/pbd/base_ui.cc
diff --git a/libs/pbd3/basename.cc b/libs/pbd/basename.cc
index a51e393b78..a51e393b78 100644
--- a/libs/pbd3/basename.cc
+++ b/libs/pbd/basename.cc
diff --git a/libs/pbd3/convert.cc b/libs/pbd/convert.cc
index 60d39c91e2..60d39c91e2 100644
--- a/libs/pbd3/convert.cc
+++ b/libs/pbd/convert.cc
diff --git a/libs/pbd3/dmalloc.cc b/libs/pbd/dmalloc.cc
index 0e730946c8..0e730946c8 100644
--- a/libs/pbd3/dmalloc.cc
+++ b/libs/pbd/dmalloc.cc
diff --git a/libs/pbd3/error.cc b/libs/pbd/error.cc
index a6f8fb7f8f..a6f8fb7f8f 100644
--- a/libs/pbd3/error.cc
+++ b/libs/pbd/error.cc
diff --git a/libs/pbd3/gettext.h b/libs/pbd/gettext.h
index 339c74ffe7..339c74ffe7 100644
--- a/libs/pbd3/gettext.h
+++ b/libs/pbd/gettext.h
diff --git a/libs/pbd3/i18n.h b/libs/pbd/i18n.h
index 7c79d2eb53..7c79d2eb53 100644
--- a/libs/pbd3/i18n.h
+++ b/libs/pbd/i18n.h
diff --git a/libs/pbd3/libpbd.pc.in b/libs/pbd/libpbd.pc.in
index 14d0208845..14d0208845 100644
--- a/libs/pbd3/libpbd.pc.in
+++ b/libs/pbd/libpbd.pc.in
diff --git a/libs/pbd3/libpbd.spec.in b/libs/pbd/libpbd.spec.in
index d50622d638..d50622d638 100644
--- a/libs/pbd3/libpbd.spec.in
+++ b/libs/pbd/libpbd.spec.in
diff --git a/libs/pbd3/mountpoint.cc b/libs/pbd/mountpoint.cc
index c1bcb375f3..c1bcb375f3 100644
--- a/libs/pbd3/mountpoint.cc
+++ b/libs/pbd/mountpoint.cc
diff --git a/libs/pbd3/path.cc b/libs/pbd/path.cc
index 80f916c9ae..80f916c9ae 100644
--- a/libs/pbd3/path.cc
+++ b/libs/pbd/path.cc
diff --git a/libs/pbd3/pathscanner.cc b/libs/pbd/pathscanner.cc
index 2af227a3a0..2af227a3a0 100644
--- a/libs/pbd3/pathscanner.cc
+++ b/libs/pbd/pathscanner.cc
diff --git a/libs/pbd3/pbd/.DS_Store b/libs/pbd/pbd/.DS_Store
index 5008ddfcf5..5008ddfcf5 100644
--- a/libs/pbd3/pbd/.DS_Store
+++ b/libs/pbd/pbd/.DS_Store
diff --git a/libs/pbd3/pbd/.cvsignore b/libs/pbd/pbd/.cvsignore
index 67020331ba..67020331ba 100644
--- a/libs/pbd3/pbd/.cvsignore
+++ b/libs/pbd/pbd/.cvsignore
diff --git a/libs/pbd3/pbd/abstract_ui.cc b/libs/pbd/pbd/abstract_ui.cc
index 0e34787a2d..0e34787a2d 100644
--- a/libs/pbd3/pbd/abstract_ui.cc
+++ b/libs/pbd/pbd/abstract_ui.cc
diff --git a/libs/pbd3/pbd/abstract_ui.h b/libs/pbd/pbd/abstract_ui.h
index f80db7bf1a..f80db7bf1a 100644
--- a/libs/pbd3/pbd/abstract_ui.h
+++ b/libs/pbd/pbd/abstract_ui.h
diff --git a/libs/pbd3/pbd/base_ui.h b/libs/pbd/pbd/base_ui.h
index b4570f8707..b4570f8707 100644
--- a/libs/pbd3/pbd/base_ui.h
+++ b/libs/pbd/pbd/base_ui.h
diff --git a/libs/pbd3/pbd/basename.h b/libs/pbd/pbd/basename.h
index 35aebe166c..35aebe166c 100644
--- a/libs/pbd3/pbd/basename.h
+++ b/libs/pbd/pbd/basename.h
diff --git a/libs/pbd3/pbd/compose.h b/libs/pbd/pbd/compose.h
index 0df9519aaf..0df9519aaf 100644
--- a/libs/pbd3/pbd/compose.h
+++ b/libs/pbd/pbd/compose.h
diff --git a/libs/pbd3/pbd/convert.h b/libs/pbd/pbd/convert.h
index 12e63ba6fc..12e63ba6fc 100644
--- a/libs/pbd3/pbd/convert.h
+++ b/libs/pbd/pbd/convert.h
diff --git a/libs/pbd3/pbd/error.h b/libs/pbd/pbd/error.h
index 4136f02ee2..4136f02ee2 100644
--- a/libs/pbd3/pbd/error.h
+++ b/libs/pbd/pbd/error.h
diff --git a/libs/pbd3/pbd/failed_constructor.h b/libs/pbd/pbd/failed_constructor.h
index 62eb6c0d71..62eb6c0d71 100644
--- a/libs/pbd3/pbd/failed_constructor.h
+++ b/libs/pbd/pbd/failed_constructor.h
diff --git a/libs/pbd3/pbd/fastlog.h b/libs/pbd/pbd/fastlog.h
index 4269705a44..4269705a44 100644
--- a/libs/pbd3/pbd/fastlog.h
+++ b/libs/pbd/pbd/fastlog.h
diff --git a/libs/pbd3/pbd/forkexec.h b/libs/pbd/pbd/forkexec.h
index 2af3711390..2af3711390 100644
--- a/libs/pbd3/pbd/forkexec.h
+++ b/libs/pbd/pbd/forkexec.h
diff --git a/libs/pbd3/pbd/mathfix.h b/libs/pbd/pbd/mathfix.h
index f0dc7e491e..f0dc7e491e 100644
--- a/libs/pbd3/pbd/mathfix.h
+++ b/libs/pbd/pbd/mathfix.h
diff --git a/libs/pbd3/pbd/mountpoint.h b/libs/pbd/pbd/mountpoint.h
index 86ccc58190..86ccc58190 100644
--- a/libs/pbd3/pbd/mountpoint.h
+++ b/libs/pbd/pbd/mountpoint.h
diff --git a/libs/pbd3/pbd/path.h b/libs/pbd/pbd/path.h
index 0b77a7c237..0b77a7c237 100644
--- a/libs/pbd3/pbd/path.h
+++ b/libs/pbd/pbd/path.h
diff --git a/libs/pbd3/pbd/pathscanner.h b/libs/pbd/pbd/pathscanner.h
index 346e7858c4..346e7858c4 100644
--- a/libs/pbd3/pbd/pathscanner.h
+++ b/libs/pbd/pbd/pathscanner.h
diff --git a/libs/pbd3/pbd/pool.h b/libs/pbd/pbd/pool.h
index f8e19e72fb..f8e19e72fb 100644
--- a/libs/pbd3/pbd/pool.h
+++ b/libs/pbd/pbd/pool.h
diff --git a/libs/pbd3/pbd/pthread_utils.h b/libs/pbd/pbd/pthread_utils.h
index 482b5b54cf..482b5b54cf 100644
--- a/libs/pbd3/pbd/pthread_utils.h
+++ b/libs/pbd/pbd/pthread_utils.h
diff --git a/libs/pbd3/pbd/receiver.h b/libs/pbd/pbd/receiver.h
index 5ce238df63..5ce238df63 100644
--- a/libs/pbd3/pbd/receiver.h
+++ b/libs/pbd/pbd/receiver.h
diff --git a/libs/pbd3/pbd/restartable_rw.h b/libs/pbd/pbd/restartable_rw.h
index ee84e4e295..ee84e4e295 100644
--- a/libs/pbd3/pbd/restartable_rw.h
+++ b/libs/pbd/pbd/restartable_rw.h
diff --git a/libs/pbd3/pbd/ringbuffer.h b/libs/pbd/pbd/ringbuffer.h
index 1d9c9b04e3..1d9c9b04e3 100644
--- a/libs/pbd3/pbd/ringbuffer.h
+++ b/libs/pbd/pbd/ringbuffer.h
diff --git a/libs/pbd3/pbd/ringbufferNPT.h b/libs/pbd/pbd/ringbufferNPT.h
index fee2efce3d..fee2efce3d 100644
--- a/libs/pbd3/pbd/ringbufferNPT.h
+++ b/libs/pbd/pbd/ringbufferNPT.h
diff --git a/libs/pbd3/pbd/selectable.h b/libs/pbd/pbd/selectable.h
index 470bc3cfcc..470bc3cfcc 100644
--- a/libs/pbd3/pbd/selectable.h
+++ b/libs/pbd/pbd/selectable.h
diff --git a/libs/pbd3/pbd/stacktrace.h b/libs/pbd/pbd/stacktrace.h
index d7278bd35a..d7278bd35a 100644
--- a/libs/pbd3/pbd/stacktrace.h
+++ b/libs/pbd/pbd/stacktrace.h
diff --git a/libs/pbd3/pbd/stl_delete.h b/libs/pbd/pbd/stl_delete.h
index 6e5bfa0734..6e5bfa0734 100644
--- a/libs/pbd3/pbd/stl_delete.h
+++ b/libs/pbd/pbd/stl_delete.h
diff --git a/libs/pbd3/pbd/stl_functors.h b/libs/pbd/pbd/stl_functors.h
index 4a96e91a28..4a96e91a28 100644
--- a/libs/pbd3/pbd/stl_functors.h
+++ b/libs/pbd/pbd/stl_functors.h
diff --git a/libs/pbd3/pbd/strsplit.h b/libs/pbd/pbd/strsplit.h
index e55ad1c825..e55ad1c825 100644
--- a/libs/pbd3/pbd/strsplit.h
+++ b/libs/pbd/pbd/strsplit.h
diff --git a/libs/pbd3/pbd/textreceiver.h b/libs/pbd/pbd/textreceiver.h
index b8bfe5bc78..b8bfe5bc78 100644
--- a/libs/pbd3/pbd/textreceiver.h
+++ b/libs/pbd/pbd/textreceiver.h
diff --git a/libs/pbd3/pbd/thrown_error.h b/libs/pbd/pbd/thrown_error.h
index 83cf8acfac..83cf8acfac 100644
--- a/libs/pbd3/pbd/thrown_error.h
+++ b/libs/pbd/pbd/thrown_error.h
diff --git a/libs/pbd3/pbd/tokenizer.h b/libs/pbd/pbd/tokenizer.h
index a976b79341..a976b79341 100644
--- a/libs/pbd3/pbd/tokenizer.h
+++ b/libs/pbd/pbd/tokenizer.h
diff --git a/libs/pbd3/pbd/touchable.h b/libs/pbd/pbd/touchable.h
index 0298574dfa..0298574dfa 100644
--- a/libs/pbd3/pbd/touchable.h
+++ b/libs/pbd/pbd/touchable.h
diff --git a/libs/pbd3/pbd/transmitter.h b/libs/pbd/pbd/transmitter.h
index 357cb9965f..357cb9965f 100644
--- a/libs/pbd3/pbd/transmitter.h
+++ b/libs/pbd/pbd/transmitter.h
diff --git a/libs/pbd3/pbd/undo.h b/libs/pbd/pbd/undo.h
index f067635ed3..f067635ed3 100644
--- a/libs/pbd3/pbd/undo.h
+++ b/libs/pbd/pbd/undo.h
diff --git a/libs/pbd3/pbd/whitespace.h b/libs/pbd/pbd/whitespace.h
index 6620a8fb50..6620a8fb50 100644
--- a/libs/pbd3/pbd/whitespace.h
+++ b/libs/pbd/pbd/whitespace.h
diff --git a/libs/pbd3/pbd/xml++.h b/libs/pbd/pbd/xml++.h
index afb896e1d5..afb896e1d5 100644
--- a/libs/pbd3/pbd/xml++.h
+++ b/libs/pbd/pbd/xml++.h
diff --git a/libs/pbd3/pool.cc b/libs/pbd/pool.cc
index 089766482d..089766482d 100644
--- a/libs/pbd3/pool.cc
+++ b/libs/pbd/pool.cc
diff --git a/libs/pbd3/pthread_utils.cc b/libs/pbd/pthread_utils.cc
index db242cea7b..db242cea7b 100644
--- a/libs/pbd3/pthread_utils.cc
+++ b/libs/pbd/pthread_utils.cc
diff --git a/libs/pbd3/receiver.cc b/libs/pbd/receiver.cc
index 5e7c10de70..5e7c10de70 100644
--- a/libs/pbd3/receiver.cc
+++ b/libs/pbd/receiver.cc
diff --git a/libs/pbd3/stacktrace.cc b/libs/pbd/stacktrace.cc
index 1e7dfa08e9..1e7dfa08e9 100644
--- a/libs/pbd3/stacktrace.cc
+++ b/libs/pbd/stacktrace.cc
diff --git a/libs/pbd3/strsplit.cc b/libs/pbd/strsplit.cc
index 7f29a77887..7f29a77887 100644
--- a/libs/pbd3/strsplit.cc
+++ b/libs/pbd/strsplit.cc
diff --git a/libs/pbd3/textreceiver.cc b/libs/pbd/textreceiver.cc
index 43620e9830..43620e9830 100644
--- a/libs/pbd3/textreceiver.cc
+++ b/libs/pbd/textreceiver.cc
diff --git a/libs/pbd3/transmitter.cc b/libs/pbd/transmitter.cc
index 876a9d86e5..876a9d86e5 100644
--- a/libs/pbd3/transmitter.cc
+++ b/libs/pbd/transmitter.cc
diff --git a/libs/pbd3/undo.cc b/libs/pbd/undo.cc
index f2f11b1c5c..f2f11b1c5c 100644
--- a/libs/pbd3/undo.cc
+++ b/libs/pbd/undo.cc
diff --git a/libs/pbd3/whitespace.cc b/libs/pbd/whitespace.cc
index 7f74940457..7f74940457 100644
--- a/libs/pbd3/whitespace.cc
+++ b/libs/pbd/whitespace.cc
diff --git a/libs/pbd3/xml++.cc b/libs/pbd/xml++.cc
index e496d8b2fd..e496d8b2fd 100644
--- a/libs/pbd3/xml++.cc
+++ b/libs/pbd/xml++.cc
diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript
index f8a7d574f5..ce59b1c67c 100644
--- a/libs/surfaces/control_protocol/SConscript
+++ b/libs/surfaces/control_protocol/SConscript
@@ -34,7 +34,7 @@ cp.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
 cp.Merge ([
     libraries['ardour'],
     libraries['sigc2'],
-    libraries['pbd3'],
+    libraries['pbd'],
     libraries['midi++2'],
     libraries['xml'],
     libraries['usb'],
diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript
index 1760eb24e9..213a81a99d 100644
--- a/libs/surfaces/generic_midi/SConscript
+++ b/libs/surfaces/generic_midi/SConscript
@@ -34,7 +34,7 @@ genericmidi.Merge ([
 	libraries['ardour'],
 	libraries['ardour_cp'],
 	libraries['midi++2'],
-	libraries['pbd3'],
+	libraries['pbd'],
 	libraries['sigc2'],
 	libraries['usb'],
 	libraries['xml'],
diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript
index 8f3568aa8f..3f9cc5cc15 100644
--- a/libs/surfaces/tranzport/SConscript
+++ b/libs/surfaces/tranzport/SConscript
@@ -34,7 +34,7 @@ tranzport.Merge ([
     libraries['ardour'],
     libraries['ardour_cp'],
     libraries['sigc2'],
-    libraries['pbd3'],
+    libraries['pbd'],
     libraries['midi++2'],
     libraries['xml'],
     libraries['usb'],