Re: please push sdaps changes to git repo

2019-09-23 Thread Holger Levsen 
Hi Boyuan,

first of all: many thanks for your work on this, including the .0-2 NMU
just landed in new!

On Sun, Sep 22, 2019 at 02:12:42PM -0400, Boyuan Yang wrote:
> Since I'm not in the Debian Edu Team, I cannot push contents into the git
> repo. 

wanna join? ;)

> I just had my fork prepared at https://salsa.debian.org/byang/sdaps and
> you are free to pick any of my commits and put them into the canonical git
> repo under debian-edu-pkg-team. Using "gbp import-dsc --pristine-tar" is also
> a possible option.

I tried to merge your master branch into
salsa.debian.org:debian-edu-pkg-team/sdaps's master branch but got merge
conflicts :/

$ git branch -av |grep master
* master  418e94a Add missing patch file.
  remotes/byang/master2e59197 debian/changelog: Prepare new upload 
(1.9.7-0.1, unstable, NMU)
  remotes/origin/HEAD -> origin/master
  remotes/origin/master   418e94a Add missing patch file.

Could you please have a look? I'd rather not cherry pick and investigate
myself ;)

Last: please publish a signed tag for the 1.9.7-0.2 upload.


-- 
cheers,
Holger

---
   holger@(debian|reproducible-builds|layer-acht).org
   PGP fingerprint: B8BF 5413 7B09 D35C F026 FE9D 091A B856 069A AA1C



signature.asc
Description: PGP signature

Re: please push sdaps changes to git repo

2019-09-22 Thread Boyuan Yang 
Hi all,

Since I'm not in the Debian Edu Team, I cannot push contents into the git
repo. I just had my fork prepared at https://salsa.debian.org/byang/sdaps and
you are free to pick any of my commits and put them into the canonical git
repo under debian-edu-pkg-team. Using "gbp import-dsc --pristine-tar" is also
a possible option.

Thanks,
Boyuan Yang


在 2019-09-21六的 16:34 +，Holger Levsen写道：
> hi,
> 
> please push the sdaps 1.9.7-0.1 changes to the git repo. & thanks!


signature.asc
Description: This is a digitally signed message part

please push sdaps changes to git repo

2019-09-21 Thread Holger Levsen 
hi,

please push the sdaps 1.9.7-0.1 changes to the git repo. & thanks!


-- 
cheers,
Holger

---
   holger@(debian|reproducible-builds|layer-acht).org
   PGP fingerprint: B8BF 5413 7B09 D35C F026 FE9D 091A B856 069A AA1C



signature.asc
Description: PGP signature