Merge lp:~rockstar/dmedia/remove-debian into lp:~jderose/dmedia/trunk

[Paul Hummer]

This branch kills the debian branch in trunk. Essentially, this is what I did:

bzr branch lp:dmedia remove-packaging
cd remove-packaging
bzr rm debian
bzr commit

That's this branch. It will remove it. Then I created lp:~novacut-community/dmedia/packaging as a branch of this remove-packaging branch, and added the debian dir back in (with history) by essentially reversing the revision that removed the debian dir. This means that when you do a log on the debian/ files, you'll get history as far back as revno 1 of dmedia (assuming these files were in revno 1). I did by doing:

bzr merge . -r 103..102

This says "Merge in the revisions 103-102 of this branch" and since I specified the revisions backwards, it applies the diff backwards, essentially reversing it.

Feel free to take over ownership of lp:~novacut-community/dmedia/packaging. I just needed a place to put the followup branch that wasn't me, it made the most sense there.

=== removed directory 'debian'
=== removed file 'debian/changelog'
--- debian/changelog	2010-11-07 20:04:15 +0000
+++ debian/changelog	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-dmedia (0.0.4-0ubuntu1) maverick; urgency=low
-
-  * New release
-
- -- Jason Gerard DeRose <[e-mail]>  Sun, 07 Nov 2010 20:02:10 +0000

=== removed file 'debian/compat'
--- debian/compat	2010-05-08 22:01:47 +0000
+++ debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-7

=== removed file 'debian/control'
--- debian/control	2010-10-22 05:13:35 +0000
+++ debian/control	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-Source: dmedia
-Section: python
-Priority: optional
-Maintainer: Jason Gerard DeRose <[e-mail]>
-Build-Depends: debhelper (>= 7.4), python (>= 2.6), python-central
-Standards-Version: 3.8.4
-XS-Python-Version: >= 2.6
-
-Package: python-dmedia
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-desktopcouch-records, totem, libimage-exiftool-perl, python-genshi, python-webkit, python-paste
-XB-Python-Version: ${python:Versions}
-Description: distributed media library
- A simple distributed media library.  Media files are given a globally unique ID
- based on their content-hash.  Meta-data is stored in CouchDB.  Meta-data for a
- large number of media files can be available locally (meta-data is small).
- Actual media files can be loaded on-demand from peers or cloud when not
- available locally (media files are big). Goals are to make synchronization
- super easy, and to lay groundwork for a distributed content creation workflow.

=== removed file 'debian/copyright'
--- debian/copyright	2010-05-09 22:35:32 +0000
+++ debian/copyright	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-Debianized by Jason Gerard DeRose <[e-mail]>  2010-05-08
-
-Upstream authors:
-
-| Jason Gerard DeRose <[e-mail]>
-
-Copyright and license:
-
-| Copyright (C) 2010 Jason Gerard DeRose <[e-mail]>
-|
-| This file is part of `dmedia`.
-|
-| `dmedia` is free software: you can redistribute it and/or modify it under the
-| terms of the GNU Lesser General Public License as published by the Free
-| Software Foundation, either version 3 of the License, or (at your option) any
-| later version.
-|
-| `dmedia` is distributed in the hope that it will be useful, but WITHOUT ANY
-| WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-| A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
-| details.
-|
-| You should have received a copy of the GNU Lesser General Public License along
-| with `dmedia`.  If not, see <http://www.gnu.org/licenses/>.

=== removed file 'debian/rules'
--- debian/rules	2010-05-08 22:01:47 +0000
+++ debian/rules	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@