[merge request] please merge drbd8 8.3.1-1 (main) from debian unstable (main)

Attaching debdiff.

Thanks for taking the time to prepare a merge. Here are a few comments:

- could you remove all the changelog entries related to unstable that appear in the diff ( <0.6.12-5)? Only entries relevant to the ubuntu packages should be appear in the debdiff.

- It seems that the patch system used in the package is dpatch (as mentioned in the debian entry 2:8.3.0-2). Even though there isn't any patch applied now, it's better to use the Debian patch management system. drbd/linux/drbd.h is patch inlined - dpatch should be used instead.

Related to the last point, is the patch still needed for karmic considering that the kernel is going to be updated soon? Are there any changes needed with regard to the new version of drbd in the kernel?

Heya.

 1. Removed. Attaching new debdiff.
 2. dpatch is used in Build-Depends. Debian has two dpatch entries for it, so I removed one.
 3. My mentor (ivoks) is going to do the work on the kernel related stuff.

Thanks for the suggestions.

RoAkSoAx

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.

Ok, here's the debdiff

Thanks for the suggestions

Fixed changelog

Andres, nope, that wasn't good.

Uploaded. I've slightly update the changelog:
  * mentioned the LP bug number to close
  * mentioned which patches had been dropped and why.

This bug was fixed in the package drbd8 - 2:8.3.1-2ubuntu1

---------------
drbd8 (2:8.3.1-2ubuntu1) karmic; urgency=low

  [ Ante Karamatic ]
  * Merge from debian unstable, remaining changes (LP: #371829):
    - Update maintainer according to spec.
    - Drop the kernel modules since it is apart of linux-ubuntu-modules.
    - debian/patches/ubuntu-cn-idx.dpatch:
      - change CN_IDX_DRBD to 0x6 in drbd/linux/drbd.h
  * Dropped:
    - Made the lsb init script a bit more compliant: merged upstream.

drbd8 (2:8.3.1-2) unstable; urgency=medium

  * Added a new patch from Michael Prokop to fix build with kernel 2.6.28 and
    older. (closes: #522891)

drbd8 (2:8.3.1-1) unstable; urgency=low

  * New upstream release.

drbd8 (2:8.3.1~rc2-1) experimental; urgency=low

  * New upstream release candidate.

drbd8 (2:8.3.1~rc1-1) experimental; urgency=low

  * New upstream release candidate.
  * Drop patch 10_lsb-init-script.dpatch, merged upstream.

drbd8 (2:8.3.0-3) unstable; urgency=low

  [ Martin G. Loschwitz ]
  * Sigh. Remove SVN-Files from debian-diff file.

drbd8 (2:8.3.0-2) unstable; urgency=low

  [ Norbert Tretkowski ]
  * Package is now team-maintained.
  * Use dpatch for patch management.
  * New patch 10_lsb-init-script.dpatch to make init-script a bit more LSB
    compliant.

  [ Martin G. Loschwitz ]
  * Add myself to the Uploaders:-Field.

 -- Mathias Gug <email address hidden> Thu, 14 May 2009 12:23:24 -0400