Tags 439142 pending Thanks Hi!
I have prepared an NMU of wondershaper, that fixes 4 of the current bugs in
the package, one of them being RC (439142).
This is the changelog entry I've added for the work I've done:
wondershaper (1.1a-4.1) unstable; urgency=low
* Non-maintainer upload to make the package Policy compliant.
* Changed wshaper binary from /sbin to /usr/sbin. Thanks to Bernd
Zeimetz for the patch. Added NEWS.Debian about the change.
(Closes: #439142)
* Removed /usr/bin from the debian/dirs file, as it was unneeded.
* Fixed bashisms in wshaper binary. Thanks to Maximilian Attems for
the patch. (Closes: #292123, #271512)
* Fixed the pointers to the docs to say README.Debian.gz instead of
README.Debian. (Closes: #286052)
-- Margarita Manterola <[EMAIL PROTECTED]> Thu, 30 Aug 2007 13:36:09 -0300
I'm attaching the full interdiff output of the changes made.
Since this is a big change, and the RC bug is itself new, I'll be uploading
to the 10-day DELAYED queue. This means that the NMUed package should
enter sid around Sunday September 9th.
--
Love,
Maggie.
diff -u wondershaper-1.1a/wshaper wondershaper-1.1a/wshaper --- wondershaper-1.1a/wshaper +++ wondershaper-1.1a/wshaper @@ -4,28 +4,28 @@ # Modifications by Vince Mulhollon for debian package -if [ $# == 0 ]; then +if [ $# -eq 0 ]; then echo Please read the man page for the wondershaper and - echo the file /usr/share/doc/wondershaper/README.Debian + echo the file /usr/share/doc/wondershaper/README.Debian.gz exit fi -if [ $# == 1 ]; then +if [ $# -eq 1 ]; then tc -s qdisc ls dev $1 tc -s class ls dev $1 exit fi -if [ $# == 2 ]; then +if [ $# -eq 2 ]; then tc qdisc del dev $2 root 2> /dev/null > /dev/null tc qdisc del dev $2 ingress 2> /dev/null > /dev/null echo Wondershaper queues have been cleared. exit fi -if [ $# != 3 ]; then +if [ $# -ne 3 ]; then echo Please read the man page for the wondershaper and - echo the file /usr/share/doc/wondershaper/README.Debian + echo the file /usr/share/doc/wondershaper/README.Debian.gz exit fi diff -u wondershaper-1.1a/debian/changelog wondershaper-1.1a/debian/changelog --- wondershaper-1.1a/debian/changelog +++ wondershaper-1.1a/debian/changelog @@ -1,3 +1,17 @@ +wondershaper (1.1a-4.1) unstable; urgency=low + + * Non-maintainer upload to make the package Policy compliant. + * Changed wshaper binary from /sbin to /usr/sbin. Thanks to Bernd + Zeimetz for the patch. Added NEWS.Debian about the change. + (Closes: #439142) + * Removed /usr/bin from the debian/dirs file, as it was unneeded. + * Fixed bashisms in wshaper binary. Thanks to Maximilian Attems for + the patch. (Closes: #292123, #271512) + * Fixed the pointers to the docs to say README.Debian.gz instead of + README.Debian. (Closes: #286052) + + -- Margarita Manterola <[EMAIL PROTECTED]> Thu, 30 Aug 2007 13:36:09 -0300 + wondershaper (1.1a-4) unstable; urgency=low * Patched to remove the bash-isms, works with bash and dash diff -u wondershaper-1.1a/debian/dirs wondershaper-1.1a/debian/dirs --- wondershaper-1.1a/debian/dirs +++ wondershaper-1.1a/debian/dirs @@ -1,2 +1 @@ -usr/bin usr/sbin diff -u wondershaper-1.1a/debian/rules wondershaper-1.1a/debian/rules --- wondershaper-1.1a/debian/rules +++ wondershaper-1.1a/debian/rules @@ -57,8 +57,7 @@ # Add here commands to install the package into debian/wondershaper. #$(MAKE) install DESTDIR=$(CURDIR)/debian/wondershaper - mkdir $(CURDIR)/debian/wondershaper/sbin - cp wshaper $(CURDIR)/debian/wondershaper/sbin/wondershaper + cp wshaper $(CURDIR)/debian/wondershaper/usr/sbin/wondershaper # Build architecture-independent files here. diff -u wondershaper-1.1a/debian/wondershaper.8 wondershaper-1.1a/debian/wondershaper.8 --- wondershaper-1.1a/debian/wondershaper.8 +++ wondershaper-1.1a/debian/wondershaper.8 @@ -60,7 +60,7 @@ .br The programs are documented fully by: .PP -/usr/share/doc/wondershaper/README.Debian +/usr/share/doc/wondershaper/README.Debian.gz .PP /usr/share/doc/wondershaper/README.gz .SH AUTHOR only in patch2: unchanged: --- wondershaper-1.1a.orig/debian/NEWS +++ wondershaper-1.1a/debian/NEWS @@ -0,0 +1,7 @@ +wondershaper (1.1a-4.1) unstable; urgency=low + + The wshaper command has been relocated from /sbin to /usr/sbin, in order + to comply with Debian Policy. Please update any scripts you might have + pointing to the old location. + + -- Margarita Manterola <[EMAIL PROTECTED]> Thu, 30 Aug 2007 13:31:30 -0300
signature.asc
Description: Digital signature
