Ubuntu
drbd8 package

  1. Bug #371829
  2. Comment #4

Comment 4 for bug 371829

Revision history for this message
Ante Karamatić (ivoks) wrote :

OK, Andres. Last debdiff also isn't good. What you should do is:
1) grab package with grab-merge script.
2) revert the change in drbd/linux/drbd.h file (so that the source is the same as debian's):
      -# define CN_IDX_DRBD 0x6
      +# define CN_IDX_DRBD 0x4
3) use dpatch system to create a patch which will introduce this change in drbd/linux/drbd.h:
      -# define CN_IDX_DRBD 0x4
      +# define CN_IDX_DRBD 0x6

The idea is to have the source package of the drbd8 in Ubuntu in the same state as in Debian. With use of dpatch we can contain all the changes to the source inside debian sudirectory.

Second thing that's wrong is that your debiff removes Debian's changes from changelog. That's wrong. All the changes Debian did in the package should be presented in Ubuntu.

(speaking as mentor) Consider this merge a bit complicated, but it will enable you to learn how to use dpatch, if you haven't before. I could guide you on IRC.