diff options
-rwxr-xr-x | contrib/mtn2git/manglenames.py | 12 | ||||
-rw-r--r-- | packages/classpath/classpath-0.97.2/drawpolyline.patch | 26 | ||||
-rw-r--r-- | packages/classpath/classpath_0.97.2.bb | 3 | ||||
-rw-r--r-- | packages/sysstat/sysstat_8.1.6.bb | 15 | ||||
-rw-r--r-- | packages/xorg-driver/xf86-video-omapfb_git.bb | 4 |
5 files changed, 52 insertions, 8 deletions
diff --git a/contrib/mtn2git/manglenames.py b/contrib/mtn2git/manglenames.py index 826092cd18..217a4d26a0 100755 --- a/contrib/mtn2git/manglenames.py +++ b/contrib/mtn2git/manglenames.py @@ -17,7 +17,7 @@ all_names = { "Andrew Wilcox" : (["awilcox@openembedded.org"], "andy@protium.com"), "Angus Ainslie" : (["angus@handheldshell.com"], "angus@handheldshell.com"), "ant" : (["ant", "ant, Jay"], "ant@unknown.openembedded.org"), - "Antonio ospite" : (["ospite@studenti.unina.it"], "ospite@studenti.unina.it"), + "Antonio Ospite" : (["ospite@studenti.unina.it"], "ospite@studenti.unina.it"), "Antti Andreimann" : (["antti.andreimann@mail.ee", "mailto:antti.andreimann@mail.ee"], "antti.andreimann@mail.ee"), "araimondi" : (["araimondi@gmx.net"], "araimondi@gmx.net"), "Arjan Schrijver" : (["arjan@openembedded.org"], "arjan@anymore.nl"), @@ -127,6 +127,7 @@ all_names = { "OpenEmbedded Project" : (["oe@openembedded.org"], "openembedded-devel@lists.openembedded.org"), "Openmoko anonymizer key" : (["openmoko@openembedded.org"], "devel@lists.openmoko.org"), "Otavio Salvador" : (["otavio@ossystems.com.br", "Otavio Salvador <otavio@debian.org>", "Otavio Salvador <otavio@ossystems.com.br>"], "otavio@ossystems.com.br"), + "Ottavio Campana" : (["Ottavio Campana"], "ottavio@campana.vi.it"), "Ovidiu Sas" : (["osas@nslu2-linux.org"], "sip.nslu@gmail.com"), "Oyvind Repvik" : (["nail@nslu2-linux.org", "oyvind@repvik.org"], "nail@nslu2-linux.org"), "Patrick Ohly" : (["pohly@openembedded.org"], "patrick.ohly@gmx.de"), @@ -134,7 +135,7 @@ all_names = { "Patrik Gfeller" : (["Patrik Gfeller <gfellerpatrik@gmx.net>", "gfellerpatrik@gmx.net"], "gfellerpatrik@gmx.net"), "Paul Eggleton" : (["bluelightning", "bluelightning@bluelightning.org", "bluelightning@openembedded.org", "Paul Eggleton"], "bluelightning@bluelightning.org"), "Paul Sokolovsky" : (["pfalcon@openembedded.org", "pmiscml@gmail.com"], "pmiscml@gmail.com"), - "Peter Urbanec" : (["peteru@openembedded.org"], "toppy@urbanec.net"), + "Peter Urbanec" : (["peteru@openembedded.org", "black.lan!peteru"], "toppy@urbanec.net"), "Petr Stetiar" : (["ynezz@true.cz", "PetrŠtetiar"], "ynezz@true.cz"), "Phil Blundell" : (["pb@openembedded.org", "nexus.co.uk!pb", "(none)!pb", "uk[pb]!pb", "reciva.com!pb", "uni-frankfurt.de!pb_"], "philb@gnu.org"), "Philip Balister" : (["crofton@openembedded.org"], "philip@balister.org"), @@ -187,7 +188,6 @@ reverse = { 'bitkeeper.com!nslu2-linux.adm' : None, 'bkbits.net!nslu2-linux.adm' : None, 'bkbits.net!openembedded.adm' : None, - 'black.lan!peteru' : None, '!ByronT' : None, 'cambridgebroadband.com!rjt' : None, 'conversagent.com!fontenot' : None, @@ -229,7 +229,7 @@ for name, (ids, email) in all_names.items(): assert not id in reverse reverse[id] = (name, email) -rx = re.compile(r"^(author|committer) ([a-zA-Z0-9\[\]\(\)\-\.\_!])* <([a-zA-Z0-9\[\]\(\)\-\.\_\@!]+)> (.+)\n$") +rx = re.compile(r"^(author|committer) ([a-zA-Z0-9\[\]\(\)\-\.\_!])* <(.+)> (.+)\n$") last = "" @@ -246,7 +246,9 @@ for line in sys.stdin: sys.stderr.write("id unknown %s\n" % repr(g[2])) if replacement is None: if '!' in g[2]: - replacement = (g[2], g[2] + "@bk.openembedded.invalid") + domain, addr = g[2].split('!') + email = "%s@%s" % (addr, domain) + replacement = (email, email) elif '@' in g[2]: replacement = (g[2], g[2]) else: diff --git a/packages/classpath/classpath-0.97.2/drawpolyline.patch b/packages/classpath/classpath-0.97.2/drawpolyline.patch new file mode 100644 index 0000000000..407f991306 --- /dev/null +++ b/packages/classpath/classpath-0.97.2/drawpolyline.patch @@ -0,0 +1,26 @@ +Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java +=================================================================== +RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v +retrieving revision 1.73 +diff -u -r1.73 CairoGraphics2D.java +--- gnu/java/awt/peer/gtk/CairoGraphics2D.java 8 Feb 2008 22:17:39 -0000 1.73 ++++ gnu/java/awt/peer/gtk/CairoGraphics2D.java 14 Oct 2008 06:50:57 -0000 +@@ -1246,7 +1246,10 @@ + + public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints) + { +- draw(new Polygon(xPoints, yPoints, nPoints)); ++ for (int i = 1; i < nPoints; i++) ++ draw(new Line2D.Double( ++ xPoints[i - 1], yPoints[i - 1], ++ xPoints[i], yPoints[i])); + } + + public void drawOval(int x, int y, int width, int height) +@@ -2171,4 +2174,4 @@ + + return new Rectangle2D.Double(minX, minY, (maxX - minX), (maxY - minY)); + } +-} +\ No newline at end of file ++} diff --git a/packages/classpath/classpath_0.97.2.bb b/packages/classpath/classpath_0.97.2.bb index 242bab95f2..a6327d3710 100644 --- a/packages/classpath/classpath_0.97.2.bb +++ b/packages/classpath/classpath_0.97.2.bb @@ -8,9 +8,10 @@ SRC_URI += "\ file://autotools.patch;patch=1 \ file://decimalformat.patch;patch=1 \ file://cp-byte-loophelper.patch;patch=1;pnum=0 \ + file://drawpolyline.patch;patch=1;pnum=0 \ " -PR = "r4" +PR = "r5" DEPENDS += "gtk+ gconf libxtst" diff --git a/packages/sysstat/sysstat_8.1.6.bb b/packages/sysstat/sysstat_8.1.6.bb new file mode 100644 index 0000000000..0f394ed259 --- /dev/null +++ b/packages/sysstat/sysstat_8.1.6.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux." +HOMEPAGE = "http://pagesperso-orange.fr/sebastien.godard/" +LICENSE = "GPL" +SECTION = "console/utils" + +SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz" + +inherit autotools + +do_configure_prepend() { + sed -i s,'-g $(MAN_GROUP)','', Makefile.in +} + +FILES_${PN} += "${libdir}/sa" + diff --git a/packages/xorg-driver/xf86-video-omapfb_git.bb b/packages/xorg-driver/xf86-video-omapfb_git.bb index 2afafcb35c..46f0f38a72 100644 --- a/packages/xorg-driver/xf86-video-omapfb_git.bb +++ b/packages/xorg-driver/xf86-video-omapfb_git.bb @@ -2,9 +2,9 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- OMAP display driver" -PR ="r6" +PR ="r7" -SRCREV = "0bc4f79a455a84e30096ebe8124f97277d01f7de" +SRCREV = "f488430a2bf036c61243322584026e786284d3a7" PV = "0.0.1+${PR}+git${SRCREV}" SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http" |