Invite to Debian Android Tools BoF

2021-08-25 Thread Samyak Jain
Hi Team, A very welcome from the DebConf'21! The BoF for the Android team is scheduled for Friday, August 27, 2021, from 15:00 UTC to 15:45 UTC. [1] Since both the teams have similar work areas and face similar blockers at the time, it will be wise for all of us to meet once, hopefully, in perso

Re: Divergence in salsa.debian.org/java-team/xom

2021-08-25 Thread Andrius Merkys
Hi Sebastiaan, On 2021-08-25 12:32, Sebastiaan Couwenberg wrote: > Import the changes from the NMU: > > gbp import-dsc /tmp/xom_1.2.10-1.1.dsc > > Review the changes since -1: > > git diff debian/1.2.10-1{,.1} debian/ > > Restore changes that were reverted by the NMU import. Thanks, I will

Re: Divergence in salsa.debian.org/java-team/xom

2021-08-25 Thread Sebastiaan Couwenberg
On 8/25/21 11:17 AM, Andrius Merkys wrote: > Any ideas how to solve this? Something like this may work. Import the changes from the NMU: gbp import-dsc /tmp/xom_1.2.10-1.1.dsc Review the changes since -1: git diff debian/1.2.10-1{,.1} debian/ Restore changes that were reverted by the NMU i

Divergence in salsa.debian.org/java-team/xom

2021-08-25 Thread Andrius Merkys
Hello, I want to make an upload for xom package with a couple of fixes. I want to use its packaging repository on salsa [1], but it is in somewhat diverged state. The newest Debian version of xom is 1.2.10-1.1, but repository on salsa has 1.2.10-1 (note incorrect git tag) plus a pair of commits on