diff -Nru groundcontrol-1.6.6/bin/build/clean_up.sh groundcontrol-1.6.7/bin/build/clean_up.sh --- groundcontrol-1.6.6/bin/build/clean_up.sh 1970-01-01 00:00:00.000000000 +0000 +++ groundcontrol-1.6.7/bin/build/clean_up.sh 2010-10-01 19:36:37.000000000 +0000 @@ -0,0 +1,9 @@ +#!/bin/bash + +cd ../ + +rm *jaunty* +rm *karmic* +rm *lucid* +rm *.orig.* + diff -Nru groundcontrol-1.6.6/bin/build/make_release.sh groundcontrol-1.6.7/bin/build/make_release.sh --- groundcontrol-1.6.6/bin/build/make_release.sh 1970-01-01 00:00:00.000000000 +0000 +++ groundcontrol-1.6.7/bin/build/make_release.sh 2010-10-01 19:36:37.000000000 +0000 @@ -0,0 +1,34 @@ +#!/bin/bash + +PACKAGE='groundcontrol' +VERSION=`python -c "from GroundControl import __version__; print __version__"` +NAME=$PACKAGE-$VERSION +TAR=$NAME.tar.gz + +python setup.py sdist +cd dist + +#gpg --armor --sign --detach-sig $TAR +#lp-project-upload $PACKAGE $VERSION $TAR + +ORIG=${PACKAGE}_$VERSION.orig.tar.gz +mv $TAR ../../$ORIG +cd ../../ + +rm -fr $NAME +tar xzvf $ORIG + +cp -R debianfiles $NAME/debian +rm -fr $NAME/debian/.bzr + +cd $NAME + +for RELEASE in jaunty karmic lucid; do + DEBVER="$VERSION-0${RELEASE}1" + rm debian/changelog + dch --create --package=$PACKAGE -v $DEBVER --distribution $RELEASE "PPA Release Build" + debuild -S + dput ppa:doctormo/$PACKAGE ../${PACKAGE}_${DEBVER}_source.changes +done + + diff -Nru groundcontrol-1.6.6/bin/build/set_develop.sh groundcontrol-1.6.7/bin/build/set_develop.sh --- groundcontrol-1.6.6/bin/build/set_develop.sh 1970-01-01 00:00:00.000000000 +0000 +++ groundcontrol-1.6.7/bin/build/set_develop.sh 2010-10-01 19:36:37.000000000 +0000 @@ -0,0 +1,22 @@ +#!/bin/bash +# +# Copyright Martin Owens 2010 +# +# License: GPLv3 +# + +LOGFILE=/tmp/groundcontrol-devel + +reattach() { + rm $1/$2 + ln -s $PWD/$2 $1 +} + +LOCATION=$HOME/.nautilus/python-extensions + +mkdir -p $LOCATION +reattach $LOCATION nautilus-groundcontrol.py +reattach $LOCATION GroundControl + +nohup nautilus --quit & nohup nautilus $PWD & + diff -Nru groundcontrol-1.6.6/debian/changelog groundcontrol-1.6.7/debian/changelog --- groundcontrol-1.6.6/debian/changelog 2010-07-26 00:29:12.000000000 +0000 +++ groundcontrol-1.6.7/debian/changelog 2010-10-01 19:36:37.000000000 +0000 @@ -1,3 +1,9 @@ +groundcontrol (1.6.7-0maverick2) maverick; urgency=low + + * Fix lp:project branching error. + + -- Martin Owens (DoctorMO) Fri, 01 Oct 2010 15:29:22 -0400 + groundcontrol (1.6.6-0maverk2) maverick; urgency=low * Update Bazaar cleanup to fix multiple issues. diff -Nru groundcontrol-1.6.6/GroundControl/bazaar.py groundcontrol-1.6.7/GroundControl/bazaar.py --- groundcontrol-1.6.6/GroundControl/bazaar.py 2010-07-25 08:26:28.000000000 +0000 +++ groundcontrol-1.6.7/GroundControl/bazaar.py 2010-10-01 19:26:39.000000000 +0000 @@ -385,7 +385,14 @@ # A preconfigured push location. config = GlobalConfig() user = config.get_user_option('launchpad_username') - project = self.branch.url.split('/')[-3] + branch = self.branch.url + # Launchpad changed it's API and now the URL is different + if '/%2Bbranch/' in branch: + project = branch.split('/')[-2] + else: + project = branch.split('/')[-3] + # We're forming a new branch location for ourselves. + logging.debug("New Push location: %s" % push_lp) push_lp = 'lp:~%s/%s/%s' % (user, project, self.workname) dest_dir = os.path.join(self.dest, self.workname) else: diff -Nru groundcontrol-1.6.6/GroundControl/__init__.py groundcontrol-1.6.7/GroundControl/__init__.py --- groundcontrol-1.6.6/GroundControl/__init__.py 2010-07-25 08:25:09.000000000 +0000 +++ groundcontrol-1.6.7/GroundControl/__init__.py 2010-10-01 19:30:18.000000000 +0000 @@ -25,7 +25,7 @@ __stage__ = "DEV" __appname__ = "groundcontrol" -__version__ = "1.6.5" +__version__ = "1.6.7" BASE_DIR = os.path.abspath( os.path.join( os.path.dirname(os.path.realpath(__file__)), '..') )