Merge Conflict when running uscan on ruby-acts-as-taggable

Hi, I ran git import-orig --pristine-tar --uscan and it resulted in a merge conflict in spec/spec_helper.rb. How should i proceed to resolev the merge conflict as the change will be in the upstream's files. -- Nitesh A Jain -- To UNSUBSCRIBE, email to debian-ruby-requ...@lists.debian.org with

New upstream release of ruby-http-accept-language

Hi, I have pushed the changes to the repository for the new upstream release of ruby-http-accept-language. Can someone review and upload it? Thanks -- Nitesh A Jain -- To UNSUBSCRIBE, email to debian-ruby-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@l

New upstream for ruby-http

Hi, I have pushed the changes to the repository for the new upstream release of ruby-http. Can someone review and upload it? Thanks -- Nitesh A Jain -- To UNSUBSCRIBE, email to debian-ruby-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

RFS: ruby-ejs

Hi, I prepared the packaging of ruby-ejs. It is lintian clean and tested with pbuilder. I've pushed the package to alioth repo/git/pkg-ruby-extras/ruby-ejs.git Consider to review it and upload it. -- Regards, Balasankar C http://balasankarc.in "Freedom is never easily won, but once establi

RFS: ruby-haml-rails

Hi, I prepared the packaging of ruby-haml-rails. It is lintian clean and tested with pbuilder. I've pushed the package to alioth repo/git/pkg-ruby-extras/ruby-haml-rails.git Consider to review it and upload it. PS : Resending the mail as I doubt whether my previous mail didn't reach the group

RFS: ruby-haml-rails

Hi, I prepared the packaging of ruby-haml-rails. It is lintian clean and tested with pbuilder. I've pushed the package to alioth repo /git/pkg-ruby-extras/ruby-haml-rails.git Consider to review it and upload it. -- Regards, Balasankar C http://balasankarc.in "Freedom is never easily won, bu