Author: kevj
Date: Wed May 23 05:04:42 2007
New Revision: 540934
URL: http://svn.apache.org/viewvc?view=rev&rev=540934
Log:
-add missing fields to control file
Modified:
ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFile.java
ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFileTask.java
Modified:
ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFile.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFile.java?view=diff&rev=540934&r1=540933&r2=540934
==============================================================================
---
ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFile.java
(original)
+++
ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFile.java
Wed May 23 05:04:42 2007
@@ -42,8 +42,12 @@
private static final String MAINTAINER_HEADER = "Maintainer: ";
private static final String PROVIDES_HEADER = "Provides: ";
private static final String DESCRIPTION_HEADER = "Description: ";
- private static final String DEPENDENCIES_HEADER = "Depends: ";
+ private static final String DEPENDENCIES_HEADER = "Dependency of: ";
private static final String RECOMMENDS_HEADER = "Recommeds: ";
+ private static final String SUGGESTS_HEADER = "Suggests: ";
+ private static final String CONFLICTS_HEADER = "Conflicts: ";
+ private static final String REPLACES_HEADER = "Replaces: ";
+ private static final String DEPENDS_HEADER = "Depends: ";
private Vector dependencies = new Vector();
@@ -52,6 +56,14 @@
private Vector provides = new Vector();
+ private Vector suggests = new Vector();
+
+ private Vector conflicts = new Vector();
+
+ private Vector replaces = new Vector();
+
+ private Vector depends = new Vector();
+
private String debPackage;
private String debVersion;
@@ -83,6 +95,22 @@
provides.add(p);
}
+ public void addSuggests(Suggests s) {
+ suggests.add(s);
+ }
+
+ public void addConflicts(Conflicts c) {
+ conflicts.add(c);
+ }
+
+ public void addReplaces(Replaces r) {
+ replaces.add(r);
+ }
+
+ public void addDepends(Depends d) {
+ depends.add(d);
+ }
+
public String getDebPackage() {
return debPackage;
}
@@ -151,9 +179,13 @@
writer.println(ARCHITECTURE_HEADER+debArchitecture);
writer.println(ESSENTIAL_HEADER+debEssential);
writer.println(MAINTAINER_HEADER+debMaintainer);
- writeVector(dependencies, DEPENDENCIES_HEADER, writer);
+ writeVector(depends, DEPENDS_HEADER, writer);
writeVector(recommends, RECOMMENDS_HEADER, writer);
writeVector(provides, PROVIDES_HEADER, writer);
+ writeVector(suggests, SUGGESTS_HEADER, writer);
+ writeVector(conflicts, CONFLICTS_HEADER, writer);
+ writeVector(replaces, REPLACES_HEADER, writer);
+ writeVector(dependencies, DEPENDENCIES_HEADER, writer);
if(null != description) {
writer.println(DESCRIPTION_HEADER+description.getDesc());
@@ -182,6 +214,22 @@
public static class Provides extends DpkgLine {
public Provides() {}
+ }
+
+ public static class Suggests extends DpkgLine {
+ public Suggests() {}
+ }
+
+ public static class Conflicts extends DpkgLine {
+ public Conflicts() {}
+ }
+
+ public static class Replaces extends DpkgLine {
+ public Replaces() {}
+ }
+
+ public static class Depends extends DpkgLine {
+ public Depends() {}
}
public static class Description {
Modified:
ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFileTask.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFileTask.java?view=diff&rev=540934&r1=540933&r2=540934
==============================================================================
---
ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFileTask.java
(original)
+++
ant/sandbox/antlibs/debian/trunk/src/main/org/apache/ant/debian/ControlFileTask.java
Wed May 23 05:04:42 2007
@@ -123,4 +123,20 @@
public void addRecommends(ControlFile.Recommends recommends) {
controlFile.addRecommends(recommends);
}
+
+ public void addSuggests(ControlFile.Suggests suggests) {
+ controlFile.addSuggests(suggests);
+ }
+
+ public void addConflicts(ControlFile.Conflicts conflicts) {
+ controlFile.addConflicts(conflicts);
+ }
+
+ public void addReplaces(ControlFile.Replaces replaces) {
+ controlFile.addReplaces(replaces);
+ }
+
+ public void addDepends(ControlFile.Depends depends) {
+ controlFile.addDepends(depends);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
