[Pkg-sympa-devel] Bug#814426: sympa: New upstream version available (6.2.12)

[Stefan Hornburg (Racke)]

On 09/11/2016 09:15 AM, Stefan Hornburg (Racke) wrote:
> On 06/21/2016 07:23 AM, Emmanuel Bouthenot wrote:
>> Jérôme,
>>
>> On Mon, Jun 20, 2016 at 09:34:39PM +0200, Jérôme Lebleu wrote:
>> [...]
>>
>>> Is there any news about this new version please?
>>>
>>> According to the VCS history, the last activity is 10 months ago... Do
>>> you still have time to maintain it? If not, I would be glad to help! It
>>> would be sad to not have a Debian package for Sympa anymore - and
>>> up-to-date by the way...
>>
>> I've already started to work on it, but there is a lot of work (a bunch
>> of third party modules were added, among others: fonts, at least half a
>> dozen of new jquery plugins, foundation CSS framework, foundation icons,
>> etc.).
>>
>> Howewer, Sympa team has released sympa 6.1.25 a few days ago and I will
>> upload it before the end of the week.
>>
>> I will also push my 6.2 branch in the same so you will be able to take a
>> look and work on it.
>>
>> As said by Jonas, any help will be very appreciated.
>>
>> Regards,
>>
>> M.
>>
> 
> Hello Emmanuel,
> 
> it doesn't look like your branch is available in the Git repository:
> 
> https://anonscm.debian.org/cgit/collab-maint/sympa.git
> 
> I would like to help with releasing 6.2 packages.
> 
> Regards
>          Racke
> 
> 

Alternatively, how do I import a new upstream release into the Git repository?

I tried the following, but it failed:

racke at ambas:~/sympa/pkg$ gbp import-orig --uscan --pristine-tar
gbp:info: Launching uscan...
uscan: Newest version of sympa on remote site is 6.2.16, local version is 6.1.24~dfsg
 (mangled local version is 6.1.24)
uscan:    => Newer package available from
      http://www.sympa.org/distribution/sympa-6.2.16.tar.gz
gbp:info: using ../sympa_6.2.16.orig.tar.gz
What is the upstream version? [6.2.16]
gbp:info: Importing '../sympa_6.2.16.orig.tar.gz' to branch 'upstream' (filtering out ['po*.gmo'])...
gbp:info: Source package is sympa
gbp:info: Upstream version is 6.2.16
gbp:info: Merging to 'master'
gbp:error: Automatic merge failed.
gbp:error: Error detected, Will roll back changes.
gbp:info: Rolling back branch upstream by resetting it to d74c49fa58ac8276d9ee2f18595436b5dc34127a
gbp:info: Rolling back branch pristine-tar by resetting it to eb3acb2e41048ec2bfba9b8b89422e58023e740e
gbp:info: Rolling back tag upstream/6.2.16 by deleting it
gbp:info: Rolling back branch master by resetting it to 1179913f606c6bea53c9221aa8cff8a36a97d822
gbp:info: Rolling back failed merge of upstream/6.2.16
gbp:error: Rolled back changes after import error.

Regards
	Racke



-- 
Ecommerce and Linux consulting + Perl and web application programming.
Debian and Sympa administration.