- Arch-dev-public - lists.archlinux.org

[arch-dev-public] Error merging opera-devel
by Daniel Isenmann 17 Apr '08

17 Apr '08

Hi, following problem on merging opera-devel in unstable: $ unstablepkg ===> Uploaded opera-devel-9.50-0.20-x86_64.pkg.tar.gz ===> Commited with "upgpkg: opera-devel 9.50-0.20" message C ../repos/unstable-x86_64/PKGBUILD property 'svnmerge-integrated' set on '../repos/unstable-x86_64' ~/svn/opera-devel ~/svn/opera-devel/trunk svn: Commit failed (details follow): svn: Aborting commit: '/home/ise/svn/opera-devel/repos/unstable-x86_64/PKGBUILD' remains in conflict ~/svn/opera-devel/trunk ===> Tagged for unstable-x86_64 The i686 one worked, but the x86_64 not. Now I have 4 PKGBUILDs in my repo/unstable-x86_64: $ ls repos/unstable-x86_64/ PKGBUILD PKGBUILD.merge-right.r318 opera.desktop PKGBUILD.merge-left.r304 PKGBUILD.working opera_logo48.png The PKGBUILD.merge-right.r318 is the right one, which should be in the svn, but I don't have enough svn knowledge to solve the merging problem. Can someone please give me some advice or solve the merging problem?? Thanks, Daniel

3 3

[arch-dev-public] [signoff] bzip2 1.0.5-2
by Tom K 16 Apr '08

16 Apr '08

Everything 1.0.5-1 had, PLUS a working shared lib symlink for people like Dan. :P I rebuilt links against it - the executable is now a shade smaller, and ldd/strings output is identical. Uploaded for both arches. T.

2 1

[arch-dev-public] Rsync to [core]
by Travis Willard 16 Apr '08

16 Apr '08

With ABS changing from cvsup to rsync, we either need to move rsync to core, or abs to extra. I vote rsync to core. Anyone opposed? If all are OK with it, I'll move it to core tomorrow.

6 8

[arch-dev-public] [Draft] ABS announcement
by Travis Willard 16 Apr '08

16 Apr '08

May as well tell the people what's happening with ABS. Here's an announcement draft: -----------8<-----------------8<-------- ABS 2.0 In Testing With version 2, ABS has moved to an rsync method for pulling the ABS tree, as part of the changes that needed to be made for our internal move from CVS to SVN as our source control mechanism. This means a few things: 1) cvsup/csup are no longer required 2) /etc/abs/supfile.* are no longer required 3) Anyone opening ports for use with ABS will now need to open port 837, the rsync port Also, since category information (ie. base, devel, editors) is no longer stored in the repo, makeworld has been updated - check makeworld -h for more info. -----------8<-----------------8<-------- Thoughts?

7 11

Re: [arch-dev-public] [arch-commits] Commit in abs/trunk (PKGBUILD)
by Aaron Griffin 15 Apr '08

15 Apr '08

On Mon, Apr 14, 2008 at 10:59 AM, Travis Willard <travis(a)archlinux.org> wrote: > Date: Monday, April 14, 2008 @ 11:59:50 > Author: travis > Revision: 269 > > Simple test to check commit messages Win. This is a commit message from svn. It's made by the same guy who made the cvslog util we were using (oddly enough, he named it svnlog for reasons I will never know, heh). I had to hackity it to limit diffs to 40K though Oh, I also had to bump perl on gerolde... well, it was on accident, but we don't use perl for anything, right? Dale, Eliott, can you guys confirm I didn't accidentally make things go kablooey?

4 6

[arch-dev-public] [signoff] bzip2 1.0.5-1
by Tom K 15 Apr '08

15 Apr '08

Upstream vulnerability fix, our ref FS#10121, additional info here: https://www.cert.fi/haavoittuvuudet/joint-advisory-archive-formats.html Also, man path amended. In testing now for both arches. Thanks T.

4 7

[arch-dev-public] [signoff] lvm2 2.02.34-1
by Thomas Bächler 15 Apr '08

15 Apr '08

Yet another minor update for lvm2, please sign off.

3 5

[arch-dev-public] [signoff] abs 2.0-2
by Travis Willard 15 Apr '08

15 Apr '08

Same as 2.0-1, except: rsync server configurable rsyncd.conf.abs moved to /usr/share/abs

4 8

[arch-dev-public] TrueCrypt and kernel updates
by Tom K 15 Apr '08

15 Apr '08

FYI kernel maintainers - TrueCrypt is now fuse-based, and will no longer require a rebuild for kernel updates. T.

2 1

[arch-dev-public] Imagemagick rebuild in [testing]
by Eric Belanger 14 Apr '08

14 Apr '08

Hi, I just uploaded an imagemagick package in testing that will require a rebuilt of the apps that links to its libs because the libraries names have changed. From imagemagick ChangeLog: * New Unix/Linux refactoring (should be transparent since changes are reflected in Magick-config and ImageMagick.pc pkg-config files): /usr/local/include => /usr/local/include/ImageMagick libMagick => libMagickCore libWand => libMagickWand Magick-config (deprecated) => MagickCore-config Wand-config (deprecated) => MagickWand-config Add Magick++-config, MagickCore.pc, MagickWand.pc, Magick++.pc The package that needs to be rebuilt are: dvdauthor inkscape koffice labplot libavg libfprint psiconv (already done) pstoedit transcode vips vips-devel xine-lib To get the list above, I've installed all packages that had imagemagick as a (make)depends then ran lddd to see which ones needed to be rebuilt. It might be worth it to to that for future rebuilds. If someone with mysql access would do a todo list for the above, I'll appreciate. I could always do some of these rebuilds if some of you are overwhelmed by work. Eric -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.

4 10