Re: Self-maintained Debian packages best practice

2015-04-01 Thread Dmitry Smirnov
On Mon, 1 Dec 2014 10:27:52 Paul Wise wrote:
> Personally I prefer to separate packaging from upstream development
> because they are two different things. When I use a VCS for packaging
> it contains only the debian/ directory.

This is how I like to handle Debian packaging in git as well.

-- 
Cheers,
 Dmitry Smirnov.

---

If you travel the earth, you will find it is largely divided into two
classes of people - people who say "I wonder why such and such is not done"
and people who say "Now who is going to prevent me from doing that thing?"
-- Winston Churchill


signature.asc
Description: This is a digitally signed message part.


Re: Self-maintained Debian packages best practice

2014-12-01 Thread Tim Ruehsen
On Sunday 30 November 2014 20:32:26 T o n g wrote:
> On Sun, 30 Nov 2014 18:12:06 +0100, Santiago Vila wrote:
> >> > In the past, having a `debian/` directory upstream was a pain because
> >> > we didn't have a proper way to remove a file if needed. Nowadays, it
> >> > is perfectly fine if you use a 3.0 format.
> >> 
> >> Fine in which way ?
> > 
> > It's fine because, for a 3.0 quilt package, "dpkg-source -x" unpacks the
> > .orig.tar.gz, removes all the debian/* files coming from upstream
> > tarball, if any, and then unpacks the *.debian.tar.xz file.
> 
> Ok, good to know, but that's more targeting towards package building, not
> source code developing and maintaining. Does it imply that I should put
> the `debian` folder within my source tree now? Because as mentioned
> before, the last thing I want to do is to separate my source and my
> `debian` folder into two git repos.

Why not create an empty branch 'debian' and move your debian related stuff 
there. Whenever you e.g. make a release, just merge your release branch into 
the debian one, create packages. Amend your .gitignore so that everything 
works smoothly.

That is what my sponsor suggested (for https://github.com/rockdaboot/libpsl/).

Tim


signature.asc
Description: This is a digitally signed message part.


Re: Self-maintained Debian packages best practice

2014-11-30 Thread Russ Allbery
T o n g  writes:

> Ok, good to know, but that's more targeting towards package building,
> not source code developing and maintaining. Does it imply that I should
> put the `debian` folder within my source tree now? Because as mentioned
> before, the last thing I want to do is to separate my source and my
> `debian` folder into two git repos.

http://www.eyrie.org/~eagle/notes/debian/git.html#combine may (or may not)
be helpful.  This is a little out of date with current tools,
unforunately.  The major change is use of --upstream-vcs-tag in
git-import-orig.

Some people do find this approach too complicated.  I guess I'm just used
to it, but it works for me.

-- 
Russ Allbery (r...@debian.org)   


-- 
To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/87mw78t7dr@hope.eyrie.org



Re: Self-maintained Debian packages best practice

2014-11-30 Thread Paul Wise
On Mon, Dec 1, 2014 at 4:32 AM, T o n g wrote:

> Ok, good to know, but that's more targeting towards package building, not
> source code developing and maintaining. Does it imply that I should put
> the `debian` folder within my source tree now? Because as mentioned
> before, the last thing I want to do is to separate my source and my
> `debian` folder into two git repos.

Personally I prefer to separate packaging from upstream development
because they are two different things. When I use a VCS for packaging
it contains only the debian/ directory.

-- 
bye,
pabs

https://wiki.debian.org/PaulWise


-- 
To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/CAKTje6G9B5Zd3=AJ4UOEcP3ZvRHEL2e1ZXXUi4tCA=dzxz7...@mail.gmail.com



Re: Self-maintained Debian packages best practice

2014-11-30 Thread T o n g
On Sun, 30 Nov 2014 18:12:06 +0100, Santiago Vila wrote:

>> > In the past, having a `debian/` directory upstream was a pain because
>> > we didn't have a proper way to remove a file if needed. Nowadays, it
>> > is perfectly fine if you use a 3.0 format.
>> 
>> Fine in which way ?
> 
> It's fine because, for a 3.0 quilt package, "dpkg-source -x" unpacks the
> .orig.tar.gz, removes all the debian/* files coming from upstream
> tarball, if any, and then unpacks the *.debian.tar.xz file.

Ok, good to know, but that's more targeting towards package building, not 
source code developing and maintaining. Does it imply that I should put 
the `debian` folder within my source tree now? Because as mentioned 
before, the last thing I want to do is to separate my source and my 
`debian` folder into two git repos. 



-- 
To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/m5fusq$hfd$2...@ger.gmane.org



Re: Self-maintained Debian packages best practice

2014-11-30 Thread Santiago Vila
On Sun, Nov 30, 2014 at 05:31:00PM +0100, Jerome BENOIT wrote:
> On 30/11/14 16:30, Vincent Bernat wrote:
> > In the past, having a `debian/` directory upstream was a pain because we
> > didn't have a proper way to remove a file if needed. Nowadays, it is
> > perfectly fine if you use a 3.0 format.
> 
> Fine in which way ?

It's fine because, for a 3.0 quilt package, "dpkg-source -x" unpacks
the .orig.tar.gz, removes all the debian/* files coming from upstream
tarball, if any, and then unpacks the *.debian.tar.xz file.

Previously, the end result was an ugly .diff.gz containing the difference
between "upstream" debian/* files and the new debian/* files.


-- 
To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/20141130171206.GA2784@nuc



Re: Self-maintained Debian packages best practice

2014-11-30 Thread Jerome BENOIT
Hello Forum,

On 30/11/14 16:30, Vincent Bernat wrote:
>  ❦ 30 novembre 2014 14:06 GMT, T o n g  :
> 
>> I'm currently hosting my self-maintained Debian packages on GitHub. Here 
>> is my dilemma:
>>
>>  - It is commonly recommended not to put the `debian` folder within the 
>> source tree so as to make it easier for other distros.
> 
> In the past, having a `debian/` directory upstream was a pain because we
> didn't have a proper way to remove a file if needed. Nowadays, it is
> perfectly fine if you use a 3.0 format.
> 

Fine in which way ?

Jerome


-- 
To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/547b4644.9010...@rezozer.net



Re: Self-maintained Debian packages best practice

2014-11-30 Thread Vincent Bernat
 ❦ 30 novembre 2014 14:06 GMT, T o n g  :

> I'm currently hosting my self-maintained Debian packages on GitHub. Here 
> is my dilemma:
>
>  - It is commonly recommended not to put the `debian` folder within the 
> source tree so as to make it easier for other distros.

In the past, having a `debian/` directory upstream was a pain because we
didn't have a proper way to remove a file if needed. Nowadays, it is
perfectly fine if you use a 3.0 format.
-- 
printk(KERN_WARNING "Warning: defective CD-ROM (volume sequence
number). Enabling \"cruft\" mount option.\n");
2.2.16 /usr/src/linux/fs/isofs/inode.c


signature.asc
Description: PGP signature


Self-maintained Debian packages best practice

2014-11-30 Thread T o n g
Hi, 

I'm currently hosting my self-maintained Debian packages on GitHub. Here 
is my dilemma:

 - It is commonly recommended not to put the `debian` folder within the 
source tree so as to make it easier for other distros.
 - So I did. I did not put my `debian` folder within the source tree on 
my GitHub.
 - However when building the Debian packages, the build mechanize 
anticipate a `debian` folder under the source tree. 
 - This means my GitHub repo is not directly usable for my build. This is 
nuisance because as a self Debian maintainer, my only focus is Debian, 
and I'm building my Debian package all the time, not for other distros. 
 - I've dealt with it and actually have a solution for myself, but when I 
tagged a release on GitHub, the release .tar.gz file will reflect my 
above folder structure, which means the release .tar.gz file from GitHub 
is not a good candidate for "upstream source". I'm OK with it, but worry 
it might confuse others. 

Is there any easy way to manage it? E.g.., can I tell GitHub only treat a 
sub-folder for my release .tar.gz file? Or anything? The last thing I 
want to do is to separate my current arrangement into two, because when I 
change things, the changes will equally spread between the source and 
`debian` folder. Separate them into two will lost such internal 
connection/logic, E.g.,
https://github.com/suntong001/dbab/commit/
ebfb08674cb4446d05bca5a36d28d76c89c6f9b9

Any suggestions? Thanks


-- 
To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/m5f896$hfd$1...@ger.gmane.org