r25470 - in /tools/gnome-pkg-tools: debian/changelog dh/dh_gnome_clean dh/dh_gnome_clean.1

dktrkranz at users.alioth.debian.org dktrkranz at users.alioth.debian.org
Mon Nov 1 18:57:52 UTC 2010


Author: dktrkranz
Date: Mon Nov  1 18:57:39 2010
New Revision: 25470

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25470
Log:
Implement check-dist.mk equivalent for dh sequencer

Modified:
    tools/gnome-pkg-tools/debian/changelog
    tools/gnome-pkg-tools/dh/dh_gnome_clean
    tools/gnome-pkg-tools/dh/dh_gnome_clean.1

Modified: tools/gnome-pkg-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/debian/changelog?rev=25470&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/changelog [utf-8] (original)
+++ tools/gnome-pkg-tools/debian/changelog [utf-8] Mon Nov  1 18:57:39 2010
@@ -6,11 +6,12 @@
   [ Luca Falavigna ]
   * Add --with gnome debhelper sequencer (Closes: #578494).
     It currently provides the equivalent for the following classes:
+    - check-dist.mk
     - clean-la.mk
     - gnome-version.mk
     - uploaders.mk
 
- -- Luca Falavigna <dktrkranz at debian.org>  Fri, 24 Sep 2010 14:19:53 +0200
+ -- Luca Falavigna <dktrkranz at debian.org>  Mon, 01 Nov 2010 19:45:06 +0100
 
 gnome-pkg-tools (0.16.3) unstable; urgency=low
 

Modified: tools/gnome-pkg-tools/dh/dh_gnome_clean
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/dh/dh_gnome_clean?rev=25470&op=diff
==============================================================================
--- tools/gnome-pkg-tools/dh/dh_gnome_clean [utf-8] (original)
+++ tools/gnome-pkg-tools/dh/dh_gnome_clean [utf-8] Mon Nov  1 18:57:39 2010
@@ -11,7 +11,7 @@
 
 =head1 SYNOPSIS
 
-B<dh_gnome_clean> [I<debhelper options>] [--no-control]
+B<dh_gnome_clean> [I<debhelper options>] [--no-control] [--check-dist]
 
 =head1 DESCRIPTION
 
@@ -32,11 +32,16 @@
 Use this flag if you do not want to recreate debian/control file on top of
 debian/control.in, or if you do not provide the latter.
 
+=item B<--check-dist>
+
+Use this flag if you want to avoid unwanted uploads to unstable.
+
 =back
 
 =cut
 
-init(options => { "no-control" => \$dh{MANGLE_CONTROL} });
+init(options => { "no-control" => \$dh{MANGLE_CONTROL},
+                  "check-dist" => \$dh{CHECK_DIST} });
 
 # Members list of Debian GNOME Maintainers
 my $team_list = "/usr/share/gnome-pkg-tools/pkg-gnome.team";
@@ -47,6 +52,10 @@
 my $recent_uploads = 10;
 # Header for debian/control
 my $control_header = "/usr/share/gnome-pkg-tools/control.header";
+# Allowed distributions in changelog
+my @allowed_dists = ("experimental");
+# Disallowed distributions in changelog
+my @disallowed_dists = ("unstable");
 
 sub mangle_control {
 
@@ -112,7 +121,23 @@
 
 }
 
+sub check_dist {
+
+    `dpkg-parsechangelog` =~ m/Distribution: (\S+)/;
+    my $distribution = $1;
+
+    foreach (@allowed_dists) {
+        return if $distribution eq $_;
+    }
+    foreach (@disallowed_dists) {
+        die "Disallowed distribution: $distribution" if $distribution eq $_;
+    }
+    print "Unknown distribution: $distribution\n";
+
+}
+
 unless ($dh{MANGLE_CONTROL}) { mangle_control(); }
+if ($dh{CHECK_DIST}) { check_dist(); }
 
 =head1 SEE ALSO
 

Modified: tools/gnome-pkg-tools/dh/dh_gnome_clean.1
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/dh/dh_gnome_clean.1?rev=25470&op=diff
==============================================================================
--- tools/gnome-pkg-tools/dh/dh_gnome_clean.1 [utf-8] (original)
+++ tools/gnome-pkg-tools/dh/dh_gnome_clean.1 [utf-8] Mon Nov  1 18:57:39 2010
@@ -59,10 +59,72 @@
 .    de IX
 ..
 .\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
 .IX Title "DH_GNOME_CLEAN 1"
-.TH DH_GNOME_CLEAN 1 "2010-09-24" "" "gnome-pkg-tools"
+.TH DH_GNOME_CLEAN 1 "2010-11-01" "" "gnome-pkg-tools"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -71,7 +133,7 @@
 dh_gnome \- tools for the Debian GNOME Packaging Team
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-\&\fBdh_gnome_clean\fR [\fIdebhelper options\fR] [\-\-no\-control]
+\&\fBdh_gnome_clean\fR [\fIdebhelper options\fR] [\-\-no\-control] [\-\-check\-dist]
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 gnome-pkg-tools contains some useful tools for the Debian \s-1GNOME\s0 Packaging Team.
@@ -87,6 +149,9 @@
 .IX Item "--no-control"
 Use this flag if you do not want to recreate debian/control file on top of
 debian/control.in, or if you do not provide the latter.
+.IP "\fB\-\-check\-dist\fR" 4
+.IX Item "--check-dist"
+Use this flag if you want to avoid unwanted uploads to unstable.
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIdebhelper\fR\|(7)




More information about the pkg-gnome-commits mailing list