Merge lp:~jamesh/bindwood/packaging-dailies-1.99.0 into lp:~ubuntuone-control-tower/bindwood/packaging-dailies

[James Henstridge]

Pull in upstream Ubuntu packaging changes, and update for 1.99.0 release.

Update packaging for 1.99.0 release. I've also pulled in the changes from the upstream Ubuntu package made since this packaging branch was created.

[Samuele Pedroni (pedronis)]

review: Approve

[lp:~jamesh/bindwood/packaging-dailies-1.99.0]

7. By James Henstridge on 2011-03-18

Small change to changelog from final 1.99.0-0ubuntu1 package.

[Stuart Langridge (sil)]

Looks fine to me.

review: Approve

[dobey (dobey)]

Looks like patches/ has no patches and an empty series file, so we can probably remove all the quilt bits here? Is there any valid reason to keep them around?

[dobey (dobey)]

Almost 2 months with no comment, but I have merged without the quilt bits (only copyright/changelog files).

=== modified file 'changelog'
--- changelog	2010-09-15 18:02:05 +0000
+++ changelog	2011-03-18 08:41:35 +0000
@@ -1,3 +1,20 @@
+bindwood (1.99.0-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    - New synchronisation engine.
+    - Adds Firefox 4 compatibility (LP: #648587).
+  * Remove patches/01_no_chmod.patch since Bindwood no longer requires 
+    the couchdb_env.sh script to be executable.
+
+ -- James Henstridge <[e-mail]>  Wed, 16 Mar 2011 14:44:28 +0800
+
+bindwood (1.0.4-0ubuntu2) maverick; urgency=low
+
+  * No source change rebuild to pick up mozilla-devscripts changes; Drop 
+    transitional and removed packages from Recommends (LP: #645339) 
+
+ -- Micah Gersten <[e-mail]>  Sun, 26 Sep 2010 00:14:24 -0500
+
 bindwood (1.0.4-0ubuntu1) lucid; urgency=low
 
   * New upstream release

=== modified file 'control'
--- control	2011-03-08 18:19:35 +0000
+++ control	2011-03-18 08:41:35 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Elliot Murphy <[e-mail]>
-Build-Depends: debhelper (>= 7), cdbs, mozilla-devscripts (>= 0.16~)
+Build-Depends: debhelper (>= 7), cdbs, mozilla-devscripts (>= 0.16~), quilt
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/bindwood
 

=== modified file 'copyright'
--- copyright	2010-09-15 18:02:05 +0000
+++ copyright	2011-03-18 08:41:35 +0000
@@ -7,7 +7,7 @@
 
     https://code.launchpad.net/bindwood
 
-content/couch.js:
+modules/couch.jsm:
 
 Copyright (C) 2009 Apache Software Foundation
 
@@ -26,7 +26,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
-content/oauth.js:
+modules/oauth.jsm:
 
 Copyright 2008 Netflix, Inc.
 
@@ -47,29 +47,9 @@
 On Debian systems, the complete text of the Apache License can be found
 in `/usr/share/common-licenses/Apache-2.0'.
 
-content/sha1.js:
-
-Copyright 2002 Paul Johnston
-
-License:
-
-    A JavaScript implementation of the Secure Hash Algorithm, SHA-1,
-    as defined in FIPS PUB 180-1
-
-    Version 2.1a Copyright Paul Johnston 2000 - 2002.
-
-    Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
-
-    Distributed under the BSD License
-
-    See http://pajhome.org.uk/crypt/md5 for details.
-
-On Debian systems, the complete text of the BSD License can be found
-in `/usr/share/common-licenses/BSD'.
-
 All other files and debian packaging:
 
-Copyright (C) 2009 Canonical Ltd.
+Copyright (C) 2009-2011 Canonical Ltd.
 
 License:
 

=== added directory 'patches'
=== added file 'patches/series'
--- patches/series	1970-01-01 00:00:00 +0000
+++ patches/series	2011-03-18 08:41:35 +0000
@@ -0,0 +1,1 @@
+# Quilt patch series

=== modified file 'rules'
--- rules	2011-03-08 18:19:35 +0000
+++ rules	2011-03-18 08:41:35 +0000
@@ -4,4 +4,5 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/mozilla-devscripts/xpi.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk