[Drbd-dev] 0.7.6 release tomorrow...

[Drbd-dev] 0.7.6 release tomorrow...

[Philipp Reisner]

Hi,

I will create the 0.7.6 tarball tomorrow (as long as nobody objects)

What exactly should I put into debian/changelog ?

-philipp

Re: [Drbd-dev] 0.7.6 release tomorrow...

[Philipp Hug]

Just add one changelog entry (new upstream version) as only debian 
specific stuff should go into debian/changelog...

Philipp Reisner wrote:

>Hi,
>
>I will create the 0.7.6 tarball tomorrow (as long as nobody objects)
>
>What exactly should I put into debian/changelog ?
>
>-philipp
>_______________________________________________
>drbd-dev mailing list
>drbd-dev@lists.linbit.com
>http://lists.linbit.com/mailman/listinfo/drbd-dev
>
>  
>

Re: [Drbd-dev] 0.7.6 release tomorrow...

[Philipp Reisner]

On Monday 15 November 2004 22:59, Philipp Reisner wrote:
> Hi,
>
> I will create the 0.7.6 tarball tomorrow (as long as nobody objects)
>
> What exactly should I put into debian/changelog ?
>

--snip--
drbd (0.7.6-0) unstable; urgency=low

  * New upstream release

 -- Philipp Reisner <phil@linbit.com>  Tue, 16 Nov 2004 14:59:00 +0200

drbd (0.7.5-2) unstable; urgency=low

  * debian/control: Added Conflict with drbd-util and drbd-module-source
  * debian/control.in.modules: Fixed description for kernel module
[...]
--snap--

Or should I replace the unstable with something else ?
You will replace thet -0 with a -1 before you upload it to debian, right ?

-Philipp
-- 
: Dipl-Ing Philipp Reisner                      Tel +43-1-8178292-50 :
: LINBIT Information Technologies GmbH          Fax +43-1-8178292-82 :
: Schönbrunnerstr 244, 1120 Vienna, Austria    http://www.linbit.com :

Re: [Drbd-dev] 0.7.6 release tomorrow...

[Philipp Reisner]

Am Montag, 15. November 2004 22:59 schrieb Philipp Reisner:
> Hi,
>
> I will create the 0.7.6 tarball tomorrow (as long as nobody objects)
>
> What exactly should I put into debian/changelog ?
>
> -philipp

I will deley 0.7.6 until either Linux-2.6.10 is released or the strange
issue of Steven Wilton is resolved (see drbd-user ML)

-Philipp

Re: [Drbd-dev] 0.7.6 release tomorrow...

[Lars Ellenberg]

/ 2004-11-17 20:32:58 +0100
\ Philipp Reisner:
> Am Montag, 15. November 2004 22:59 schrieb Philipp Reisner:
> > Hi,
> >
> > I will create the 0.7.6 tarball tomorrow (as long as nobody objects)
> >
> > What exactly should I put into debian/changelog ?
> >
> > -philipp
> 
> I will deley 0.7.6 until either Linux-2.6.10 is released or the strange
> issue of Steven Wilton is resolved (see drbd-user ML)


maybe this does help ?

 :-/



--- linux-2.6.9/include/linux/sched.h	2004-10-20 14:56:03.000000000 +1300
+++ linux-2.6.10/include/linux/sched.h	2004-11-18 19:07:00.000000000 +1300
@@ -29,6 +29,7 @@
 #include <linux/completion.h>
 #include <linux/pid.h>
 #include <linux/percpu.h>
+#include <linux/topology.h>
 
 struct exec_domain;
 
@@ -107,8 +108,8 @@
 #define TASK_UNINTERRUPTIBLE	2
 #define TASK_STOPPED		4
 #define TASK_TRACED		8
-#define TASK_ZOMBIE		16
-#define TASK_DEAD		32
+#define EXIT_ZOMBIE		16
+#define EXIT_DEAD		32
 
 #define __set_task_state(tsk, state_value)		\
 	do { (tsk)->state = (state_value); } while (0)

[ rest snipped ]

[Drbd-dev] Re: 0.7.6 release tomorrow...

[Cyril Bouthors]

[-- Attachment #1: Type: text/plain, Size: 588 bytes --]

On 16 Nov 2004, philipp.reisner@public.gmane.org wrote:

> What exactly should I put into debian/changelog ?

Since DRBD is not a native Debian package (i.e., package which have
been written especially for Debian), I think the tarball must not
contain a debian/changelog nor a debian/ directory.

Please read the docs a http://debian.org/devel/ for more information.

FYI, the debian/ tree from upstream is not used for the official
Debian package.  If you want to help maintaining the Debian package,
Philipp Hug and I would be glad to welcome you as a co-maintainer.
-- 
Cyril Bouthors

[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]

Re: [Drbd-dev] Re: 0.7.6 release tomorrow...

[Philipp Reisner]

On Friday 19 November 2004 13:52, Cyril Bouthors wrote:
> On 16 Nov 2004, philipp.reisner@public.gmane.org wrote:
> > What exactly should I put into debian/changelog ?
>
> Since DRBD is not a native Debian package (i.e., package which have
> been written especially for Debian), I think the tarball must not
> contain a debian/changelog nor a debian/ directory.
>

It was told me before. But I will continue to maintain it for my
own (possibly other's) convenience. [With 'maintain' I mean to take
the official debian/ directory and to put it intdo DRBD's SVN.]

> FYI, the debian/ tree from upstream is not used for the official
> Debian package.  If you want to help maintaining the Debian package,
> Philipp Hug and I would be glad to welcome you as a co-maintainer.

Philipp Hug has an account for DRBD's SVN and I hope that he still
commits his changes also to DRBD's SVN.

-Philipp
-- 
: Dipl-Ing Philipp Reisner                      Tel +43-1-8178292-50 :
: LINBIT Information Technologies GmbH          Fax +43-1-8178292-82 :
: Schönbrunnerstr 244, 1120 Vienna, Austria    http://www.linbit.com :

[Drbd-dev] Re: 0.7.6 release tomorrow...

[Cyril Bouthors]

[-- Attachment #1: Type: text/plain, Size: 394 bytes --]

On 19 Nov 2004,
> It was told me before. But I will continue to maintain it for my own
> (possibly other's) convenience. [With 'maintain' I mean to take the
> official debian/ directory and to put it intdo DRBD's SVN.]

Sure, I understand that the debian/ directory is useful for SVN users,
it has to be kept in for them but is it necessary to distribute it in
the tarballs?
-- 
Cyril Bouthors

[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]

Re: [Drbd-dev] Re: 0.7.6 release tomorrow...

[Helmut Wollmersdorfer]

Cyril Bouthors wrote:
> On 19 Nov 2004,

>>It was told me before. But I will continue to maintain it for my own
>>(possibly other's) convenience. [With 'maintain' I mean to take the
>>official debian/ directory and to put it intdo DRBD's SVN.]

> Sure, I understand that the debian/ directory is useful for SVN users,
> it has to be kept in for them but is it necessary to distribute it in
> the tarballs?

See the thread with subject "0.7.5 release tomorrow..." around 2004-10-06.

The convenient way is to do "make tarball" before "dpkg-buildpackage 
..." and "make-kpkg ...". And I never really understood the 
module-assistant, even after nearly a day of studying the docs. Same is 
true for the newer packaging stuff.

So, what's easier:

1) change and test the drbd/make plus writing a new "HOWTO build debian 
packages from SVN/tarball", and test the HOWTO under different conditions.

OR

2) rm debian/  by debian maintainers

Helmut Wollmersdorfer

Re: [Drbd-dev] Re: 0.7.6 release tomorrow...

[Philipp Hug]

> The convenient way is to do "make tarball" before "dpkg-buildpackage 
> ..." and "make-kpkg ...". And I never really understood the 
> module-assistant, even after nearly a day of studying the docs. Same 
> is true for the newer packaging stuff.

You can still do make-kpkg even with the new packaging: If it doesn't
work, it's a bug.

> So, what's easier:
>
> 1) change and test the drbd/make plus writing a new "HOWTO build 
> debian packages from SVN/tarball", and test the HOWTO under different 
> conditions.

well actually I could change the debian scripts to work directly within
the svn directory. that's probably easier than doing "make tarball" first.

> OR
>
> 2) rm debian/  by debian maintainers

sounds easier than it is: according to debian policy the upstream source
tgz must not be modified when uploaded to debian, instead a diff.gz is
upload that contains the diffs between upstream and debian release + it
normally contains the debian directory.
its not possible for the debian packager to remove files from the
original tgz not even in the diffs. you could call this a bug in the
dpkg-buildpackage tool but that's the way it is now.

2nd: if an upstream package already contains a debian directory is
called a "native-debian" package and the version number should be e.g.
0.7.6 (without -debianversion). but the problem here would be, that the
drbd release must be the version that goes into debian.org and that's
not the case here...

so I think that removing ./debian at least from the release tarball
would be a good idea... maybe we could add a "make releasetarball" target...

philipp

Re: [Drbd-dev] Re: 0.7.6 release tomorrow...

[Philipp Reisner]

[...]
> sounds easier than it is: according to debian policy the upstream source
> tgz must not be modified when uploaded to debian, instead a diff.gz is
> upload that contains the diffs between upstream and debian release + it
> normally contains the debian directory.
> its not possible for the debian packager to remove files from the
> original tgz not even in the diffs. you could call this a bug in the
> dpkg-buildpackage tool but that's the way it is now.
>
> 2nd: if an upstream package already contains a debian directory is
> called a "native-debian" package and the version number should be e.g.
> 0.7.6 (without -debianversion). but the problem here would be, that the
> drbd release must be the version that goes into debian.org and that's
> not the case here...
>
> so I think that removing ./debian at least from the release tarball
> would be a good idea... maybe we could add a "make releasetarball"
> target...
>

Ok... So ./debian stays in SVN but will be removed from the release-
tarball. Ok. 
Do you want to have it this way even with 0.7.6 ?

-phil
-- 
: Dipl-Ing Philipp Reisner                      Tel +43-1-8178292-50 :
: LINBIT Information Technologies GmbH          Fax +43-1-8178292-82 :
: Schönbrunnerstr 244, 1120 Vienna, Austria    http://www.linbit.com :

Re: [Drbd-dev] Re: 0.7.6 release tomorrow...

[Philipp Hug]

yes, that would be nice

Philipp Reisner wrote:

>[...]
>  
>
>>sounds easier than it is: according to debian policy the upstream source
>>tgz must not be modified when uploaded to debian, instead a diff.gz is
>>upload that contains the diffs between upstream and debian release + it
>>normally contains the debian directory.
>>its not possible for the debian packager to remove files from the
>>original tgz not even in the diffs. you could call this a bug in the
>>dpkg-buildpackage tool but that's the way it is now.
>>
>>2nd: if an upstream package already contains a debian directory is
>>called a "native-debian" package and the version number should be e.g.
>>0.7.6 (without -debianversion). but the problem here would be, that the
>>drbd release must be the version that goes into debian.org and that's
>>not the case here...
>>
>>so I think that removing ./debian at least from the release tarball
>>would be a good idea... maybe we could add a "make releasetarball"
>>target...
>>
>>    
>>
>
>Ok... So ./debian stays in SVN but will be removed from the release-
>tarball. Ok. 
>Do you want to have it this way even with 0.7.6 ?
>
>-phil
>  
>

Re: [Drbd-dev] Re: 0.7.6 release tomorrow...

[Lars Ellenberg]

/ 2004-11-24 16:04:41 +0100
\ Philipp Hug:
> yes, that would be nice
> 
> Philipp Reisner wrote:
> 
> >[...]
> > 
> >
> >>sounds easier than it is: according to debian policy the upstream source
> >>tgz must not be modified when uploaded to debian, instead a diff.gz is
> >>upload that contains the diffs between upstream and debian release + it
> >>normally contains the debian directory.
> >>its not possible for the debian packager to remove files from the
> >>original tgz not even in the diffs. you could call this a bug in the
> >>dpkg-buildpackage tool but that's the way it is now.
> >>
> >>2nd: if an upstream package already contains a debian directory is
> >>called a "native-debian" package and the version number should be e.g.
> >>0.7.6 (without -debianversion). but the problem here would be, that the
> >>drbd release must be the version that goes into debian.org and that's
> >>not the case here...
> >>
> >>so I think that removing ./debian at least from the release tarball
> >>would be a good idea... maybe we could add a "make releasetarball"
> >>target...
> >>
> >>   
> >>
> >
> >Ok... So ./debian stays in SVN but will be removed from the release-
> >tarball. Ok. 
> >Do you want to have it this way even with 0.7.6 ?

what about renaming it to debian.upstream or so.
then, if you are the official debian, then you can put your debian in
there, if not, you can symlink it.

does that make sense?

	lge

Re: [Drbd-dev] Re: 0.7.6 release tomorrow...

[Philipp Hug]

>what about renaming it to debian.upstream or so.
>then, if you are the official debian, then you can put your debian in
>there, if not, you can symlink it.
>
>does that make sense?
>  
>
lars,
I don't think there's a need for a debian directory in the release 
tarball because debian versions will be released soon after drbd 
releases anyway and you could still get it from svn.

philipp

Re: [Drbd-dev] Re: 0.7.6 release tomorrow...

[Lars Ellenberg]

/ 2004-11-25 00:40:32 +0100
\ Philipp Hug:
> 
> >what about renaming it to debian.upstream or so.
> >then, if you are the official debian, then you can put your debian in
> >there, if not, you can symlink it.
> >
> >does that make sense?
> > 
> >
> lars,
> I don't think there's a need for a debian directory in the release 
> tarball because debian versions will be released soon after drbd 
> releases anyway and you could still get it from svn.

ok, just checked in 
--- Makefile	(revision 1655)
+++ Makefile	(working copy)
@@ -120,7 +120,7 @@
 .PHONY: .filelist
 .filelist:
 	@ svn info >/dev/null || { echo "you need a svn checkout to do this." ; false ; }
-	@find $$(svn st -v | sed '/^?/d;s/^.\{8\} \+[0-9]\+ \+[0-9]\+ [a-z]\+ *//;') \
+	@find $$(svn st -v | sed '/^?/d;s/^.\{8\} \+[0-9]\+ \+[0-9]\+ [a-z]\+ *//;/^debian/d' ) \
 	\! -type d -maxdepth 0 |\
 	sed 's:^:drbd-$(DIST_VERSION)/:' > .filelist
 	@[ -s .filelist ] # assert there is something in .filelist now

[Drbd-dev] Re: 0.7.6 release tomorrow...

[Cyril Bouthors]

[-- Attachment #1: Type: text/plain, Size: 302 bytes --]

On 25 Nov 2004, Lars Ellenberg wrote:
> -	@find $$(svn st -v | sed '/^?/d;s/^.\{8\} \+[0-9]\+ \+[0-9]\+ [a-z]\+ *//;') \
> +	@find $$(svn st -v | sed '/^?/d;s/^.\{8\} \+[0-9]\+ \+[0-9]\+ [a-z]\+ *//;/^debian/d' ) \

This will really make the debian maintainers life easier.

Thanks.
-- 
Cyril Bouthors

[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]

Re: [Drbd-dev] Re: 0.7.6 release tomorrow...

[Helmut Wollmersdorfer]

Cyril Bouthors wrote:
> On 16 Nov 2004, philipp.reisner@public.gmane.org wrote:

>>What exactly should I put into debian/changelog ?

> Since DRBD is not a native Debian package (i.e., package which have
> been written especially for Debian), I think the tarball must not
> contain a debian/changelog nor a debian/ directory.

Its for convenience if somebody wants to install from latest svn.

> Please read the docs a http://debian.org/devel/ for more information.

> FYI, the debian/ tree from upstream is not used for the official
> Debian package.  

ACK. At least debian maintainers are responsible for the content of the 
official Debian package, and upstream maintainers are responsible for 
the tarball.
The cooperation of debian maintainers and drbd-dev in the past, with 
copying ideas and code in both directions had advantages.
I would like to keep it.

> If you want to help maintaining the Debian package,
> Philipp Hug and I would be glad to welcome you as a co-maintainer.

Ohh, glad to see you as drbd co-maintainer.

Helmut Wollmersdorfer