Mark J. Wielaard

When a project keeps a GNU style ChangeLog file to keep track of who changed what where then those files can be automagically merged if you use mercurial or git.

gnulib contains a module git-merge-changelog which, despite the name, works perfectly with several version control systems.

To install it:

git clone git://git.savannah.gnu.org/gnulib.git
cd gnulib
./gnulib-tool --create-testdir --dir=/tmp/testdir123 git-merge-changelog
cd /tmp/testdir123
./configure
make
make install

Mercurial

For Mercurial add the following lines to your ~/.hgrc:

[merge-patterns]
ChangeLog = git-merge-changelog

[merge-tools]
git-merge-changelog.executable = /usr/local/bin/git-merge-changelog
git-merge-changelog.args = $base $local $other

That installs the git-merge-changelog driver globally for all hg repos.

git

For git add the following lines to your ~/.gitconfig

[merge "merge-changelog"]
	name = GNU-style ChangeLog merge driver
	driver = /usr/local/bin/git-merge-changelog %O %A %B

[core]
    attributesfile = ~/.gitattributes

And add the following line to ~/.gitattributes

ChangeLog       merge=merge-changelog

Note: The global core.attributesfile exists only since git 1.7.4, before that you would have to configure this for each git repo separately, by doing:

cd ~/src/[repo-name]
echo "ChangeLog   merge=merge-changelog" >> .git/info/attributes

And never worry again about having to manually merge ChangeLog files.

The Open Invention Network patent agreement now also covers IcedTea and OpenJDK (see the new System Environment Components list). The covered version of GCC/GNU Classpath/libgcj have been updated to the latest release and various GNU Classpath[X] components have been added. As have the Eclipse SDK and ECJ. This is good news since that means the various companies which are part of OIN (Red Hat, IBM, Oracle, Google, Sony, Philips, Novell etc.) have agreed to patent cross-license and release from claims of patent infringement each other and everybody who joins OIN and agrees to collaborate in the same way around GNU/Linux and the various implementations of the java programming language.

Planet Classpath is offline today, because the US congress is considering legislation that could kill us forever. The legislation is called the PROTECT IP Act (PIPA). This legislation threatens everyone’s freedom of speech, privacy, and security online.

This would unmake the Web, just as proposed in the Stop Online Piracy Act (SOPA). We don’t want that world. Visit AmericanCensorship.org for some options to contact your representatives if you are an American citizen. The Electronic Frontier Foundation has more information on this and other issues central to your freedom online.

We will return tomorrow,

The Management

The end of 2011 is near.
The Free Java Momentum will be even bigger in 2012.
Have you made your new year’s resolutions yet?
And is attending Free Java @ FOSDEM 2012 on Feb 4 and 5 one of them?
http://wiki.debian.org/Java/DevJam/2012/Fosdem

Or are you even more ambitious and will you submit a talk proposal?
Then please make sure you submit an abstract before the end of the year
to fosdem@developer.classpath.org. Full instructions can be found at:
http://wiki.debian.org/Java/DevJam/2012/Fosdem/CallForParticipation

We are pleased to announce the Call for Participation in the FOSDEM 2012 Free Java DevRoom!

This marks the 9th year that the Free Java DevRoom has been a part of FOSDEM. Saturday 4th and Sunday 5th of February 2012 Brussels, Belgium.

The Free Java DevRoom has become unique in that it has attracted upstream, downstream, distrbutors and Free Software hackers together in one venue. Topics range from the “deep technical” to “deep community”.

Join us for this year’s theme: “Free Java Momentum”
Check out our wiki for more details on the conference:
http://wiki.debian.org/Java/DevJam/2012/Fosdem
And join the freejava-devroom@lists.fosdem.org
https://lists.fosdem.org/mailman/listinfo/freejava-devroom

Please submit one (or more) 30 minute talk proposal(s) by the 30th of December 2011 to fosdem@developer.classpath.org. A template for submitting a talk can be found at: http://wiki.debian.org/Java/DevJam/2012/Fosdem/CallForParticipation

Please join us!

–The Free Java DevRoom Organizing Committee
Andrew Haley, Red Hat
Dalibor Topic, Oracle
Dr Andrew John Hughes, Red Hat
Mark Wielaard, IcedTea
Sylvestre Ledru, Debian
Tom Marble, Informatique

p.s. We had some nice media coverage last year…

FLOSS Weekly 152: FOSDEM
http://twit.tv/floss152

Linux Outlaws 191 – Special: FOSDEM Coverage
http://old.linuxoutlaws.com/podcast/191

Unfortunately builder.classpath.org, planet.classpath.org and
icedtea.wildebeest.org (which acts as the icedtea backup server) need to
move to a different internet connection… twice…

First they will move today/tomorrow to a slower connection, and then one
or two weeks later they will hopefully move to a much faster connection.
Each time the IP addresses will change. This might cause some unexpected
downtime or make the servers unreachable for some time.

You might notice some warnings emitted when committing to one of the
repositories that trigger the buildbot when it cannot reach
builder.classpath.org. These are “harmless”, except that your commit
will not be tested by the autobuilders. So please be extra careful what
you commit in the next couple of days.

Apologies for the inconvenience.

The Fosdem 2012 Developer rooms have been announced. And Libre Java is one of them! I hope to see everybody again in Brussels on 4 and 5 February.

Let’s have a look at some numbers: we have 136 members who have been nominated for their contributions to the project; we have some 270 developers and 270 localizers (although we always want to attract more), many of whom are also members; we have over 100 mailing lists, with over 15,000 subscribers, half of whom receive all our announcements; and there have been thousands of articles in the media worldwide.

LibreOffice is the result of the combined activity of 330 contributors – including former OpenOffice.org developers – having made more than 25,000 commits

The Document Foundation celebrates its first anniversary

Impressive…

From: mark.reinhold@oracle.com
Subject: openjdk.java.net is offline
Date: Tue, 28 Jun 2011 23:06:30 -0700 (06/29/2011 08:06:30 AM)
Mailer: MH-E 8.2; nmh 1.3; GNU Emacs 23.1.1

Due to an unexpected cooling-system failure, openjdk.java.net and all of
its subdomains are offline.  Oracle IT and facilities teams are working
on the problem now.  At this point we do not expect service to be
restored before mid-morning tomorrow (Wednesday) Pacific time.

We apologize for the inconvenience.

(In case you're wondering, you're receiving this message because you've
 sent a message to one or more OpenJDK mailing lists in the last thirty
 days.  Please pass this on to any other interested parties.)

- Mark

If people desperately need the code right now then we have some mirrors of the code on http://icedtea.classpath.org/hg/ and some more on the mirror of IcedTea itself http://icedtea.wildebeest.org/hg/ but only the main forests have been mirrored. If you find something missing then please leave a comment and I make sure we add it for next time the openjdk servers go down. The mirrors update every hour, so should have all of the recent changes.

That was quick…

We wish to inform you that as of Friday, 15 April 2011, the APNIC pool reached the Final /8 IPv4 address block

http://www.apnic.net/publications/news/2011/final-8

So, everybody ready for IPv6 yet?