[Bug 311858] Re: New Debian version needs merge

[James Westby]

Hi,

Thanks for working on this.

+Note for mergers
+----------------
+
+When merging a new upstream version, the merger should search for "6880" and 
+apply the correct substitution. Also, any port selection in the range x-65535 
+should be done in the range x-49151 instead.

Did you check for any additions of these strings?

There are also a few changes from Debian that aren't clearly documented:

-   <property name="dist.jar.excludes" value="${generic.excludes} **/*.java " />
+   <property name="dist.jar.excludes" value="${generic.excludes} **/*.java debian/ build/ dist/ *build.xml azureus Azureus.* " />

-	ANT_OPTS=-Xmx128m ant
+	ANT_OPTS=-Xmx256m ant

Also you remove the "binary-arch" target, but this is a required target, even if it
does nothing.

Lastly, the package depends on libseda-java, but this package has been removed. Is the
dependency still needed?

Thanks,

James

-- 
New Debian version needs merge
https://bugs.launchpad.net/bugs/311858
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.

-- 
ubuntu-bugs mailing list
ubuntu-bugs at lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs