I have added support for new "utag" parameter,
and enforced propagation of "tag" parameter down
to cvs-buildpackage. The patch is attached.

Now, my .cvs-autoreleasedeb/conf looks like this:

<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE cvs-autoreleasedeb [
<!ELEMENT sources (server)+>
<!ELEMENT server (package)+>
<!ATTLIST server
name CDATA #REQUIRED
options CDATA #REQUIRED>
<!ELEMENT package (option)+>
<!ATTLIST package
name CDATA #REQUIRED
cvsroot CDATA #REQUIRED
prefix CDATA #REQUIRED
tag CDATA #REQUIRED
utag CDATA #REQUIRED>
<!ELEMENT option EMPTY>
<!ATTLIST option
name CDATA #REQUIRED
value CDATA #REQUIRED>
]>

...

    <package name="gradm2"
             cvsroot=":pserver:localhost:/var/lib/cvs"
             tag="XRGTN"
             utag="GRSEC"
             prefix="">
      <option name="binary-source" value="1"/>
    </package>

If you find any use in this functionality, please
consider adding it to the Debian package.

-- 
WBR,
xrgtn
--- /usr/bin/cvs-autoreleasedeb	2006-08-16 13:40:59.000000000 +0300
+++ /usr/local/bin/cvs-autoreleasedeb	2007-01-21 20:47:18.000000000 +0200
@@ -218,15 +218,19 @@
 		# Generate the package
 		mkdir($::PACKDIR.$s."/".$p);
 		chdir($::CVSDIR.$s."/".$conf_struct->{$s}{$p}{prefix}."/".$p);
-		$cmd = "cvs-buildpackage -W".$::PACKDIR.$s."/".$p." ";
+		$cmd = "cvs-buildpackage -W".$::PACKDIR.$s."/".$p;
 		if ($conf_struct->{$s}{$p}{prefix}) {
-			$cmd .= "-x".$conf_struct->{$s}{$p}{prefix};
+			$cmd .= " -x".$conf_struct->{$s}{$p}{prefix};
 		}
-		$cmd .= " -rfakeroot ";
+		$cmd .= " -rfakeroot";
 		$cmd .= $CVSAutoreleasedeb::XMLconf::SERVER_OPT{$s};
 		if ($conf_struct->{$s}{$p}{option}{"binary-source"}) {
 			$cmd .= " -b";
 		}
+		$cmd .= " -T".$conf_struct->{$s}{$p}{tag}
+			if $conf_struct->{$s}{$p}{tag} =~ /\S+/;
+		$cmd .= " -U".$conf_struct->{$s}{$p}{utag}
+			if $conf_struct->{$s}{$p}{utag} =~ /\S+/;
 		print $cmd."\n";
 
 		unless (system($cmd) == 0) {

Reply via email to