This is an automated email from the git hooks/post-receive script. mak pushed a commit to branch master in repository devscripts.
commit 455ace0ae6ceb9c2ca91f245e5008d85a1520608 Author: Matthias Klumpp <[email protected]> Date: Thu Sep 12 01:37:47 2013 -0700 dch: Add support for Tanglu (Closes: #722547) --- scripts/debchange.1 | 6 +++--- scripts/debchange.pl | 22 +++++++++++++++++----- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/scripts/debchange.1 b/scripts/debchange.1 index 94699d4..3adbe9c 100644 --- a/scripts/debchange.1 +++ b/scripts/debchange.1 @@ -149,8 +149,8 @@ Add a new changelog entry at the end of the current version's entries. .TP .BR \-\-increment ", " \-i Increment either the final component of the Debian release number or, -if this is a native Debian package, the version number. On Ubuntu, -this will also change the suffix from buildX to ubuntu1. Use +if this is a native Debian package, the version number. On Ubuntu or Tanglu, +this will also change the suffix from buildX to ubuntu1/tanglu1. Use \fB\-R\fR, \fB\-\-rebuild\fR for a no change rebuild increment. This creates a new section at the beginning of the changelog with appropriate headers and footers. Also, if this is a new version of a native @@ -235,7 +235,7 @@ Increment the Debian release number for a Debian QA Team upload, and add a \fBQA upload\fR changelog comment. .TP .BR \-\-rebuild ", " \-R -Increment the Debian release number for an Ubuntu no-change rebuild by +Increment the Debian release number for a no-change rebuild by appending a "build1" or by incrementing a rebuild version number. .TP .BR \-\-security ", " \-s diff --git a/scripts/debchange.pl b/scripts/debchange.pl index 98acd63..452bc1f 100755 --- a/scripts/debchange.pl +++ b/scripts/debchange.pl @@ -163,7 +163,7 @@ Options: -q, --qa Increment the Debian release number for a Debian QA Team upload -R, --rebuild - Increment the Debian release number for an Ubuntu no-change rebuild + Increment the Debian release number for a no-change rebuild -s, --security Increment the Debian release number for a Debian Security Team upload --team @@ -869,7 +869,7 @@ if ($opt_auto_nmu eq 'yes' and ! $opt_v and ! $opt_l and ! $opt_s and ! $opt_n and ! $opt_c and ! (exists $ENV{'CHANGELOG'} and length $ENV{'CHANGELOG'}) and ! $opt_M and ! $opt_create and ! $opt_a_passed and ! $opt_r and ! $opt_e and - $vendor ne 'Ubuntu' and + $vendor ne 'Ubuntu' and $vendor ne 'Tanglu' and ! ($opt_release_heuristic eq 'changelog' and $changelog{'Distribution'} eq 'UNRELEASED' and ! $opt_i_passed)) { @@ -1154,7 +1154,7 @@ if (($opt_i || $opt_n || $opt_bn || $opt_qa || $opt_R || $opt_s || $opt_team || # If it's not already an NMU make it so # otherwise we can be safe if we behave like dch -i - if (($opt_n or $opt_s) and $vendor ne 'Ubuntu' and ( + if (($opt_n or $opt_s) and $vendor ne 'Ubuntu' and $vendor ne 'Tanglu' and ( ($VERSION eq $UVERSION and not $start =~ /\+nmu/) or ($VERSION ne $UVERSION and not $start =~ /\.$/))) { @@ -1176,6 +1176,9 @@ if (($opt_i || $opt_n || $opt_bn || $opt_qa || $opt_R || $opt_s || $opt_team || } elsif ($opt_R and $vendor eq 'Ubuntu' and not $start =~ /build/ and not $start =~ /ubuntu/) { $end .= "build1"; + } elsif ($opt_R and $vendor eq 'Tanglu' and + not $start =~ /b/ and not $start =~ /tanglu/) { + $end .= "b1"; } elsif ($opt_bpo and not $start =~ /~bpo[0-9]+\+$/) { # If it's not already a backport make it so # otherwise we can be safe if we behave like dch -i @@ -1196,6 +1199,15 @@ if (($opt_i || $opt_n || $opt_bn || $opt_qa || $opt_R || $opt_s || $opt_team || $end = ""; } $end .= "ubuntu1"; + } elsif (($opt_i or $opt_s) and $vendor eq 'Tanglu' and + $start !~ /(tanglu)(\d+\.)*$/ and not $opt_U) { + + if ($start =~ /b/) { + # Drop bX suffix in favor of tanglu1 + $start =~ s/b//; + $end = ""; + } + $end .= "tanglu1"; } else { $end++; } @@ -1214,7 +1226,7 @@ if (($opt_i || $opt_n || $opt_bn || $opt_qa || $opt_R || $opt_s || $opt_team || } } - if(! ($opt_s or $opt_n or $vendor eq 'Ubuntu')) { + if(! ($opt_s or $opt_n or $vendor eq 'Ubuntu' or $vendor eq 'Tanglu')) { if ($start =~/(.*?)-(\d+)\.$/) { # Drop NMU revision my $upstream_version = $1; @@ -1277,7 +1289,7 @@ if (($opt_i || $opt_n || $opt_bn || $opt_qa || $opt_R || $opt_s || $opt_team || print O " * QA upload.\n"; $line = 1; } elsif ($opt_s && ! $opt_news) { - if ($vendor eq 'Ubuntu') { + if ($vendor eq 'Ubuntu' or $vendor eq 'Tanglu') { print O " * SECURITY UPDATE:\n"; print O " * References\n"; } else { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
