From a6c01f6868af1a24c7dd2e31b91161bd3d374652 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Wed, 30 May 2012 13:53:09 -0700 Subject: [PATCH] Updated debian packaging for Ubuntu 12.04. --- README | 18 ++++-------------- debian_me/control | 4 ++-- debian_pe/control | 2 +- debian_se/control | 4 ++-- package.py | 9 --------- 5 files changed, 9 insertions(+), 28 deletions(-) diff --git a/README b/README index 4244151e..c06ee947 100644 --- a/README +++ b/README @@ -80,26 +80,16 @@ If you didn't use mercurial to download this source, you probably have an incomp External projects (hscommon, qtlib, cocoalib) need to be at the root of the dupeGuru project folder. You'll have to download those separately. Or use mercurial, it's much easier. -As far as I can tell, you don't *have* to compile/install everything manually and you can normally -use `easy_install` to install python dependencies. However, be aware that compiling/installing -manually from the repositories of each project is what I personally do, so if you hit a snag -somewhere, you might want to try the manual way. - -PyObjC's website is badly outdated. Also, as far as I can tell, the package installable with -`easy_install` has good chances of not working. Your best bet is to download the latest tagged -version from the repository and compile it from source. - Another one on OS X: I wouldn't use macports/fink/whatever. Whenever I tried using those, I always ended up with problems. -On OSX Lion, for dupeGuru PE, make sure that you installed the latest version of macholib because there was a -10.7 related bug that was fixed recently. Right now, the fix hasn't even been released yet so you -have to install directly from the repo ( http://bitbucket.org/ronaldoussoren/macholib ). The fix -in question is at http://bitbucket.org/ronaldoussoren/macholib/changeset/4ab0de0f5b60 - Whenever you have a problem, always double-check that you're running the correct python version. You'll probably have to tweak your $PATH. +To setup a build machine under Ubuntu 12.04 and up, install those packages: python3, python3-pyqt4, +pyqt4-dev-tools, mercurial and then python3-setuptools. Once you've done that, install pip with +`easy_install`. Once you've done that, you can then perform "The easy way!" installation. + Building dupeGuru ================= diff --git a/debian_me/control b/debian_me/control index 50f37c4e..1ab39bd3 100644 --- a/debian_me/control +++ b/debian_me/control @@ -7,6 +7,6 @@ Standards-Version: 3.8.1 Homepage: http://www.hardcoded.net Package: dupeguru-me -Architecture: any -Depends: python3 (>=3.2), libqtgui4 +Architecture: all +Depends: python3 (>=3.2), python3-pyqt4 Description: dupeGuru Music Edition diff --git a/debian_pe/control b/debian_pe/control index 77164d75..7d8c820c 100644 --- a/debian_pe/control +++ b/debian_pe/control @@ -8,5 +8,5 @@ Homepage: http://www.hardcoded.net Package: dupeguru-pe Architecture: any -Depends: python3 (>=3.2), libqtgui4 +Depends: python3 (>=3.2), python3-pyqt4 Description: dupeGuru Picture Edition diff --git a/debian_se/control b/debian_se/control index 5e72380f..57bf9ef3 100644 --- a/debian_se/control +++ b/debian_se/control @@ -7,6 +7,6 @@ Standards-Version: 3.8.1 Homepage: http://www.hardcoded.net Package: dupeguru-se -Architecture: any -Depends: python3 (>=3.2), libqtgui4 +Architecture: all +Depends: python3 (>=3.2), python3-pyqt4 Description: dupeGuru diff --git a/package.py b/package.py index b0b8ef12..5189089e 100644 --- a/package.py +++ b/package.py @@ -99,15 +99,6 @@ def package_debian(edition): if edition == 'me': packages.append('hsaudiotag') copy_packages(packages, srcpath) - import sip, PyQt4 - shutil.copy(sip.__file__, srcpath) - qtsrcpath = op.dirname(PyQt4.__file__) - qtdestpath = op.join(srcpath, 'PyQt4') - os.makedirs(qtdestpath) - shutil.copy(op.join(qtsrcpath, '__init__.py'), qtdestpath) - shutil.copy(op.join(qtsrcpath, 'Qt.so'), qtdestpath) - shutil.copy(op.join(qtsrcpath, 'QtCore.so'), qtdestpath) - shutil.copy(op.join(qtsrcpath, 'QtGui.so'), qtdestpath) shutil.copytree(ed('debian_{0}'), op.join(destpath, 'debian')) changelogpath = op.join('help', ed('changelog_{}')) changelog_dest = op.join(destpath, 'debian', 'changelog')