Tags 450878 + patch
thanks
Hi Thijs,
Thijs Kinkhorst wrote:
> I sometimes use version control for a package in a way where I only have
> the debian/ dir in SVN
me too, as I keep all my packages in the collab-maint svn repository
with mergeWithUpstream set. Therefore I know the situation that
changelog is not found if current working directory is the debian
directory.
> 2) When debian/changelog not found, check whether the current dir
> is called "debian" and has a "changelog", then proceed as normal.
I implemented this variant (because its the case that I think is faced
more often). As I can't commit it myself to the devscripts repository I
would feel lucky if someone could integrate that into current svn.
However solving the problem this way has a negative side effect if
people manage upstream source in subversion as well and do intend to
make changes outside of the debian - directory: If one is having changes
outside of the debian directory, they would off course not be commited,
when debcommit is called from within the debian directory.
Best Regards,
Patrick
Index: debian/changelog
===================================================================
--- debian/changelog (Revision 912)
+++ debian/changelog (Arbeitskopie)
@@ -20,8 +20,12 @@
[ Christoph Berg ]
* debcommit: also look for \t in the diff for GNU-style changelogs.
- -- Christoph Berg <[EMAIL PROTECTED]> Sun, 27 Jan 2008 13:26:30 +0100
+ [ Patrick Schoenfeld ]
+ * debcommit: Make commit work if the current working directory is the
+ debian - directory (Closes: #450878)
+ -- Patrick Schoenfeld <[EMAIL PROTECTED]> Sun, 27 Jan 2008 19:52:55 +0100
+
devscripts (2.10.13) unstable; urgency=low
* The 'we sponsor Adam for DM' upload
Index: scripts/debcommit.pl
===================================================================
--- scripts/debcommit.pl (Revision 912)
+++ scripts/debcommit.pl (Arbeitskopie)
@@ -240,7 +240,13 @@
my $prog=getprog();
if (! -e $changelog) {
- die "debcommit: cannot find $changelog\n";
+ my $dir=basename(getcwd());
+ if ($dir eq 'debian') {
+ $changelog = 'changelog';
+ }
+ if (! -e $changelog) {
+ die "debcommit: cannot find $changelog\n";
+ }
}
if ($release) {
