Please merge gramps (2.2.9-1) from Debian unstable (main)

[Cesare Tirabassi]

Binary package hint: gramps

Please merge gramps (2.2.9-1) from Debian unstable (main)

[Tiago Sousa (tiagoboldt)]

This has been my first attempt into something like this, so I'm not 100% sure if this is completely correct. But I hope it is :D

[Cesare Tirabassi (norsetto)]

You should:

1) Subscribe, not assign u-u-s
2) Make sure that your debdiffs are clean, ie. the debian to ubuntu patch must only contain those changes which are in the changelog.

Please subscribe again u-u-s once corrected.

[Nicolas Valcarcel (nvalcarcel)]

What do you mean by u-u-s?

[Scott Kitterman (kitterman)]

ubuntu-universe-sponsors

[Tiago Sousa (tiagoboldt)]

It's the Ubuntu-Universe-Sponsors. They'll them process the patch.

[Nicolas Valcarcel (nvalcarcel)]

I have *tryed* to correct the sugestions, take a look please

[Nicolas Valcarcel (nvalcarcel)]

Fixing some problems.

[Cesare Tirabassi (norsetto)]

Nicolas,

I have not even opened your patches. Just look at the size of them and you will see something is wrong.
You can use the filterdiff command to filter out everything which is external to the /debian directory (see man filterdiff).

On the changelog:

This:

 - Updated many text/translations and help docs.

is not an ubuntu change, its an upstream change part of gramps (2.2.9-1)

This:

 - Modified debian/control according to Standards v3.7.2

is more correct as ScottK already did in his changelog:

 - Bumped standards version to 3.7.2 without further change

You have forgotten these changes:

 * Moved debhelper from Build-Depends-Indep to Build-Depends to satisfy
    lintian
 - debian/rules: Remove dh_python

This:

 - Removed deprecated dh_iconcache in favor of dh_icons

is correct, but you forgot to say that dh_iconcache was an ubuntu change. So, I would say something like:

- Re-add dh_iconcache in debian/rules but change it to dh_icons since dh_iconcache is being deprecated

[Cesare Tirabassi (norsetto)]

I forgot to mention, Tiago Sousa was working on this, so, don't hijack his work unless he has agreed.
If he agrees, than you have to ASSIGN it to yourself.
When you subscribe u-u-s you have to de-assign yourself and mark it as confirmed.

[Tiago Sousa (tiagoboldt)]

We've talked and since we're both first timers, I've decided to let him correct my mistakes. Keep it up Nicolas.

[Cesare Tirabassi (norsetto)]

Then please de-assign yourself to the bug and assign Nicolas.

[Cesare Tirabassi (norsetto)]

Beside filterdiff, you have two other options:

- use dad (http://dad.dunnewind.net/universe.php)
- do a manual merge

If I were you I would try them all, its very instructive anyhow.

[Nicolas Valcarcel (nvalcarcel)]

ok, fixed debdiff following the comments

[Nicolas Valcarcel (nvalcarcel)]

Fixing some problems.

[Nicolas Valcarcel (nvalcarcel)]

Sorry about last debdiff, newbie error

[Scott Kitterman (kitterman)]

My bad on the bug number in debian/changelog. Sorry. Don't put Bug in there.