Bug#630201: transition: liblzma 5

[Jonathan Nieder]

Package: release.debian.org
User: release.debian@packages.debian.org
Usertags: transition

Hi,

I would like to upload liblzma5 to unstable, so liblzma in wheezy can
match the upstream ABI.

Relative to what's currently in sid, this involves a soname bump
(2 → 5), introduction of versioned symbols, and some changes to the
padding at the end of structs.  liblzma never looks at this padding
so even by simulating the worst case (liblzma2 and liblzma5 being
indirect dependencies of a single binary through different paths,
resulting in the two versions sharing a process image) I haven't been
able to make it cause any trouble for partial upgrades.  And I'm not
aware of any packages that would trigger that worst case.

You can find a liblzma5 package to test with at

 git://git.debian.org/collab-maint/xz.git experimental
 
http://mentors.debian.org/debian/pool/main/x/xz-utils/xz-utils_5.1.1alpha+20110528-1~exp1.dsc

The packaging takes the latest upstream version and reverts changes
that introduced new ABI since the last stable upstream release.  It is
targetted at experimental and might be uploaded there soon.

apt-cache points me to 14 binary reverse-dependencies counting each
source package once[1], aside from xz-utils itself.  From a transition
coordination perspective, probably shogun, R, and KDE are the most
notable ones.

This is not urgent.  I just would be happy to get it done so it
doesn't have to happen later.  Thoughts of all kinds welcome, of
course.

Regards,
Jonathan

[1]
* shogun:
 shogun-r
 shogun-python-modular
 shogun-python
 shogun-octave-modular
 shogun-elwms
 shogun-cmdline
 libshogun9
 libshogunui6

* python-lzma:
 python-lzma-dbg
 python-lzma

* libarchive:
 libarchive1
 bsdtar
 bsdcpio

* miscellaneous:
 r-base-core
 libkdecore5
 libyelp0
 squashfs-tools
 mupen64plus
 gtkwave
 fusecompress
 fsarchiver
 libdw1 (DWARF parser for elfutils)
 apt-cacher-ng
 librpmio2



--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110612095655.GA22351@elie

Processed: tagging 630143

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> tags 630143 + pending
Bug #630143 [release.debian.org] pu: package 
xserver-xorg-video-tseng/1:1.2.3-2+squeeze1
Added tag(s) pending.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
630143: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630143
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.c.130788088629929.transcr...@bugs.debian.org

NEW changes in proposedupdates

[Debian FTP Masters]

Processing changes file: xserver-xorg-video-tseng_1.2.3-2+squeeze1_amd64.changes
  ACCEPT
Processing changes file: puppet_2.6.2-5_amd64.changes
  ACCEPT


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qvl7p-0008a6...@franck.debian.org

Bug#626842: pu: package kde4libs/4:4.4.5-2+squeeze2

[Adam D. Barratt]

tag 626842 + squeeze confirmed
thanks

On Sun, 2011-05-15 at 23:12 +0300, Modestas Vainius wrote:
> The upload would fix 3 CVEs and bug #612675. Change-by-change details are 
> below
> while full diff is attached.

Please go ahead; sorry for the delay.

Regards,

Adam




-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/1307894052.15770.18.ca...@hathi.jungle.funky-badger.org

Processed: Re: Bug#626842: pu: package kde4libs/4:4.4.5-2+squeeze2

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> tag 626842 + squeeze confirmed
Bug #626842 [release.debian.org] pu: package kde4libs/4:4.4.5-2+squeeze2
Added tag(s) squeeze and confirmed.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
626842: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626842
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.c.13078940763732.transcr...@bugs.debian.org

Bug#624647: pu: package akonadi/1.3.1-3+squeeze1

[Adam D. Barratt]

tag 624647 + squeeze moreinfo
thanks

On Sat, 2011-04-30 at 13:17 +0300, Modestas Vainius wrote:
> Please consider accepting the patch fixing #545139 [1] to squeeze (full 
> debdiff
> is below). It can be considered as regression from lenny (KDE 3) since kmail
> used to work fine when HOME was mounted to the network filesystem. Since KDE 
> SC
> 4.4, akonadi-server is essential daemon for kmail (and other KDE Personal
> Information Management applications) to work.
> 
> The patch addresses the issue that sockets cannot be created on the network
> filesystems. akonadi before this patch is only capable of creating a socket in
> the subdirectory of HOME. With this patch applied, it will safely create the
> socket in /tmp if it can't do this directly in HOME.

Apologies for the delay in getting back to you.  I did have one quick
query on the diff, as I couldn't immediately see how the below hunk
relates to the socket location:

+--- akonadi-1.3.1.orig/server/src/storage/dbconfig.cpp
 akonadi-1.3.1/server/src/storage/dbconfig.cpp
[...]
+@@ -142,7 +143,7 @@
+ 
+   // verify settings and apply permanent changes (written out below)
+   if ( mDriverName == QLatin1String( "QMYSQL" ) ) {
+-if ( mInternalServer && mConnectionOptions.isEmpty() )
++if ( mInternalServer /* && mConnectionOptions.isEmpty() */ )
+   mConnectionOptions = defaultOptions;
+ if ( mInternalServer && (mServerPath.isEmpty() || 
!QFile::exists(mServerPath) ) )
+   mServerPath = defaultServerPath;

Regards,

Adam




-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/1307894775.15770.23.ca...@hathi.jungle.funky-badger.org

Processed: Re: Bug#624647: pu: package akonadi/1.3.1-3+squeeze1

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> tag 624647 + squeeze moreinfo
Bug #624647 [release.debian.org] pu: package akonadi/1.3.1-3+squeeze1
Added tag(s) squeeze and moreinfo.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
624647: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624647
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.c.13078947955659.transcr...@bugs.debian.org

Re: grub2 update to squeeze?

[Adam D. Barratt]

On Sat, 2011-06-11 at 22:33 +0100, Colin Watson wrote:
> I'm considering a grub2 update to squeeze to fix a handful of important
> bugs.  I'll try to secure as much testing as I reasonably can before
> upload, but before I start that work I'd like to know whether the SRMs
> feel that this set of changes is in general terms likely to be accepted.

Thanks for working on this.

> The Xen fix is in my opinion the most important one here, but I've had
> various requests for these RAID fixes too.

The diff looks okay; thanks.  Looking at the bug logs, it appears that
these two changes are currently unfixed in unstable:

> +- Handle Xen split-partition disk image devices (closes: 601974).
> +- Check RAID superblock offset (closes: #610184).

Is that correct?  Having the patches applied and verified in unstable is
usually a pre-requisite to applying them to stable.

Regards,

Adam


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/1307895332.15770.27.ca...@hathi.jungle.funky-badger.org

Bug#629953: pu: package sun-java6/6.26-0squeeze1

[Adam D. Barratt]

tag 629953 + squeeze confirmed
thanks

On Thu, 2011-06-09 at 22:27 +0200, Torsten Werner wrote:
> Oracle has updated the security baseline to 6.26 and that means we should 
> update
> the package in stable and oldstable. They plan to do such updates every 3 or 4
> months from now on. I've prepared an updated package at
>  based on Sylvestre's work for 
> unstable.

With the usual caveat regarding testing of the packages in an
appropriate environment, please go ahead.

Regards,

Adam




-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/1307895471.15770.29.ca...@hathi.jungle.funky-badger.org

Bug#629989: opu: package sun-java6/6-26-0lenny1

[Adam D. Barratt]

usertag 629989 + lenny confirmed
thanks

On Fri, 2011-06-10 at 06:50 +0200, Torsten Werner wrote:
> Oracle has updated the security baseline to 6.26 and that means we should 
> update
> the package in stable and oldstable. They plan to do such updates every 3 or 4
> months from now on. I've prepared an updated package at
>  based on Sylvestre's work for 
> unstable.

With the usual caveat regarding testing of the packages in an
appropriate environment, please go ahead.

Regards,

Adam




-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/1307895426.15770.28.ca...@hathi.jungle.funky-badger.org

Processed: Re: Bug#629953: pu: package sun-java6/6.26-0squeeze1

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> tag 629953 + squeeze confirmed
Bug #629953 [release.debian.org] pu: package sun-java6/6.26-0squeeze1
Added tag(s) squeeze and confirmed.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
629953: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629953
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.c.13078954927594.transcr...@bugs.debian.org

Processed: tagging 629989

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> tags 629989 + lenny confirmed
Bug #629989 [release.debian.org] opu: package sun-java6/6-26-0lenny1
Added tag(s) confirmed and lenny.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
629989: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629989
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.c.13078957638103.transcr...@bugs.debian.org

Bug#630251: patch for proposed updates / rdesktop sometimes fails to transfer files from win2k8

[Andreas Barth]

Package: release.debian.org

Hi,

some programms make rdesktop to fail to keep up the directory
forwarding to an win 2k8-server. Please see
http://sourceforge.net/tracker/?func=detail&aid=2812158&group_id=24366&atid=381349
for the bug, the fix is as follows:

--- rdesktop-1.6.0.orig/disk.c  2009-06-19 09:06:27.0 -0400
+++ rdesktop-1.6.0/disk.c   2009-06-25 09:40:44.0 -0400
@@ -1096,10 +1101,24 @@
rdp_out_unistr(out, fsinfo->type, 2 * 
strlen(fsinfo->type) - 2);
break;
 
+   /* JMD 20090623: Needed for Windows 2008 support
+  
http://msdn.microsoft.com/en-us/library/cc232104(PROT.13).aspx
+  IRP Query Volume Information class: 0x07 */
+   case FileFsFullSizeInformation:
+   printf("Called FileFsFullSizeInformation\n");
+   out_uint32_le(out, stat_fs.f_blocks);   /* 
TotalAllocationUnits */
+   out_uint32_le(out, 0);  
+   out_uint32_le(out, stat_fs.f_bavail);   /* 
CallerAvailableAllocationUnits */
+   out_uint32_le(out, 0);  
+   out_uint32_le(out, stat_fs.f_bfree);/* 
ActualAvailableAllocationUnits */
+   out_uint32_le(out, 0);  
+   out_uint32_le(out, stat_fs.f_bsize / 0x200);/* 
SectorsPerAllocationUnit */
+   out_uint32_le(out, 0x200);  /* Bytes per sector */
+   break;
+
case FileFsLabelInformation:
case FileFsDeviceInformation:
case FileFsControlInformation:
-   case FileFsFullSizeInformation:
case FileFsObjectIdInformation:
case FileFsMaximumInformation:
 

Is this correct? If so, I'd prepare and upload an appropriate new
version to stable (oldstable has the same bug, and I'm happy to fix it
there too, but actually the current stable version just has bug fixes
compared to oldstable, so that the new stable version should be
backported to olstable in that case).


Andi



-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110612180902.gi2...@mails.so.argh.org

Re: Please unblock bogl

[Julien Cristau]

.


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110612191619.ga2...@radis.liafa.jussieu.fr

Processed: block 622363 with 630259 630260 630261 630262 630263 630264 630265 630266 630267 630268 630269 630270 630271 630272 630273 630274 630275 630276 630277 630278 630279 630280 630281 630282 630

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> block 622363 with 630259 630260 630261 630262 630263 630264 630265 630266 
> 630267 630268 630269 630270 630271 630272 630273 630274 630275 630276 630277 
> 630278 630279 630280 630281 630282 630283 630284 630285 630286 630287 630288 
> 630289 630290 630291 630292 630293 630294 630295 630296 630297 630298 630299 
> 630300 630301 630302 630303 630304 630305 630306 630307 630308 630309 630310 
> 630311 630312
Bug #622363 [release.debian.org] transition: libnotify 0.7
Was blocked by: 619874
Added blocking bug(s) of 622363: 630300, 630266, 630281, 630294, 630265, 
630302, 630312, 630283, 630277, 630307, 630279, 630295, 630298, 630289, 630264, 
630311, 630278, 630272, 630263, 630287, 630276, 630303, 630286, 630305, 630309, 
630280, 630260, 630259, 630284, 630310, 630261, 630273, 630291, 630293, 630282, 
630262, 630275, 630301, 630267, 630285, 630304, 630292, 630288, 630297, 630306, 
630290, 630269, 630308, 630271, 630296, 630274, 630299, 630268, and 630270
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
622363: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622363
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.c.130790825212479.transcr...@bugs.debian.org

Processed: <>

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> block 630275 with 622363
Bug #630275 [src:gnome-packagekit] gnome-packagekit: Please transition to 
libnotify 0.7
Was not blocked by any bugs.
Added blocking bug(s) of 630275: 622363
>
End of message, stopping processing here.

Please contact me if you need assistance.
-- 
630275: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630275
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.c.130790851913469.transcr...@bugs.debian.org

Bug#619850: pu: package iceowl/1.0~b1+dfsg2-2.squeeze1.diff

[Guido Günther]

On Wed, Jun 08, 2011 at 07:56:00PM +0100, Adam D. Barratt wrote:
> On Tue, 2011-06-07 at 09:25 +0200, Guido Günther wrote:
> > On Sun, May 08, 2011 at 02:35:19PM +0200, Guido Günther wrote:
> > > On Sat, Apr 30, 2011 at 04:57:53PM +0100, Adam D. Barratt wrote:
> [...]
> > > > On Sun, 2011-03-27 at 22:27 +0200, Guido Günther wrote:,
> > > > > I'd like to push iceowl 1.0~b1+dfsg2-2.squeeze1 to squeeze proposed
> > > > > updates. It contains the same updates as current icedove. 
> > > > 
> > > > Presumably this now requires a further update, in light of at least
> > > > MFSA2011-12?
> > > 
> > > Indeed. I've added all the patches that got added to xulrunner and
> > > icedove recently (attached).
> > 
> > Ping. Can this be pushed to s-p-u?
> 
> I hadn't realised the above was as long ago as it was; apologies for
> that.  However, the main reason I'd left it flagged as waiting was the
> hope of a response to...
> 
> > > > I do note that the discussion before the release about updating iceowl
> > > > in stable very much implied that security updates would be pushed via
> > > > the security archive, albeit not as the security team's top priority.
> > > 
> > > The update in stable was necessary to move iceowl to the same codebase
> > > as icedove/xulrunner making it possible to reuse the patches. I'm
> > > putting the security team on cc: so we can figure out how to best get
> > > the updated iceowl versions into stable.
> 
> ... this.  There doesn't appear to have been any follow-up from the
> security team on the bug; has there been any discussion elsewhere?

Not that I know of. I think README.Debian still holds:

# There's no upstream security support for iceowl and iceowl-extension since
# lightning is still under development without an officially supported version 
by
# upstream. New lightning upstream versions add features and require new
# icedove/thunderbird versions to function.

# Therefore Debian doesn't offer official security support for this package.

Nevertheless we should fix what is easily fixable.
Cheers,
 -- Guido



--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110612201104.gb24...@bogon.sigxcpu.org

Bug#624647: pu: package akonadi/1.3.1-3+squeeze1

[Ansgar Burchardt]

Hi,

"Adam D. Barratt"  writes:
> Apologies for the delay in getting back to you.  I did have one quick
> query on the diff, as I couldn't immediately see how the below hunk
> relates to the socket location:
>
> +--- akonadi-1.3.1.orig/server/src/storage/dbconfig.cpp
>  akonadi-1.3.1/server/src/storage/dbconfig.cpp
> [...]
> +@@ -142,7 +143,7 @@
> + 
> +   // verify settings and apply permanent changes (written out below)
> +   if ( mDriverName == QLatin1String( "QMYSQL" ) ) {
> +-if ( mInternalServer && mConnectionOptions.isEmpty() )
> ++if ( mInternalServer /* && mConnectionOptions.isEmpty() */ )
> +   mConnectionOptions = defaultOptions;
> + if ( mInternalServer && (mServerPath.isEmpty() || 
> !QFile::exists(mServerPath) ) )
> +   mServerPath = defaultServerPath;

This makes akonadi ignore the QMYSQL/Options setting from
~/.config/akonadi/akonadiserverrc.  This was necessary as this contains
the path for the socket which this patch changes.

There is another possible issue with the patch: after an upgrade the
user might have to restart all processes using akonadi (including the
backend) as new processes will no longer use the old socket and thus
fail.  There has been one report for upgrading to akonadi 1.3.1-4 in
testing that looked like this[1], but the submitter said it happened
only after restarting the computer (which should not happen).

I haven't tested this as the old version does not work at all where I
wrote the patch (and the upgrading case was less important before
squeeze was released).  In any case this will also happen during the
upgrade from squeeze to wheezy as upstream adopted the patch.

For a stable update, we might still want to add another patch to look in
the old locations as well.  I can try to do this next week, but I don't
think it will get as much testing (and I am unfamiliar with Qt/KDE).

Regards,
Ansgar

[1] 



-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87k4cq3h3x@marvin.43-1.org

ifupdown-extra upload to stable-proposed-updates

[Javier Fernández-Sanguino Peña]

Dear Release Team,

I would like to make an upload to stable in order to fix some bugs in
ifupdown-extra which were not detected and fixed in time for the Squeeze
release. 

Please find attached the full patch between this new package version and the
version 0.14 currently in Squeeze with my proposed changes. A summary of them 
is:

 - fixed location of the ethtool binary which changed in the ethtool package
   from lenny to squeeze
 - fix the location of the default configuration file for routes to match
   were the scripts look for it
 - fix parsing errors in the configuration file 

Without these changes some of the script tools provided in the package are
useless (due to ethtool's location change) and/or will break.

Please let me know if these changes are suitable for stable.

Regards


Javier
diff --git a/debian/.changelog.swp b/debian/.changelog.swp
deleted file mode 100644
index a118be8..000
Binary files a/debian/.changelog.swp and /dev/null differ
diff --git a/debian/changelog b/debian/changelog
index d894404..840cd9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+ifupdown-extra (0.14.1) stable; urgency=low
+
+  [ Fold important bug fixes included in 0.15 and later ]
+  * if-up-scripts/check-duplicate-ip: 
+ - Location of ethtool has changed: adjust to the new location but fallback
+   to the old one if it is still there.
+  * if-up-scripts/check-network-cable: Location of ethtool has changed,
+adjust to the new location but fallback to the old one if it is
+still there.
+  * if-up-scripts/static-routes: 
+  - Fix typo that prevent the script from adding routes as it expected them
+to have 'reject' when they shouldn't. Thanks to Mathieu Parent and
+to Petru Ratiu for the patches. (Closes: #613632, #458395) (LP: #631533)
+  * scripts/network-test: 
+  - Fix call to mktemp to use --tmpdir so that the script does not break if
+run in a non-writable directory (Closes: #541619)
+  * debian/ifupdown-extra.preinst: Rename the /etc/network/network-routes
+config file to /etc/network/routes (Closes: #611982)
+  * debian/rules: 
+  - Fix installation of the network-routes sample configuration file so
+that it is installed where it should be (/etc/network/routes instead of
+/etc/network/network-routes) (Closes: #611982)
+
+ -- Javier Fernandez-Sanguino Pen~a   Sun, 12 Jun 2011 22:29:22 +0200
+
 ifupdown-extra (0.14) unstable; urgency=low
 
   * Apply a patch provided by Guillem Jover to make check-duplicate-ip work
diff --git a/debian/ifupdown-extra.preinst b/debian/ifupdown-extra.preinst
new file mode 100644
index 000..3752362
--- /dev/null
+++ b/debian/ifupdown-extra.preinst
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+
+case "$1" in
+  install|upgrade)
+if [ -e /etc/network/network-routes ] ; then
+# There was a bug in the package (<= 0.14). We need to
+# move the file to the new location
+mv /etc/network/network-routes /etc/network/routes
+fi
+  ;;
+esac
+
+
+
+
+# vim:tabstop=2:expandtab:shiftwidth=2
diff --git a/debian/network-routes b/debian/network-routes
index 8c8758b..bca5fab 100644
--- a/debian/network-routes
+++ b/debian/network-routes
@@ -1,8 +1,9 @@
-# This configuration file is read by the static-routes script
-# to setup a list of gateways for a given interface.
+# This configuration file is read by the static-routes if-updown script
+# to setup a list of routes associated either with a given interface or global
+# routes.
 #
-# DO NOT configure default gateway routes here, they should be configured
-# in the /etc/network/interfaces ('gateway' option) instead
+# DO NOT configure default gateway routes for interfaces here, they should be
+# configured in the /etc/network/interfaces ('gateway' option) instead
 #
 # This file includes a list of routes for different networks following
 # the format: # Network Netmask Gateway Interface
diff --git a/debian/rules b/debian/rules
index 1488b63..0ef1726 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 	# Configuration files
-	install -m644 debian/network-routes  $(CURDIR)/debian/ifupdown-extra/etc/network/network-routes
+	install -m644 debian/network-routes  $(CURDIR)/debian/ifupdown-extra/etc/network/routes
 	install -m644 debian/network-test-default  $(CURDIR)/debian/ifupdown-extra/etc/default/network-test
 	# Network scripts for ifupdown
 	install -m755 if-up-scripts/check-network-cable  $(CURDIR)/debian/ifupdown-extra/etc/network/if-pre-up.d/00check-network-cable
diff --git a/if-up-scripts/check-duplicate-ip b/if-up-scripts/check-duplicate-ip
index b59032b..d48eea6 100755
--- a/if-up-scripts/check-duplicate-ip
+++ b/if-up-scripts/check-duplicate-ip
@@ -37,7 +37,8 @@
 
 # Defaults
 ARPING=/usr/bin/arping
-ETHTOOL=/usr/sbin/ethtool
+ETHTOOL=/sbin/ethtool
+[ ! -x "$ETHTOOL" ] && [ -x "/usr/sbin/ethtool" ] && ETHTOOL=/usr/sbin/ethtool
 ARP_COUNT=${ARP_COUNT:-2}
 ARP_TI

NEW changes in proposedupdates

[Debian FTP Masters]

Processing changes file: fex_20100208+debian1-1+squeeze1_i386.changes
  ACCEPT


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qvwme-0003cp...@franck.debian.org