[DRE-commits] [diaspora] branch master updated (d970e04 -> bf46f6e)

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a change to branch master
in repository diaspora.

      from  d970e04   colorbox is same as jquery-colorbox
       new  1091aad   fix colorbox depends
       new  9fd51af   set minimum version for activerecord-import
       new  f2fbf06   tighten backbone-on-rails
       new  d185894   diaspora_jsxc is in sync
       new  c1beb2a   refresh patches
       new  088e29b   include colorbox in Gemfile
       new  a0ef8c8   import jquery.colorbox
       new  35c5523   refresh patch
       new  bf46f6e   upload to experimental

The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog                               |  4 ++--
 debian/control                                 |  6 +++---
 debian/patches/008-add-colorbox.patch          | 24 ++++++++++++++++++++++++
 debian/patches/008-loosen-diaspora-jsxc.patch  | 16 ----------------
 debian/patches/019-remove-diaspora-vines.patch |  4 ++--
 debian/patches/030-loosen-tiny-versions.patch  |  2 +-
 debian/patches/series                          |  2 +-
 7 files changed, 33 insertions(+), 25 deletions(-)
 create mode 100644 debian/patches/008-add-colorbox.patch
 delete mode 100644 debian/patches/008-loosen-diaspora-jsxc.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git