git.decadent.org.uk Git

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 20:54:31 +0000 (21:54 +0100)]

Update dinstall for new makemaintainers.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 20:48:08 +0000 (20:48 +0000)]

Add logging to make-maintainers.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 20:35:53 +0000 (20:35 +0000)]

Add missing stuff to make-maintainers.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 20:00:56 +0000 (21:00 +0100)]

Rewrite make-maintainers from scratch.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 18:34:30 +0000 (18:34 +0000)]

Extend debugging info for DBSource.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 18:30:39 +0000 (19:30 +0100)]

Replace SrcUploaders class by SQLA relationship.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 15:38:31 +0000 (15:38 +0000)]

bugfix

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 15:36:25 +0000 (16:36 +0100)]

Don't assume arch 'all' has id 2 in daklib/lists.py.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 15:19:04 +0000 (16:19 +0100)]

Fix SIGPIPE errors in source contents scan.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 13:33:08 +0000 (14:33 +0100)]

Fix and improve cron.unchecked.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 13:26:26 +0000 (14:26 +0100)]

Merge branch 'master' into contents

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 13:11:31 +0000 (14:11 +0100)]

Fix table src_contents.

- Add missing index.
- Add missing columns 'created' and 'modified'.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 11:40:38 +0000 (12:40 +0100)]

Merge branch 'master' into contents

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 11:38:06 +0000 (11:38 +0000)]

Improve source contents logging a bit.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 11:30:28 +0000 (12:30 +0100)]

Start writing source contents.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 11:21:22 +0000 (12:21 +0100)]

Add class SourceContentsWriter.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Mark Hymers [Thu, 24 Mar 2011 11:05:29 +0000 (11:05 +0000)]

Fix reject message generation

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Thu, 24 Mar 2011 10:56:33 +0000 (10:56 +0000)]

deal with NULL source_acls

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Thu, 24 Mar 2011 10:56:14 +0000 (10:56 +0000)]

filter on active keyrings only

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Thu, 24 Mar 2011 10:50:52 +0000 (10:50 +0000)]

Merge remote branch 'mhy/master' into merge

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Thu, 24 Mar 2011 10:50:36 +0000 (10:50 +0000)]

Allow us to mark keyrings as no longer in use

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Thu, 24 Mar 2011 10:43:02 +0000 (10:43 +0000)]

Merge remote branch 'mhy/master' into merge

Conflicts:
daklib/utils.py

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Thu, 24 Mar 2011 10:42:09 +0000 (10:42 +0000)]

Load keyring names from the database instead of the config file

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Joerg Jaspert [Thu, 24 Mar 2011 10:33:44 +0000 (11:33 +0100)]

Merge remote-tracking branch 'ansgar/package-set' into merge

* ansgar/package-set:
  process-new: allow overrides to work for Package-Set
  Make use of Package-Set in determine_new
  queue.Upload: separate code to load .dsc from check_dsc
  utils.py: Add parser for Package-Set field in .dsc
  process-upload: Dinstall::LintianTags may not be set

Signed-off-by: Joerg Jaspert <joerg@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 09:19:02 +0000 (10:19 +0100)]

Refactor class ContentsWriter to prepare for source contents.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Ansgar Burchardt [Thu, 24 Mar 2011 08:45:37 +0000 (08:45 +0000)]

process-new: allow overrides to work for Package-Set

New packages from Package-Set do not always have files assocciated with
them. In that case edited overrides would be lost once we call
override_new again. We pass the old new dictionary so we can preserve
this information.

Signed-off-by: Ansgar Burchardt <ansgar@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 08:36:52 +0000 (09:36 +0100)]

Merge branch 'contents' into pkgsrc

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 08:36:45 +0000 (09:36 +0100)]

Merge branch 'pkgsrc' of ftp-master.debian.org:public_html/dak into pkgsrc

commit | commitdiff | tree

Ansgar Burchardt [Thu, 24 Mar 2011 08:36:15 +0000 (08:36 +0000)]

Make use of Package-Set in determine_new

Make use of the Package-Set field of an included .dsc file when looking
for NEW packages. See http://bugs.debian.org/619131 for more
information.

Signed-off-by: Ansgar Burchardt <ansgar@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 08:35:23 +0000 (09:35 +0100)]

Merge branch 'master' into contents

Conflicts:
daklib/dbconn.py

commit | commitdiff | tree

Ansgar Burchardt [Thu, 24 Mar 2011 08:32:17 +0000 (08:32 +0000)]

queue.Upload: separate code to load .dsc from check_dsc

Move the code to load the .dsc file into the self.pkg.dsc dictionary
into a separate function so it can be called without the side effects in
check_dsc.

Signed-off-by: Ansgar Burchardt <ansgar@debian.org>

commit | commitdiff | tree

Ansgar Burchardt [Thu, 24 Mar 2011 08:29:32 +0000 (08:29 +0000)]

utils.py: Add parser for Package-Set field in .dsc

See http://bugs.debian.org/619131 for more information.

Signed-off-by: Ansgar Burchardt <ansgar@debian.org>

commit | commitdiff | tree

Ansgar Burchardt [Thu, 24 Mar 2011 08:28:19 +0000 (08:28 +0000)]

process-upload: Dinstall::LintianTags may not be set

Handle the case when Dinstall::LintianTags is not set correctly.

Signed-off-by: Ansgar Burchardt <ansgar@debian.org>

commit | commitdiff | tree

Torsten Werner [Thu, 24 Mar 2011 08:28:05 +0000 (08:28 +0000)]

Refactor functions getSource() and getBinaries().

Both functions are moved from dak/generate_filelist.py to
daklib/lists.py. The generator now yields a tuple with the id as the
first element.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 21:53:29 +0000 (22:53 +0100)]

Merge branch 'master' of ftp-master.debian.org:/srv/ftp.debian.org/git/dak

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 21:45:10 +0000 (22:45 +0100)]

ORMObject: make validation more robust.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Joerg Jaspert [Wed, 23 Mar 2011 21:25:42 +0000 (22:25 +0100)]

Merge branch 'merge'

* merge:
Fix dak update-db

commit | commitdiff | tree

Joerg Jaspert [Wed, 23 Mar 2011 21:25:39 +0000 (22:25 +0100)]

Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

* 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak:
Proper fix for validate problem
validate is somehow causing a double flush; comment for now

commit | commitdiff | tree

Joerg Jaspert [Wed, 23 Mar 2011 21:25:26 +0000 (22:25 +0100)]

Merge remote-tracking branch 'ansgar/fix-update-db' into merge

* ansgar/fix-update-db:
Fix dak update-db

Signed-off-by: Joerg Jaspert <joerg@debian.org>

commit | commitdiff | tree

Mark Hymers [Wed, 23 Mar 2011 21:20:35 +0000 (21:20 +0000)]

Proper fix for validate problem

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Wed, 23 Mar 2011 21:19:13 +0000 (21:19 +0000)]

validate is somehow causing a double flush; comment for now

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Joerg Jaspert [Wed, 23 Mar 2011 21:05:40 +0000 (22:05 +0100)]

Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

* 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak:
  Fix up permissions
  metadata generation work
  Use UnpackedSource in queue.py.
  Improve exception handling in make-changelog.
  Work with service mode
  Use UnpackedSource in make-changelog.
  Add new class UnpackedSource and a new test.
  Start work on Packages import

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 19:59:45 +0000 (20:59 +0100)]

Optimize file rename in dak generate.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 19:50:00 +0000 (19:50 +0000)]

Handle exceptions in dak contents scan-source.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 19:44:17 +0000 (20:44 +0100)]

Rename contents subcommands to be consistent with metadata.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 19:27:48 +0000 (19:27 +0000)]

bugfixes

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Mark Hymers [Wed, 23 Mar 2011 19:27:34 +0000 (19:27 +0000)]

Fix up permission

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Wed, 23 Mar 2011 19:22:59 +0000 (19:22 +0000)]

Fix up permissions

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 19:11:41 +0000 (20:11 +0100)]

Add subcommand source-scan to 'dak contents'.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 19:03:33 +0000 (20:03 +0100)]

Add class SourceContentsScanner.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Joerg Jaspert [Wed, 23 Mar 2011 18:59:10 +0000 (19:59 +0100)]

move to service usage

Signed-off-by: Joerg Jaspert <joerg@debian.org>

commit | commitdiff | tree

Ansgar Burchardt [Wed, 23 Mar 2011 17:51:31 +0000 (17:51 +0000)]

commit | commitdiff | tree

Mark Hymers [Wed, 23 Mar 2011 18:36:19 +0000 (18:36 +0000)]

Merge remote branch 'mhy/psimport' into merge

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Wed, 23 Mar 2011 18:34:24 +0000 (18:34 +0000)]

metadata generation work

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Wed, 23 Mar 2011 18:33:54 +0000 (18:33 +0000)]

Merge remote branch 'ftpmaster/master' into psimport

Conflicts:
daklib/dbconn.py

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 18:02:48 +0000 (19:02 +0100)]

Rename ContentsScanner to BinaryContentsScanner.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 16:23:29 +0000 (17:23 +0100)]

Use UnpackedSource in queue.py.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 16:01:35 +0000 (17:01 +0100)]

Merge branch 'contents'

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 15:58:45 +0000 (15:58 +0000)]

Improve exception handling in make-changelog.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Mark Hymers [Wed, 23 Mar 2011 14:37:09 +0000 (14:37 +0000)]

Merge remote branch 'mhy/master' into merge

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Wed, 23 Mar 2011 14:36:28 +0000 (14:36 +0000)]

Work with service mode

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Joerg Jaspert [Wed, 23 Mar 2011 14:33:50 +0000 (15:33 +0100)]

allow null versions

Signed-off-by: Joerg Jaspert <joerg@debian.org>

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 13:52:41 +0000 (14:52 +0100)]

Use UnpackedSource in make-changelog.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 12:40:25 +0000 (13:40 +0100)]

Add new class UnpackedSource and a new test.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Joerg Jaspert [Wed, 23 Mar 2011 12:54:36 +0000 (13:54 +0100)]

use service name

Signed-off-by: Joerg Jaspert <joerg@debian.org>

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 11:10:08 +0000 (12:10 +0100)]

Merge branch 'pkgsrc'

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 11:09:11 +0000 (12:09 +0100)]

Metadata: add cascading to mapper configuration.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Joerg Jaspert [Wed, 23 Mar 2011 10:38:46 +0000 (11:38 +0100)]

Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

* 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak:
Configure and test more mapper relationships.

commit | commitdiff | tree

Joerg Jaspert [Wed, 23 Mar 2011 10:38:41 +0000 (11:38 +0100)]

no longer pgdatabase

Signed-off-by: Joerg Jaspert <joerg@debian.org>

commit | commitdiff | tree

Torsten Werner [Wed, 23 Mar 2011 08:54:45 +0000 (09:54 +0100)]

Configure and test more mapper relationships.

- DBBinary and DBSource have relationships to BinaryMetadata and SourceMetadata.
- Both have an associationproxy to hide the details.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Mark Hymers [Wed, 23 Mar 2011 09:53:09 +0000 (09:53 +0000)]

Start work on Packages import

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Torsten Werner [Tue, 22 Mar 2011 22:02:25 +0000 (23:02 +0100)]

Add Metadata classes + tests.

+ some cleanup of dbconn.py

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Tue, 22 Mar 2011 20:09:06 +0000 (21:09 +0100)]

Merge branch 'contents' of ftp-master.debian.org:public_html/dak into contents

commit | commitdiff | tree

Torsten Werner [Tue, 22 Mar 2011 20:05:58 +0000 (20:05 +0000)]

Replace DBConn.reset() by something more robust.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Tue, 22 Mar 2011 19:18:14 +0000 (19:18 +0000)]

Fix database tests.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Joerg Jaspert [Tue, 22 Mar 2011 18:32:32 +0000 (19:32 +0100)]

gps

move stable/oldstable into gps too, so we only generate packages/sources
from there, ever

Signed-off-by: Joerg Jaspert <joerg@debian.org>

commit | commitdiff | tree

Joerg Jaspert [Tue, 22 Mar 2011 18:01:28 +0000 (19:01 +0100)]

license

Signed-off-by: Joerg Jaspert <joerg@debian.org>

commit | commitdiff | tree

Torsten Werner [Tue, 22 Mar 2011 16:48:13 +0000 (16:48 +0000)]

Contents: replace multithreading by multiprocessing.

That avoids the global interpreter lock of CPython.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Tue, 22 Mar 2011 15:50:39 +0000 (16:50 +0100)]

Merge branch 'contents'

commit | commitdiff | tree

Torsten Werner [Tue, 22 Mar 2011 15:42:58 +0000 (15:42 +0000)]

Add more logging to contents generate.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Mark Hymers [Tue, 22 Mar 2011 15:07:29 +0000 (15:07 +0000)]

Merge remote branch 'mhy/master' into merge

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Tue, 22 Mar 2011 15:06:04 +0000 (15:06 +0000)]

Add Built-Using support

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Torsten Werner [Tue, 22 Mar 2011 14:54:11 +0000 (14:54 +0000)]

Contents: ignore errors when removing destination file.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Torsten Werner [Tue, 22 Mar 2011 14:47:09 +0000 (14:47 +0000)]

Do no longer re-exec dak contents.

We just call DBConn().reset() in the child process now.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Joerg Jaspert [Tue, 22 Mar 2011 14:31:15 +0000 (15:31 +0100)]

ries sync

no longer push or name anything merkel
sync ries differently depending on if its called with sync or pool
that way cron.hourly does a small sync while cron.dinstall a full one triggers

Signed-off-by: Joerg Jaspert <joerg@debian.org>

commit | commitdiff | tree

Joerg Jaspert [Tue, 22 Mar 2011 13:50:12 +0000 (14:50 +0100)]

shutup

Signed-off-by: Joerg Jaspert <joerg@debian.org>

commit | commitdiff | tree

Torsten Werner [Tue, 22 Mar 2011 13:18:55 +0000 (13:18 +0000)]

Contents: use the new string_agg() function of Pg9.

Signed-off-by: Torsten Werner <twerner@debian.org>

commit | commitdiff | tree

Joerg Jaspert [Tue, 22 Mar 2011 13:09:55 +0000 (14:09 +0100)]

Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

* 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak:
  Fix typo
  Improve db conf handling
  Commit uncommitted fix
  Patch in support for service= DSN syntax

commit | commitdiff | tree

Joerg Jaspert [Tue, 22 Mar 2011 13:09:49 +0000 (14:09 +0100)]

add the syncscript for ries. also call it hourly

Signed-off-by: Joerg Jaspert <joerg@debian.org>

commit | commitdiff | tree

Mark Hymers [Tue, 22 Mar 2011 10:56:55 +0000 (10:56 +0000)]

Don't remove sources which are referenced by other binaries

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Tue, 22 Mar 2011 10:42:39 +0000 (10:42 +0000)]

Fix typo

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Tue, 22 Mar 2011 10:41:51 +0000 (10:41 +0000)]

Merge remote branch 'mhy/master' into merge

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Tue, 22 Mar 2011 10:41:17 +0000 (10:41 +0000)]

Improve db conf handling

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Tue, 22 Mar 2011 10:21:58 +0000 (10:21 +0000)]

Commit uncommitted fix

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Tue, 22 Mar 2011 10:20:18 +0000 (10:20 +0000)]

Merge remote branch 'mhy/master' into merge

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Tue, 22 Mar 2011 10:18:57 +0000 (10:18 +0000)]

Patch in support for service= DSN syntax

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Joerg Jaspert [Tue, 22 Mar 2011 10:14:10 +0000 (11:14 +0100)]

add ries

Signed-off-by: Joerg Jaspert <joerg@debian.org>

commit | commitdiff | tree

Mark Hymers [Mon, 21 Mar 2011 21:45:58 +0000 (21:45 +0000)]

Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

commit | commitdiff | tree

Mark Hymers [Mon, 21 Mar 2011 21:45:43 +0000 (21:45 +0000)]

Merge remote branch 'mhy/master' into merge

Signed-off-by: Mark Hymers <mhy@debian.org>

commit | commitdiff | tree

Mark Hymers [Mon, 21 Mar 2011 21:38:29 +0000 (21:38 +0000)]