Processed: Re: Bug#369890: silo: build-depends on gcc-2.95, which may be removed for etch

2006-06-08 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

 tags 369890 patch
Bug#369890: silo: build-depends on gcc-2.95, which may be removed for etch
There were no tags set.
Tags added: patch

 thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#369890: silo: build-depends on gcc-2.95, which may be removed for etch

2006-06-08 Thread Jurij Smakov

tags 369890 patch
thanks

Hi,

I've prepared updated silo package (patch attached), including a fix for 
this bug. It has been updated to the latest available upstream, built with 
gcc-4.1 in pbuilder, and tested on both sparc32 and sparc64. A couple of
lintian errors have been fixed (a few warnings still remain). Ben, if it's 
ok with you, I would like to upload it (I added myself to uploaders, so 
it's not going to be an NMU).


Best regards,

Jurij Smakov[EMAIL PROTECTED]
Key: http://www.wooyd.org/pgpkey/   KeyID: C99E03CCdiff -aurN a/debian/changelog b/debian/changelog
--- a/debian/changelog  2006-04-22 07:45:27.0 -0700
+++ b/debian/changelog  2006-06-07 23:01:27.0 -0700
@@ -1,3 +1,21 @@
+silo (1.4.12-1) unstable; urgency=low
+
+  * Update to new upstream release (1.4.12).
+  * Remove 10-sun4u_notimer.patch, included upstream.
+  * Add 10-silo_get_architecture.patch, making it possible
+to build a working SILO with gcc-4.1. Closes: #369890.
+  * Change the build-dependency from gcc-2.95 to gcc-4.1 and use it
+for building.
+  * Add explicit build-dependency on perl, scripts in debian/scripts
+require it (lintian error).
+  * Make sure that /etc/silo.conf is registered as conffile only
+once by modifying debian/packages.d/silo.in (lintian error).
+  * Upstream does not ship a changelog anymore, adjust
+debian/rules appropriately.
+  * Add myself to uploaders.
+
+ -- Jurij Smakov [EMAIL PROTECTED]  Wed,  7 Jun 2006 20:46:16 -0700
+
 silo (1.4.11-0.2) unstable; urgency=low
 
   * Non-Maintainer Upload.
diff -aurN a/debian/control b/debian/control
--- a/debian/control2006-01-19 06:15:30.0 -0800
+++ b/debian/control2006-06-07 23:02:30.0 -0700
@@ -2,7 +2,8 @@
 Section: base
 Priority: important
 Maintainer: Ben Collins [EMAIL PROTECTED]
-Build-Depends: e2fslibs-dev (= 1.28-1), debhelper (= 5.0), gcc-2.95, bzip2, 
sparc-utils
+Uploaders: Jurij Smakov [EMAIL PROTECTED]
+Build-Depends: e2fslibs-dev (= 1.28-1), debhelper (= 5.0), gcc-4.1, bzip2, 
sparc-utils, perl
 Standards-Version: 3.2.1.0
 
 Package: silo
diff -aurN a/debian/packages.d/silo.in b/debian/packages.d/silo.in
--- a/debian/packages.d/silo.in 2006-01-19 05:46:55.0 -0800
+++ b/debian/packages.d/silo.in 2006-06-07 22:14:43.0 -0700
@@ -1,5 +1,3 @@
-%conffiles%
-/etc/silo.conf
 %postinst%
 #!/bin/sh
 /usr/sbin/siloconfig
diff -aurN a/debian/patches/10-silo_get_architecture.patch 
b/debian/patches/10-silo_get_architecture.patch
--- a/debian/patches/10-silo_get_architecture.patch 1969-12-31 
16:00:00.0 -0800
+++ b/debian/patches/10-silo_get_architecture.patch 2006-06-04 
00:50:08.0 -0700
@@ -0,0 +1,12 @@
+diff -aur a/second/misc.c b/second/misc.c
+--- a/second/misc.c2006-03-08 10:41:35.0 -0800
 b/second/misc.c2006-06-04 00:30:07.0 -0700
+@@ -493,7 +493,7 @@
+ 
+ enum arch silo_get_architecture(void)
+ {
+-char *buffer = sun4c;
++char buffer[] = sun4c;
+ int i;
+ 
+ if (prom_vers == PROM_P1275) {
diff -aurN a/debian/patches/10-sun4u_notimer.patch 
b/debian/patches/10-sun4u_notimer.patch
--- a/debian/patches/10-sun4u_notimer.patch 2006-04-22 11:42:03.0 
-0700
+++ b/debian/patches/10-sun4u_notimer.patch 1969-12-31 16:00:00.0 
-0800
@@ -1,41 +0,0 @@
 silo-1.4.11/second/timer.c.~1~  2006-04-20 21:18:49.0 -0700
-+++ silo-1.4.11/second/timer.c  2006-04-20 21:21:19.0 -0700
-@@ -40,6 +40,8 @@
- static volatile struct sun4c_timer_info *sun4c_timer;
- static unsigned char *addr_to_free = 0;
- static int len_to_free;
-+static unsigned long long sun4u_tickcmpr;
-+static int sun4u_notimer = 0;
- static struct mostek48t02 *mregs;
- static long clock_frequency;
- 
-@@ -154,6 +156,16 @@
- }
- if (!foundcpu || !clock_frequency)
- clock_frequency = prom_getint(prom_root_node, clock-frequency) / 
100;
-+if (notimer) {
-+sun4u_notimer = 1;
-+__asm__ __volatile__ (\t
-+   rd %%tick_cmpr, %%g1\n\t
-+   stx%%g1, [%0]\n\t
-+   mov1, %%g1\n\t
-+   sllx%%g1, 63, %%g1\n\t
-+   wr  %%g1, 0, %%tick_cmpr
-+   : : r (sun4u_tickcmpr) : g1);
-+}
- return 0;
- }
- 
-@@ -194,6 +206,12 @@
- 
- void close_timer ()
- {
-+if (sun4u_notimer) {
-+__asm__ __volatile__(\t
-+   ldx[%0], %%g1\n\t
-+   wr %%g1, 0, %%tick_cmpr
-+   : : r (sun4u_tickcmpr) : g1);
-+}
- if (addr_to_free) {
- if (addr_to_free == (unsigned char *)0x)
- sun4c_unmapio (TICKER_VIRTUAL);
diff -aurN a/debian/rules b/debian/rules
--- a/debian/rules  2006-03-25 14:13:42.0 -0800
+++ b/debian/rules  2006-06-07 20:59:03.0 -0700
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 
 # the dbs rules
-TAR_DIR := silo-1.4.11
+TAR_DIR := silo-1.4.12
 

Bug#369890: silo: build-depends on gcc-2.95, which may be removed for etch

2006-06-08 Thread Frans Pop
On Thursday 08 June 2006 09:08, Jurij Smakov wrote:
 I've prepared updated silo package (patch attached), including a fix
 for this bug. It has been updated to the latest available upstream,
 built with gcc-4.1 in pbuilder, and tested on both sparc32 and sparc64.

 +++ b/debian/control  2006-06-07 23:02:30.0 -0700
[...]
 +Build-Depends: e2fslibs-dev (= 1.28-1), debhelper (= 5.0), gcc-4.1,
^^^
 bzip2, sparc-utils, perl 

Shouldn't silo just depend on current gcc instead of on an explicit 
version no that the need to depend on 2.95 is gone?


pgp69xQRcoygu.pgp
Description: PGP signature


Bug#369890: silo: build-depends on gcc-2.95, which may be removed for etch

2006-06-08 Thread Jurij Smakov

Frans Pop wrote:


Shouldn't silo just depend on current gcc instead of on an explicit
version no that the need to depend on 2.95 is gone?


It's not necessary, but I thought it's not a bad idea to leave it like 
this. At least it improves the chances that there will be no surprises 
next time the compiler changes :-).


Oh, and it's probably worth acknowledging the previous NMUs with the next 
upload too.


Best regards,

Jurij Smakov[EMAIL PROTECTED]
Key: http://www.wooyd.org/pgpkey/   KeyID: C99E03CC


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#369890: silo: build-depends on gcc-2.95, which may be removed for etch

2006-06-02 Thread Jurij Smakov

Ben Collins wrote:


Just change the build-dep, it should be needed anymore. If it's
hardcoded in the makefile, change that too.


I tried building silo with gcc-4.1. It works on sparc64, but hangs on 
sparc32, so the problem is not resolved yet. I did not have time to 
investigate it yet.


Best regards,

Jurij Smakov[EMAIL PROTECTED]
Key: http://www.wooyd.org/pgpkey/   KeyID: C99E03CC


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#369890: silo: build-depends on gcc-2.95, which may be removed for etch

2006-06-01 Thread Steve Langasek
Package: silo
Version: 1.4.11-0.2
Severity: serious

The silo bootloader package build-depends on gcc-2.95 at the version
currently in unstable, making it the only package of any substance which
does so.  The gcc-2.95 package itself is RC-buggy, failing to build with the
current version of make; since there has been no interest expressed in
fixing this bug by the maintainer, the likely outcome is that gcc-2.95 will
be dropped from etch, leaving sparc without a releasable bootloader.

There are two possible solutions:

- silo gets updated to use a more recent compiler, dropping this build-dep
- someone adopts gcc-2.95, fixing the FTBFS, and maintaining it for etch

X-Debbugs-Cc: to debian-sparc.

-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
[EMAIL PROTECTED]   http://www.debian.org/


signature.asc
Description: Digital signature


Bug#369890: silo: build-depends on gcc-2.95, which may be removed for etch

2006-06-01 Thread Ben Collins
On Thu, 2006-06-01 at 16:35 -0700, Steve Langasek wrote:
 Package: silo
 Version: 1.4.11-0.2
 Severity: serious
 
 The silo bootloader package build-depends on gcc-2.95 at the version
 currently in unstable, making it the only package of any substance which
 does so.  The gcc-2.95 package itself is RC-buggy, failing to build with the
 current version of make; since there has been no interest expressed in
 fixing this bug by the maintainer, the likely outcome is that gcc-2.95 will
 be dropped from etch, leaving sparc without a releasable bootloader.
 
 There are two possible solutions:
 
 - silo gets updated to use a more recent compiler, dropping this build-dep
 - someone adopts gcc-2.95, fixing the FTBFS, and maintaining it for etch

Just change the build-dep, it should be needed anymore. If it's
hardcoded in the makefile, change that too.

-- 
Ubuntu - http://www.ubuntu.com/
Debian - http://www.debian.org/
Linux 1394 - http://www.linux1394.org/
SwissDisk  - http://www.swissdisk.com/



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]