Fixed a PE build problem under linux where extensions would get complicated extensions, not found by the old move() scheme.

.hgtags

@@ -57,3 +57,5 @@ e62183e907d6177cf0bac354e31afa9546c199e6 se3.1.2
 383b14d6e8555ed2c8d5552259bc7ce600dfb1d0 before-leopard-drop
 a2f7b7302e178f08725a6404ddc28464409510b1 se3.2.0
 5a5134a4fa9bb7ca80ae3e32010030f5bd7ba434 me6.1.0
+0fd77be57ff716d5c93232e829dc02acec036d7c se3.2.1
+3dd08060135b0b9cef70b6f5a81f191ea339c8d5 me6.1.1

build.py

@@ -17,7 +17,7 @@ from distutils.extension import Extension
 
 from hscommon import sphinxgen
 from hscommon.build import (add_to_pythonpath, print_and_do, copy_packages, filereplace,
-    get_module_version, build_all_cocoa_locs, build_all_qt_locs)
+    get_module_version, build_all_cocoa_locs, build_all_qt_locs, move_all)
 
 def parse_args():
     usage = "usage: %prog [options]"
@@ -114,14 +114,6 @@ def build_localizations(ui, edition):
         build_all_qt_locs(op.join('qt', 'lang'), extradirs=[op.join('qtlib', 'lang')])
 
 def build_pe_modules(ui):
-    def move(src, dst):
-        if not op.exists(src):
-            return
-        if op.exists(dst):
-            os.remove(dst)
-        print('Moving %s --> %s' % (src, dst))
-        os.rename(src, dst)
-    
     print("Building PE Modules")
     exts = [
         Extension("_block", [op.join('core_pe', 'modules', 'block.c'), op.join('core_pe', 'modules', 'common.c')]),
@@ -141,13 +133,9 @@ def build_pe_modules(ui):
         script_args = ['build_ext', '--inplace'],
         ext_modules = exts,
     )
-    move('_block.so', op.join('core_pe', '_block.so'))
-    move('_block.pyd', op.join('core_pe', '_block.pyd'))
-    move('_block_osx.so', op.join('core_pe', '_block_osx.so'))
-    move('_cache.so', op.join('core_pe', '_cache.so'))
-    move('_cache.pyd', op.join('core_pe', '_cache.pyd'))
-    move('_block_qt.so', op.join('qt', 'pe', '_block_qt.so'))
-    move('_block_qt.pyd', op.join('qt', 'pe', '_block_qt.pyd'))
+    move_all('_block_qt*', op.join('qt', 'pe'))
+    move_all('_block*', 'core_pe')
+    move_all('_cache*', 'core_pe')
 
 def build_normal(edition, ui, dev):
     print("Building dupeGuru {0} with UI {1}".format(edition.upper(), ui))

core_me/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '6.1.0'
+__version__ = '6.1.1'
 __appname__ = 'dupeGuru Music Edition'

core_pe/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '2.2.2'
+__version__ = '2.3.0'
 __appname__ = 'dupeGuru Picture Edition'

help/changelog_me

@@ -1,3 +1,7 @@
+=== 6.1.1 (2011-10-03)
+
+* Fixed a couple of broken action bindings from v6.1.0.
+
 === 6.1.0 (2011-09-29)
 
 * Added duplicate re-prioritization dialog. (#138)

help/changelog_pe

@@ -1,3 +1,14 @@
+=== 2.3.0 (2011-10-04)
+
+* Added duplicate re-prioritization dialog. (#138)
+* Added font size preference for duplicate table. (#82)
+* Added Quicklook support. [Mac OS X] (#21)
+* Improved behavior of Mark Selected. (#139)
+* Improved filename sorting. (#169)
+* Added Chinese (Simplified) localization by Eric Dee.
+* Tweaked the fairware system.
+* Upgraded minimum requirements to OS X 10.6 and Ubuntu 11.04.
+
 === 2.2.2 (2011-08-27)
 
 * Added German localization by Gregor Tätzner.