[kernel] r10679 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . po

[Frederik Schüler]

Author: fs
Date: Sat Mar  1 00:14:57 2008
New Revision: 10679

Log:
New snapshot, switched to git (cvs is discontinued)
Merged rewritten package descriptions and debconf templates, thanks to 
Christian Perrier


Added:
   dists/trunk/redhat-cluster/redhat-cluster/debian/po/cs.po
   dists/trunk/redhat-cluster/redhat-cluster/debian/po/de.po
   dists/trunk/redhat-cluster/redhat-cluster/debian/po/fi.po
   dists/trunk/redhat-cluster/redhat-cluster/debian/po/fr.po
   dists/trunk/redhat-cluster/redhat-cluster/debian/po/gl.po
   dists/trunk/redhat-cluster/redhat-cluster/debian/po/it.po
   dists/trunk/redhat-cluster/redhat-cluster/debian/po/ja.po
   dists/trunk/redhat-cluster/redhat-cluster/debian/po/nb.po
   dists/trunk/redhat-cluster/redhat-cluster/debian/po/nl.po
   dists/trunk/redhat-cluster/redhat-cluster/debian/po/pt.po
   dists/trunk/redhat-cluster/redhat-cluster/debian/po/ru.po
   dists/trunk/redhat-cluster/redhat-cluster/debian/po/vi.po
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates
   dists/trunk/redhat-cluster/redhat-cluster/debian/control
   dists/trunk/redhat-cluster/redhat-cluster/debian/po/templates.pot

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Sat Mar  1 
00:14:57 2008
@@ -1,3 +1,31 @@
+redhat-cluster (2.20080229-1) unstable; urgency=low
+
+  [ Christian Perrier ]  
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+english team as part of the Smith review project.
+Closes: #461839, #462802
+  * [Debconf translation updates]
+  * German. Closes: #462787
+  * German. Closes: #462801
+  * Norwegian Bokmål. Closes: #462812
+  * Vietnamese. Closes: #462913
+  * Galician. Closes: #462999
+  * Portuguese. Closes: #463012
+  * Finnish. Closes: #463946
+  * Czech. Closes: #464039
+  * Dutch. Closes: #464536
+  * Russian. Closes: #464758
+  * Japanese. Closes: #464870
+  * Italian. Closes: #465070
+  * French. Closes: #465553
+
+  [ Frederik Schüler ]
+  * New upstream snapshot.
+- switch to git, branch STABLE2.
+- fix gfs2_tool gettune. Closes: #465790
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Fri, 29 Feb 2008 17:33:43 +0100
+
 redhat-cluster (2.20080212-1) unstable; urgency=low
 
   * New upstream CVS snapshot.

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates 
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates Sat Mar 
 1 00:14:57 2008
@@ -1,14 +1,20 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# [EMAIL PROTECTED] for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
 Template: cman/upgrade-warning
 Type: boolean
 Default: false
-_Description: Do you want to abort now?
- The new version 2.0 of the Red Hat Cluster Suite is not compatible with 
- the currently installed one. Upgrading these packages without stopping 
- the complete cluster can cause filesystem corruption on shared storage 
+_Description: Abort the potentially disruptive upgrade of Red Hat Cluster 
Suite?
+ The new version 2.0 of the Red Hat Cluster Suite is not compatible with
+ the currently installed one. Upgrading these packages without stopping
+ the complete cluster can cause file system corruption on shared storage
  devices.
  .
  For instructions on how to safely upgrade the Red Hat Cluster Suite to
- version 2.0, please refer to the following document:
- .
- http://wiki.debian.org/UpgradeRHCSV1toV2
- .
+ version 2.0, please refer to 'http://wiki.debian.org/UpgradeRHCSV1toV2'.

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlSat Mar  1 
00:14:57 2008
@@ -4,7 +4,7 @@
 Maintainer: Debian Kernel Team [EMAIL PROTECTED]
 Uploaders: Bastian Blank [EMAIL PROTECTED], Frederik Schüler [EMAIL 
PROTECTED]
 Standards-Version: 3.7.3.0
-Build-Depends: dpatch, debhelper (= 4.2.28), libxml2-dev, libncurses5-dev, 
libopenais-dev (= 0.82-2), libvolume-id-dev (=  0.105-4), linux-libc-dev (= 
2.6.24-1), libvirt-dev (= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], 
libnspr4-dev [amd64 i386], bzip2, libslang2-dev
+Build-Depends: dpatch, debhelper (= 4.2.28), libxml2-dev, libncurses5-dev, 
libopenais-dev (= 0.82-2), libvolume-id-dev (=  0.105-4), linux-libc-dev

[kernel] r10526 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . patches

[Frederik Schüler]

Author: fs
Date: Tue Feb 12 21:58:58 2008
New Revision: 10526

Log:
New upstream CVS snapshot.
Merge changes from Ubuntu:
- debian/copyright: add copyright info and shut up lintian a bit.
- link mount.gfs man page to mount.gfs2.
- debian/rules: fix order of dh_ to get library dh snippets in place.
- debian/TODO list.
- drop unrequired maintainer scripts.
- debian/control: fix libdlm-dev depends.



Added:
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
Removed:
   dists/trunk/redhat-cluster/redhat-cluster/debian/libcman2.postinst
   dists/trunk/redhat-cluster/redhat-cluster/debian/libdlm2.postinst
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/control
   dists/trunk/redhat-cluster/redhat-cluster/debian/copyright
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.links
   dists/trunk/redhat-cluster/redhat-cluster/debian/rules

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   Tue Feb 12 
21:58:58 2008
@@ -1,3 +1,7 @@
+Merge cman.init changes from upstream to handle xen.
+Review *.init. 
+check scsi_reserve stuff
+
 Open packaging issues
 
 
@@ -22,7 +26,6 @@
 W: gfs2-tools: binary-without-manpage usr/sbin/umount.gfs2
 W: gfs-tools: binary-without-manpage usr/sbin/gfs_debug
 W: gfs-tools: binary-without-manpage usr/sbin/gfs_edit
-W: gfs-tools: binary-without-manpage sbin/mount.gfs
 W: gfs-tools: binary-without-manpage sbin/umount.gfs
 W: cman: binary-without-manpage usr/sbin/fence_baytech
 W: cman: binary-without-manpage usr/sbin/fence_cpint

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Tue Feb 12 
21:58:58 2008
@@ -1,3 +1,16 @@
+redhat-cluster (2.20080212-1) unstable; urgency=low
+
+  * New upstream CVS snapshot.
+  * Merge changes from Ubuntu:
+- debian/copyright: add copyright info and shut up lintian a bit.
+- link mount.gfs man page to mount.gfs2.
+- debian/rules: fix order of dh_ to get library dh snippets in place.
+- debian/TODO list.
+- drop unrequired maintainer scripts.
+- debian/control: fix libdlm-dev depends.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Tue, 12 Feb 2008 22:46:46 +0100
+
 redhat-cluster (2.20080208-2) unstable; urgency=low
 
   * Update linux-libc-dev build dependency to version 2.6.24-1, this should

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlTue Feb 12 
21:58:58 2008
@@ -4,7 +4,7 @@
 Maintainer: Debian Kernel Team [EMAIL PROTECTED]
 Uploaders: Bastian Blank [EMAIL PROTECTED], Frederik Schüler [EMAIL 
PROTECTED]
 Standards-Version: 3.7.3.0
-Build-Depends: debhelper (= 4.2.28), libxml2-dev, libncurses5-dev, 
libopenais-dev (= 0.82-2), libvolume-id-dev (=  0.105-4), linux-libc-dev (= 
2.6.24-1), libvirt-dev (= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], 
libnspr4-dev [amd64 i386], bzip2, libslang2-dev
+Build-Depends: dpatch, debhelper (= 4.2.28), libxml2-dev, libncurses5-dev, 
libopenais-dev (= 0.82-2), libvolume-id-dev (=  0.105-4), linux-libc-dev (= 
2.6.24-1), libvirt-dev (= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], 
libnspr4-dev [amd64 i386], bzip2, libslang2-dev
 Build-Conflicts: libccs-dev, libcman-dev (= 2.0), libdlm-dev (= 2.0), 
libcman2, libdlm2
 
 Package: redhat-cluster-suite
@@ -65,7 +65,7 @@
 Package: libdlm-dev
 Section: libdevel
 Architecture: any
-Depends: libdlm2 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libdlm2 (= ${binary:Version})
 Description: distributed lock manager - development files
  DLM is a symmetric general-purpose distributed lock manager. It is
  used for example by GFS and the distributed volume manager.

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/copyright
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/copyright  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/copyright  Tue Feb 12 
21:58:58 2008
@@ -18,6 +18,26 @@
 
 Based on a CVS snapshot from the Ubuntu packages archive.
 
+Upstream carries tons of copyrights from several sources. Each specific 
+source file has its own copyright header with very detailed information. 
+Here is a quick summary

[kernel] r10434 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . patches

[Frederik Schüler]

Author: fs
Date: Fri Feb  8 10:34:39 2008
New Revision: 10434

Log:
drop previously added, empty patches dir
prepare for release


Removed:
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Fri Feb  8 
10:34:39 2008
@@ -1,9 +1,10 @@
 redhat-cluster (2.20080208-1) unstable; urgency=low
 
+  * New upstream snapshot.
   * Fix bashism in cman init script. Closes: #464634
   * Fix redhat-cluster-source FTBFS. Closes: #464117
 
- -- Frederik Schüler [EMAIL PROTECTED]  Fri, 08 Feb 2008 11:30:50 +0100
+ -- Frederik Schüler [EMAIL PROTECTED]  Fri, 08 Feb 2008 11:33:43 +0100
 
 redhat-cluster (2.20080205-1) unstable; urgency=low
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r10433 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . patches

[Frederik Schüler]

Author: fs
Date: Fri Feb  8 10:31:55 2008
New Revision: 10433

Log:
Fix bashism in cman init script. Closes: #464634
Fix redhat-cluster-source FTBFS. Closes: #464117



Added:
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init
   
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.Makefile

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Fri Feb  8 
10:31:55 2008
@@ -1,3 +1,10 @@
+redhat-cluster (2.20080208-1) unstable; urgency=low
+
+  * Fix bashism in cman init script. Closes: #464634
+  * Fix redhat-cluster-source FTBFS. Closes: #464117
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Fri, 08 Feb 2008 11:30:50 +0100
+
 redhat-cluster (2.20080205-1) unstable; urgency=low
 
   * New upstream snapshot.

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init  Fri Feb  8 
10:31:55 2008
@@ -125,7 +125,7 @@
echo -n  Leaving fence domain:
fence_tool -w leave 
for sec in $(seq 1 10); do
-   if pidof fence_tool  /dev/null; then
+   if pidof fence_tool  /dev/null 21; then
if [ $sec = 10 ]; then
kill $(pidof fence_tool)  /dev/null 21
else

Modified: 
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.Makefile
==
--- 
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.Makefile 
(original)
+++ 
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.Makefile 
Fri Feb  8 10:31:55 2008
@@ -1,5 +1,5 @@
 #! /usr/bin/make -f
 
-USING_KBUILD=1
+export USING_KBUILD=1
 
 obj-m = gfs/ gnbd/

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r10440 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Fri Feb  8 18:49:29 2008
New Revision: 10440

Log:
Update linux-libc-dev build dependency to version 2.6.24-1


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/control

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Fri Feb  8 
18:49:29 2008
@@ -1,3 +1,10 @@
+redhat-cluster (2.20080208-2) unstable; urgency=low
+
+  * Update linux-libc-dev build dependency to version 2.6.24-1, this should
+fix the various FTBFS.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Fri, 08 Feb 2008 19:48:50 +0100
+
 redhat-cluster (2.20080208-1) unstable; urgency=low
 
   * New upstream snapshot.

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlFri Feb  8 
18:49:29 2008
@@ -4,7 +4,7 @@
 Maintainer: Debian Kernel Team [EMAIL PROTECTED]
 Uploaders: Bastian Blank [EMAIL PROTECTED], Frederik Schüler [EMAIL 
PROTECTED]
 Standards-Version: 3.7.3.0
-Build-Depends: debhelper (= 4.2.28), libxml2-dev, libncurses5-dev, 
libopenais-dev (= 0.82-2), libvolume-id-dev (=  0.105-4), linux-libc-dev (= 
2.6.23-1), libvirt-dev (= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], 
libnspr4-dev [amd64 i386], bzip2, libslang2-dev
+Build-Depends: debhelper (= 4.2.28), libxml2-dev, libncurses5-dev, 
libopenais-dev (= 0.82-2), libvolume-id-dev (=  0.105-4), linux-libc-dev (= 
2.6.24-1), libvirt-dev (= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], 
libnspr4-dev [amd64 i386], bzip2, libslang2-dev
 Build-Conflicts: libccs-dev, libcman-dev (= 2.0), libdlm-dev (= 2.0), 
libcman2, libdlm2
 
 Package: redhat-cluster-suite

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r10418 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . patches

[Frederik Schüler]

Author: fs
Date: Tue Feb  5 13:03:50 2008
New Revision: 10418

Log:
New upstream snapshot.
- fix build failures with 2.6.24
Add libnet-snmp-perl and libnet-telnet-perl dependency to cman, needed for some 
fencing scripts.
Merge changes from ubuntu:
- drop libcman2 and libdlm 2 postrm, this is handled by debhelper.
- Make cman init script not fail if qdiskd fails to start up
- drop 00_fix_gfs2_quota.dpatch
Fix modules/redhat-cluster/debian/rules permissions



Removed:
   dists/trunk/redhat-cluster/redhat-cluster/debian/libcman2.postrm
   dists/trunk/redhat-cluster/redhat-cluster/debian/libdlm2.postrm
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/control
   dists/trunk/redhat-cluster/redhat-cluster/debian/rules

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Tue Feb  5 
13:03:50 2008
@@ -1,9 +1,17 @@
-redhat-cluster (2.20080107-3) UNRELEASED; urgency=low
+redhat-cluster (2.20080205-1) unstable; urgency=low
 
-  * Add libnet-snmp-perl and libnet-telnet-perl dependency to cman, needed 
+  * New upstream snapshot.
+- fix build failures with 2.6.24
+  * Add libnet-snmp-perl and libnet-telnet-perl dependency to cman, needed
 for some fencing scripts.
+  * Merge changes from ubuntu:
+- drop libcman2 and libdlm 2 postrm, this is handled by
+  debhelper.
+- Make cman init script not fail if qdiskd fails to start up
+- drop 00_fix_gfs2_quota.dpatch
+  * Fix modules/redhat-cluster/debian/rules permissions
 
- -- Frederik Schüler [EMAIL PROTECTED]  Fri, 25 Jan 2008 19:17:21 +0100
+ -- Frederik Schüler [EMAIL PROTECTED]  Tue, 05 Feb 2008 13:59:43 +0100
 
 redhat-cluster (2.20080107-2) unstable; urgency=low
 

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init  Tue Feb  5 
13:03:50 2008
@@ -113,7 +113,7 @@
fence_tool -w -t $FENCED_START_TIMEOUT join
echo  done
echo -n  Starting Quorum Disk daemon:
-   start-stop-daemon --start --quiet --pidfile /var/run/qdiskd.pid --exec 
/usr/sbin/qdiskd -- -Q
+   start-stop-daemon --start --quiet --pidfile /var/run/qdiskd.pid --exec 
/usr/sbin/qdiskd -- -Q || true
echo  done
;;
   stop)

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlTue Feb  5 
13:03:50 2008
@@ -4,7 +4,7 @@
 Maintainer: Debian Kernel Team [EMAIL PROTECTED]
 Uploaders: Bastian Blank [EMAIL PROTECTED], Frederik Schüler [EMAIL 
PROTECTED]
 Standards-Version: 3.7.3.0
-Build-Depends: dpatch, debhelper (= 4.2.28), libxml2-dev, libncurses5-dev, 
libopenais-dev (= 0.82-2), libvolume-id-dev (=  0.105-4), linux-libc-dev (= 
2.6.23-1), libvirt-dev (= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], 
libnspr4-dev [amd64 i386], bzip2, libslang2-dev
+Build-Depends: debhelper (= 4.2.28), libxml2-dev, libncurses5-dev, 
libopenais-dev (= 0.82-2), libvolume-id-dev (=  0.105-4), linux-libc-dev (= 
2.6.23-1), libvirt-dev (= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], 
libnspr4-dev [amd64 i386], bzip2, libslang2-dev
 Build-Conflicts: libccs-dev, libcman-dev (= 2.0), libdlm-dev (= 2.0), 
libcman2, libdlm2
 
 Package: redhat-cluster-suite

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/rules
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/rules  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/rules  Tue Feb  5 
13:03:50 2008
@@ -3,8 +3,6 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
-
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 xen_arches = amd64 i386
@@ -17,7 +15,7 @@
 SOMAJOR=2
 SOMINOR=0
 
-configure: patch configure-stamp
+configure: configure-stamp
 configure-stamp:
dh_testdir

@@ -81,6 +79,7 @@

debian/redhat-cluster-source/usr/src/modules/redhat-cluster/debian/README.Debian
cp debian/redhat-cluster-source.rules \

debian/redhat-cluster-source/usr/src/modules/redhat-cluster/debian/rules
+   chmod 755 
debian/redhat-cluster-source/usr/src/modules/redhat-cluster/debian/rules
cp debian/redhat-cluster

[kernel] r10199 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Fri Jan 25 18:18:27 2008
New Revision: 10199

Log:
Add libnet-snmp-perl and libnet-telnet-perl dependency to cman


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/control

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Fri Jan 25 
18:18:27 2008
@@ -1,3 +1,10 @@
+redhat-cluster (2.20080107-3) UNRELEASED; urgency=low
+
+  * Add libnet-snmp-perl and libnet-telnet-perl dependency to cman, needed 
+for some fencing scripts.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Fri, 25 Jan 2008 19:17:21 +0100
+
 redhat-cluster (2.20080107-2) unstable; urgency=low
 
   * Fix mount/umount helpers installation. Thanks to 

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlFri Jan 25 
18:18:27 2008
@@ -20,7 +20,7 @@
 Architecture: any
 Section: admin
 Pre-Depends: debconf | debconf-2.0
-Depends: ${shlibs:Depends}, python, openais (= 0.82-2)
+Depends: ${shlibs:Depends}, python, openais (= 0.82-2), libnet-snmp-perl, 
libnet-telnet-perl
 Conflicts: magma, libmagma1, libmagma-dev, ccs, fence, libiddev-dev, 
fence-gnbd, gulm, libgulm1, libgulm-dev, magma-plugins
 Replaces: ccs, fence, fence-gnbd
 Description: cluster manager

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r10177 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Wed Jan 23 23:48:20 2008
New Revision: 10177

Log:
Fix mount/umount helpers installation


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.links
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.links

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Wed Jan 23 
23:48:20 2008
@@ -1,3 +1,10 @@
+redhat-cluster (2.20080107-2) unstable; urgency=low
+
+  * Fix mount/umount helpers installation. Thanks to 
+Fabio M. Di Nitto [EMAIL PROTECTED] for the patch.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Thu, 24 Jan 2008 00:37:35 +0100
+
 redhat-cluster (2.20080107-1) unstable; urgency=low
 
   * New upstream CVS snapshot.

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.links
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.links
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.linksWed Jan 
23 23:48:20 2008
@@ -1,6 +1,6 @@
 usr/sbin/gfs_fsck usr/sbin/fsck.gfs
 usr/sbin/gfs_mkfs usr/sbin/mkfs.gfs
-usr/sbin/mount.gfs2 sbin/mount.gfs
-usr/sbin/umount.gfs2 sbin/umount.gfs
+sbin/mount.gfs2 sbin/mount.gfs
+sbin/umount.gfs2 sbin/umount.gfs
 usr/share/man/man8/gfs_fsck.8.gz usr/share/man/man8/fsck.gfs.8.gz
 usr/share/man/man8/gfs_mkfs.8.gz usr/share/man/man8/mkfs.gfs.8.gz

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.links
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.links   
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.links   Wed Jan 
23 23:48:20 2008
@@ -2,10 +2,8 @@
 usr/sbin/mkfs.gfs2 usr/sbin/gfs2_mkfs
 usr/sbin/mkfs.gfs2 usr/sbin/gfs2_jadd
 usr/sbin/mkfs.gfs2 usr/sbin/gfs2_grow
-usr/sbin/mount.gfs2 usr/sbin/gfs2_mount
-usr/sbin/umount.gfs2 usr/sbin/gfs2_umount
-usr/sbin/mount.gfs2 sbin/mount.gfs2
-usr/sbin/umount.gfs2 sbin/umount.gfs2
+sbin/mount.gfs2 usr/sbin/gfs2_mount
+sbin/umount.gfs2 usr/sbin/gfs2_umount
 usr/share/man/man8/gfs2_fsck.8.gz usr/share/man/man8/fsck.gfs2.8.gz
 usr/share/man/man8/mkfs.gfs2.8.gz usr/share/man/man8/gfs2_mkfs.8.gz
 usr/share/man/man8/gfs2_mount.8.gz usr/share/man/man8/mount.gfs2.8.gz

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r10053 - in dists/trunk/linux-2.6/debian: . patches/features/all patches/series

[Frederik Schüler]

Author: fs
Date: Sun Jan  6 22:21:45 2008
New Revision: 10053

Log:
Add GFS2 locking symbols export patch.


Added:
   
dists/trunk/linux-2.6/debian/patches/features/all/export-gfs2-locking-symbols.patch
  - copied unchanged from r9917, 
/dists/sid/linux-2.6/debian/patches/features/all/export-gfs2-locking-symbols.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog  (original)
+++ dists/trunk/linux-2.6/debian/changelog  Sun Jan  6 22:21:45 2008
@@ -47,6 +47,9 @@
   [ dann frazier ]
   * [ia64]: Enable BLK_CPQ_DA
 
+  [ Frederik Schüler ]
+  * Add GFS2 locking symbols export patch.
+
  -- maximilian attems [EMAIL PROTECTED]  Sun, 06 Jan 2008 13:50:29 +0100
 
 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1Sun Jan 
 6 22:21:45 2008
@@ -8,6 +8,7 @@
 #+ debian/drivers-ata-ata_piix-postpone-pata.patch
 
 + debian/dfsg/drivers-net-tg3-fix-simple.patch
++ features/all/export-gfs2-locking-symbols.patch
 
 #+ bugfix/powerpc/build-links.patch
 #+ bugfix/powerpc/mv643xx-hotplug-support.patch

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r10059 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . patches

[Frederik Schüler]

Author: fs
Date: Sun Jan  6 23:51:04 2008
New Revision: 10059

Log:
New upstream CVS snapshot: fixes hppa FTBFS.
Drop merged patches.
Fix spelling of Linux in some descriptions.



Removed:
   
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/01_fix_gfs-kernel-makefile.dpatch
   
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/02_fix_gnbd-kernel-makefile.dpatch
   
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/03_manpages-whatis.dpatch
   
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/04_fix-lcrso-file-permissions.dpatch
   
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/05_fix-ocf-shellfuncs.dpatch
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/control
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Sun Jan  6 
23:51:04 2008
@@ -1,3 +1,12 @@
+redhat-cluster (2.20080107-1) unstable; urgency=low
+
+  * New upstream CVS snapshot.
+- fixes hppa FTBFS.
+  * Drop merged patches.
+  * Fix spelling of Linux in some descriptions.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Mon, 07 Jan 2008 00:45:58 +0100
+
 redhat-cluster (2.20071214-3) unstable; urgency=low
 
   * Build-depend on linux-libc-dev (=  2.6.23-1).

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlSun Jan  6 
23:51:04 2008
@@ -113,7 +113,7 @@
 Recommends: fence-gnbd (= ${binary:Version}), redhat-cluster-modules
 Description: global network block device - client tools
  GNBD allows to use block devices over the network. It is a modified
- version of the linux network block device for the use within a cluster
+ version of the Linux network block device for the use within a cluster
  environment.
  .
  This package contains userspace tools for running GNBD clients.
@@ -125,7 +125,7 @@
 Recommends: fence-gnbd (= ${binary:Version})
 Description: global network block device - server tools
  GNBD allows to use block devices over the network. It is a modified
- version of the linux network block device for the use within a cluster
+ version of the Linux network block device for the use within a cluster
  environment.
  .
  This package contains userspace tools for running GNBD servers.
@@ -144,4 +144,4 @@
 Description: Red Hat cluster suite - kernel modules source
  This package contains the source necessary for compiling the Red Hat
  cluster suite out-of-tree kernel modules gfs and gnbd against the 
- linux tree.
+ Linux tree.

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list 
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list Sun Jan 
 6 23:51:04 2008
@@ -1,6 +1 @@
 00_fix_gfs2_quota.dpatch
-01_fix_gfs-kernel-makefile.dpatch
-02_fix_gnbd-kernel-makefile.dpatch
-03_manpages-whatis.dpatch
-04_fix-lcrso-file-permissions.dpatch
-05_fix-ocf-shellfuncs.dpatch

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r10062 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Sun Jan  6 23:56:44 2008
New Revision: 10062

Log:
Set USING_KBUILD=1 on make clean, too


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.rules

Modified: 
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.rules
==
--- 
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.rules
(original)
+++ 
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.rules
Sun Jan  6 23:56:44 2008
@@ -11,7 +11,7 @@
 
 kdist_clean: prep-deb-files
dh_clean
-   $(MAKE) -C $(KSRC) M=$(CURDIR) clean 
+   $(MAKE) -C $(KSRC) M=$(CURDIR) clean USING_KBUILD=1
 
 kdist_config: prep-deb-files
 binary-modules: kdist_config

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r10014 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Thu Dec 27 15:12:18 2007
New Revision: 10014

Log:
Make redhat-cluster-source package Architecture: all


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/control

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Thu Dec 27 
15:12:18 2007
@@ -1,8 +1,9 @@
 redhat-cluster (2.20071214-2) unstable; urgency=low
 
   * Add muissing build-dependency on libslang2-dev.
+  * Make redhat-cluster-source package Architecture: all.
 
- -- Frederik Schüler [EMAIL PROTECTED]  Wed, 26 Dec 2007 21:16:34 +0100
+ -- Frederik Schüler [EMAIL PROTECTED]  Thu, 27 Dec 2007 16:11:39 +0100
 
 redhat-cluster (2.20071214-1) unstable; urgency=low
 

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlThu Dec 27 
15:12:18 2007
@@ -139,7 +139,7 @@
  applications in the event of planned or unplanned system downtime.
 
 Package: redhat-cluster-source
-Architecture: any
+Architecture: all
 Depends: bzip2
 Description: Red Hat cluster suite - kernel modules source
  This package contains the source necessary for compiling the Red Hat

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r10013 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Wed Dec 26 20:23:19 2007
New Revision: 10013

Log:
Add missing build dependency on libslang2-dev


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/control

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Wed Dec 26 
20:23:19 2007
@@ -1,3 +1,9 @@
+redhat-cluster (2.20071214-2) unstable; urgency=low
+
+  * Add muissing build-dependency on libslang2-dev.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Wed, 26 Dec 2007 21:16:34 +0100
+
 redhat-cluster (2.20071214-1) unstable; urgency=low
 
   * New upstream CVS snapshot, taken from Ubuntu.

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlWed Dec 26 
20:23:19 2007
@@ -4,7 +4,7 @@
 Maintainer: Debian Kernel Team [EMAIL PROTECTED]
 Uploaders: Bastian Blank [EMAIL PROTECTED], Frederik Schüler [EMAIL 
PROTECTED]
 Standards-Version: 3.7.3.0
-Build-Depends: dpatch, debhelper (= 4.2.28), libxml2-dev, libncurses5-dev, 
libopenais-dev (= 0.82-2), libvolume-id-dev (=  0.105-4), linux-libc-dev (= 
2.6.22-6), libvirt-dev (= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], 
libnspr4-dev [amd64 i386], bzip2
+Build-Depends: dpatch, debhelper (= 4.2.28), libxml2-dev, libncurses5-dev, 
libopenais-dev (= 0.82-2), libvolume-id-dev (=  0.105-4), linux-libc-dev (= 
2.6.22-6), libvirt-dev (= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], 
libnspr4-dev [amd64 i386], bzip2, libslang2-dev
 Build-Conflicts: libccs-dev, libcman-dev (= 2.0), libdlm-dev (= 2.0), 
libcman2, libdlm2
 
 Package: redhat-cluster-suite

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r10010 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . patches

[Frederik Schüler]

Author: fs
Date: Wed Dec 26 01:57:52 2007
New Revision: 10010

Log:
New upstream tarball taken from ubuntu.
Add lgpl-2.1 pointer to copyright file.
Remove csnap/doc/csnap.ps from orig tarball: missing source


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/copyright
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.install
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
   dists/trunk/redhat-cluster/redhat-cluster/debian/rules

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Wed Dec 26 
01:57:52 2007
@@ -1,3 +1,11 @@
+redhat-cluster (2.20071214-1) unstable; urgency=low
+
+  * New upstream CVS snapshot, taken from Ubuntu.
+  * Fix copyright file.
+  * Remove csnap/doc/csnap.ps from orig tarball: missing source.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Wed, 26 Dec 2007 02:53:46 +0100
+
 redhat-cluster (2.20071022-1) unstable; urgency=low
 
   * New upstream release. Closes: #426276

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/copyright
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/copyright  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/copyright  Wed Dec 26 
01:57:52 2007
@@ -18,6 +18,8 @@
 
 Based on a CVS snapshot from the Ubuntu packages archive.
 
+Most parts are licensed under the GNU GPL version 2:
+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 dated June, 1991.
@@ -29,8 +31,31 @@
 
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+On Debian systems, the complete text of the GNU General Public License 
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+
+Some parts of the fencing agents, of libgroup, libcman, qdisk and libdlm 
+are licensed under the GNU LGPL version 2.1:
+
+  The Red Hat Cluster Manager API Library is free software; you can
+  redistribute it and/or modify it under the terms of the GNU Lesser
+  General Public License as published by the Free Software Foundation;
+  either version 2.1 of the License, or (at your option) any later
+  version.
+
+  The Red Hat Cluster Manager API Library is distributed in the hope
+  that it will be useful, but WITHOUT ANY WARRANTY; without even the
+  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+On Debian systems, the complete text of the GNU Lesser Public License 
+version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
 

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.install
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.install 
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.install Wed Dec 
26 01:57:52 2007
@@ -5,8 +5,8 @@
 usr/sbin/gfs2_quota
 usr/sbin/gfs2_tool
 usr/sbin/mkfs.gfs2
-usr/sbin/mount.gfs2
-usr/sbin/umount.gfs2
+sbin/mount.gfs2
+sbin/umount.gfs2
 usr/share/man/man8/gfs2.8
 usr/share/man/man8/gfs2_convert.8
 usr/share/man/man8/gfs2_fsck.8

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list 
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list Wed Dec 
26 01:57:52 2007
@@ -2,5 +2,5 @@
 01_fix_gfs-kernel-makefile.dpatch
 02_fix_gnbd-kernel-makefile.dpatch
 03_manpages-whatis.dpatch
-04_fix-lcrso-file-permissions.dpatch
+#04_fix-lcrso-file-permissions.dpatch
 05_fix-ocf-shellfuncs.dpatch

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/rules
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/rules  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/rules  Wed Dec 26 
01:57:52 2007

[kernel] r10011 - dists/trunk/redhat-cluster/redhat-cluster/debian/patches

[Frederik Schüler]

Author: fs
Date: Wed Dec 26 02:02:47 2007
New Revision: 10011

Log:
Rediff 04_fix-lcrso-file-permissions.dpatch


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
   
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/04_fix-lcrso-file-permissions.dpatch

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list 
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list Wed Dec 
26 02:02:47 2007
@@ -2,5 +2,5 @@
 01_fix_gfs-kernel-makefile.dpatch
 02_fix_gnbd-kernel-makefile.dpatch
 03_manpages-whatis.dpatch
-#04_fix-lcrso-file-permissions.dpatch
+04_fix-lcrso-file-permissions.dpatch
 05_fix-ocf-shellfuncs.dpatch

Modified: 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/04_fix-lcrso-file-permissions.dpatch
==
--- 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/04_fix-lcrso-file-permissions.dpatch
   (original)
+++ 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/04_fix-lcrso-file-permissions.dpatch
   Wed Dec 26 02:02:47 2007
@@ -11,7 +11,7 @@
  
  install: all
install -d ${libexecdir}/lcrso
--  install -s ${TARGET} ${libexecdir}/lcrso
+-  install ${TARGET} ${libexecdir}/lcrso
 +  install -m 644 ${TARGET} ${libexecdir}/lcrso
  
  uninstall:

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r10008 - in dists/trunk/redhat-cluster/openais/debian: . patches

[Frederik Schüler]

Author: fs
Date: Mon Dec 24 22:56:48 2007
New Revision: 10008

Log:
fix hppa FTBFS
bump standards
and release


Modified:
   dists/trunk/redhat-cluster/openais/debian/changelog
   dists/trunk/redhat-cluster/openais/debian/control
   dists/trunk/redhat-cluster/openais/debian/patches/00list
   dists/trunk/redhat-cluster/openais/debian/rules

Modified: dists/trunk/redhat-cluster/openais/debian/changelog
==
--- dists/trunk/redhat-cluster/openais/debian/changelog (original)
+++ dists/trunk/redhat-cluster/openais/debian/changelog Mon Dec 24 22:56:48 2007
@@ -1,3 +1,10 @@
+openais (0.82-3) unstable; urgency=low
+
+  * Fix FTBFS on hppa.
+  * Update to new standards version.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Mon, 24 Dec 2007 23:55:27 +0100
+
 openais (0.82-2) unstable; urgency=low
 
   * Install openais/service/logsys.h

Modified: dists/trunk/redhat-cluster/openais/debian/control
==
--- dists/trunk/redhat-cluster/openais/debian/control   (original)
+++ dists/trunk/redhat-cluster/openais/debian/control   Mon Dec 24 22:56:48 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Kernel Team [EMAIL PROTECTED]
 Uploaders: Bastian Blank [EMAIL PROTECTED], Frederik Schüler [EMAIL 
PROTECTED]
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 Build-Depends: dpatch, debhelper ( 5)
 
 Package: openais

Modified: dists/trunk/redhat-cluster/openais/debian/patches/00list
==
--- dists/trunk/redhat-cluster/openais/debian/patches/00list(original)
+++ dists/trunk/redhat-cluster/openais/debian/patches/00listMon Dec 24 
22:56:48 2007
@@ -1,2 +1,3 @@
 001_makefile
 003_lcr-fixpath
+005_add_hppa_workaround.dpatch

Modified: dists/trunk/redhat-cluster/openais/debian/rules
==
--- dists/trunk/redhat-cluster/openais/debian/rules (original)
+++ dists/trunk/redhat-cluster/openais/debian/rules Mon Dec 24 22:56:48 2007
@@ -13,6 +13,8 @@
 
 setup: $(STAMPS_DIR)/setup
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
 $(STAMPS_DIR)/setup: SOURCE_FILES = $(filter-out debian, $(wildcard * .[^.]*))
 $(STAMPS_DIR)/setup: DIR = $(BUILD_DIR)/build
 $(STAMPS_DIR)/setup:
@@ -30,7 +32,11 @@
 $(STAMPS_DIR)/build: DIR = $(BUILD_DIR)/build
 $(STAMPS_DIR)/build: $(STAMPS_DIR)/setup
dh_testdir
+ifneq (,$(findstring $(DEB_HOST_ARCH), hppa))
+   $(MAKE) -C $(DIR) WORKAROUND=-O1
+else
$(MAKE) -C $(DIR)
+endif
touch $@
 
 clean:

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r10009 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Mon Dec 24 23:07:58 2007
New Revision: 10009

Log:
Prepare for release


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Mon Dec 24 
23:07:58 2007
@@ -1,4 +1,4 @@
-redhat-cluster (2.20071022-1) UNRELEASED; urgency=low
+redhat-cluster (2.20071022-1) unstable; urgency=low
 
   * New upstream release. Closes: #426276
 - Drop Magma. Closes: #374541
@@ -8,8 +8,10 @@
   * Update copyright file.
   * Fix maintainer scripts, add missing ones.
   * Fix debconf template.
-  * Add gfs-source package containing the gfs1 kernel module
-  * Provide module-assistant support in the gfs-source package.
+  * Add redhat-cluster-source package containing the gfs1 and gnbd 
+kernel modules. Closes: #401073, #426769
+  * Provide module-assistant support in the redhat-cluster-source 
+package.
 Closes: #366498, #412412
   * Fix gnbd-* packages description. Closes: #319204
   * Lots of bugs fixed:
@@ -21,9 +23,7 @@
 - Call dh_strip during install. Closes: #437899
   * Add handling for missing cluster.conf. Closes: #420229, #381434, #367370
   * Enable XEN support on amd64 too.
-  * Add gnbd kernel module source to redhat-cluster-source. 
-Closes: #401073, #426769
   * Mention gfs and gnbd kernel modules in the redhat-cluster-modules source
 and binary package descriptions. Closes: #380002
 
- -- Frederik Schüler [EMAIL PROTECTED]  Wed, 19 Dec 2007 14:39:28 +0100
+ -- Frederik Schüler [EMAIL PROTECTED]  Tue, 25 Dec 2007 00:04:53 +0100

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r10005 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Sun Dec 23 17:32:39 2007
New Revision: 10005

Log:
Fix maintianer cman scripts: bug user on upgrade from etch version


Removed:
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.config
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postinst
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postrm
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postrm
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postrm
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postrmSun Dec 
23 17:32:39 2007
@@ -8,16 +8,9 @@
. /usr/share/debconf/confmodule
db_purge
fi
-   ;;
-   
-   *)
-   echo prerm called with unknown argument \`$1' 2
-   exit 1
-   ;;
-
+   ;;
 esac
 
-
 #DEBHELPER#
 
 exit 0

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst   
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst   Sun Dec 
23 17:32:39 2007
@@ -7,10 +7,15 @@
. /usr/share/debconf/confmodule
db_version 2.0
if dpkg --compare-versions $2 lt 2.0 ; then
-   db_fset cman/upgrade-warning seen_in_2.0_upgrade false
+   db_fset cman/upgrade-warning seen false
+   db_input critical cman/upgrade-warning || true
+   db_go
+   
db_get cman/upgrade-warning
if [ $RET = false ] ; then
-   echo aborting cman installation.
+   echo Aborting cman installation.
+   echo  For upgrade instructions, please refer 
to 
+   echo http://wiki.debian.org/UpgradeRHCSV1toV2;
exit 1
fi
fi

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates 
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates Sun Dec 
23 17:32:39 2007
@@ -1,17 +1,14 @@
 Template: cman/upgrade-warning
 Type: boolean
 Default: false
-_Description: Really upgrade the Red Hat Cluster Suite?
- An older version of the Red Hat Cluster Suite is installed on the
- system.
+Description: Do you want to abort now?
+ The new version 2.0 of the Red Hat Cluster Suite is not compatible with 
+ the currently installed one. Upgrading these packages without stopping 
+ the complete cluster can cause filesystem corruption on shared storage 
+ devices.
  .
- WARNING: The version of cman that is going to be installed is not 
- compatible with the currently installed one, upgrading single nodes 
- without stopping the complete cluster will cause data loss.
- .
- In order to upgrade the cluster suite, you need to follow the
- instructions found on the following Page: 
+ For instructions on how to safely upgrade the Red Hat Cluster Suite to
+ version 2.0, please refer to the following document:
  .
  http://wiki.debian.org/UpgradeRHCSV1toV2
  .
- Select OK if you still wish to continue with the upgrade.

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r10006 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . po

[Frederik Schüler]

Author: fs
Date: Sun Dec 23 19:38:25 2007
New Revision: 10006

Log:
fix cman preinst and template
update po 


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates
   dists/trunk/redhat-cluster/redhat-cluster/debian/po/templates.pot

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst   
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst   Sun Dec 
23 19:38:25 2007
@@ -12,7 +12,7 @@
db_go

db_get cman/upgrade-warning
-   if [ $RET = false ] ; then
+   if [ $RET = true ] ; then
echo Aborting cman installation.
echo  For upgrade instructions, please refer 
to 
echo http://wiki.debian.org/UpgradeRHCSV1toV2;

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates 
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates Sun Dec 
23 19:38:25 2007
@@ -1,7 +1,7 @@
 Template: cman/upgrade-warning
 Type: boolean
 Default: false
-Description: Do you want to abort now?
+_Description: Do you want to abort now?
  The new version 2.0 of the Red Hat Cluster Suite is not compatible with 
  the currently installed one. Upgrading these packages without stopping 
  the complete cluster can cause filesystem corruption on shared storage 

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/po/templates.pot
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/po/templates.pot   
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/po/templates.pot   Sun Dec 
23 19:38:25 2007
@@ -7,8 +7,8 @@
 msgid 
 msgstr 
 Project-Id-Version: PACKAGE VERSION\n
-Report-Msgid-Bugs-To: Source: [EMAIL PROTECTED]
-POT-Creation-Date: 2007-12-03 02:12+0100\n
+Report-Msgid-Bugs-To: [EMAIL PROTECTED]
+POT-Creation-Date: 2007-12-23 20:05+0100\n
 PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n
 Last-Translator: FULL NAME [EMAIL PROTECTED]\n
 Language-Team: LANGUAGE [EMAIL PROTECTED]\n
@@ -19,33 +19,28 @@
 #. Type: boolean
 #. Description
 #: ../cman.templates:1001
-msgid Really upgrade Cluster Manager?
-msgstr 
-
-#. Type: boolean
-#. Description
-#: ../cman.templates:1001
-msgid An older version of cman installed on the system.
+msgid Do you want to abort now?
 msgstr 
 
 #. Type: boolean
 #. Description
 #: ../cman.templates:1001
 msgid 
-The version that is going to be installed is *NOT* compatible with the old 
-one and will break the cluster horribly if not upgraded properly.
+The new version 2.0 of the Red Hat Cluster Suite is not compatible with  the 
+currently installed one. Upgrading these packages without stopping  the 
+complete cluster can cause filesystem corruption on shared storage  devices.
 msgstr 
 
 #. Type: boolean
 #. Description
 #: ../cman.templates:1001
 msgid 
-Check https://wiki.debian.org/UpgradingClusterProcedure for the latest 
-instructions on how to proceed.
+For instructions on how to safely upgrade the Red Hat Cluster Suite to 
+version 2.0, please refer to the following document:
 msgstr 
 
 #. Type: boolean
 #. Description
 #: ../cman.templates:1001
-msgid Select OK if you wish to continue with the upgrade.
+msgid http://wiki.debian.org/UpgradeRHCSV1toV2;
 msgstr 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9991 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Thu Dec 20 14:59:14 2007
New Revision: 9991

Log:
First bits for upgrade path from 1.03 to 2.0


Added:
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.docs
   dists/trunk/redhat-cluster/redhat-cluster/debian/upgrade.txt
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
   dists/trunk/redhat-cluster/redhat-cluster/debian/control

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   Thu Dec 20 
14:59:14 2007
@@ -1,6 +1,12 @@
 Open packaging issues
 
 
+- provide upgrade path from cluster suite 1.03 in etch:
+  * upgrade document 
+  * cman preinst: on upgrade from 1.0x, bug the user
+  * debconf template: point the user to the upgrade document, 
+and let the user proceed at own risk
+
 - update initscripts to use lsb functions
 
 - prod upstream to write missing manpages 

Added: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.docs
==
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.docs  Thu Dec 20 
14:59:14 2007
@@ -0,0 +1 @@
+debian/upgrade.txt

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlThu Dec 20 
14:59:14 2007
@@ -11,7 +11,7 @@
 Section: admin
 Priority: optional
 Architecture: all
-Depends: cman, gfs-tools, gfs2-tools, rgmanager, clvm
+Depends: cman, gfs-tools, gfs2-tools, rgmanager, clvm, redhat-cluster-modules
 Description: Red Hat cluster suite (meta package)
  The only scope for this package is to install the full Red Hat Cluster Suite
  in one shot. It is safe to remove it.

Added: dists/trunk/redhat-cluster/redhat-cluster/debian/upgrade.txt
==
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/upgrade.txtThu Dec 
20 14:59:14 2007
@@ -0,0 +1,155 @@
+-
+Upgrading the Red Hat Cluster suite from the previous version
+-
+
+This document describes how to upgrade a Red Hat Cluster from version
+1.03 (as shipped in etch) to version 2.0.
+
+The upgrade procedure consists of stopping the cluster, removing the old
+cluster suite, adding node IDs to the cluster.conf, install and booting
+a new kernel, and finally installing the new cluster suite packages.
+
+The upgrade procedure is as follows:
+
+* Stop client access to the clustered services.
+
+* On each cluster node:
+
+  1. Stop all applications using the cluster infrastructure, like the
+ shared storage
+
+  2. Stop the rgmanager, if installed: 
+
+ killall clurgmgr
+
+  3. Umount all gfs shares:
+ 
+ umount -a -t gfs
+
+ if a gfs share is still blocked by another process, run
+
+ lsof -n | grep mountpoint 
+
+ to identify the process in order to terminate it.
+
+
+  4. Stop the cluster lvm daemon:
+
+ /etc/init.d/clvm stop
+
+
+  5. Stop fencing:
+
+ /etc/init.d/fence stop
+
+
+  6. Stop the cluster manager:
+
+ /etc/init.d/cman stop
+
+
+  7. Stop the cluster configuration service:
+
+ /etc/init.d/ccs stop
+
+
+  8. Remove the old Red Hat Cluster software:
+
+dpkg --purge ccs libccs-dev cman libcman1 libcman-dev libdlm1 \
+   libdlm-dev fence gfs-tools gnbd-client gnbd-server gulm libgulm1 \
+   libgulm-dev libiddev-dev libmagma1 libmagma-dev magma-plugin-gulm \
+   magma-plugin-sm redhat-cluster-source
+
+ Note: not all packages might be installed, just ignore the warnings
+ dpkg will issue about it.
+
+
+  9. Update the cluster.conf file to contain nodeids:
+
+ Open the file /etc/cluster/cluster.conf in your favorite editor.
+ In each clusternode element, insert nodeid=number after
+ name=name. This should look this way:
+
+ [...]
+ clusternode name=node1 nodeid=1
+ [...]
+
+ Note: the nodeid parameter was optional in the old Red Had Cluster
+ suite, but is now mandatory. If you have already nodeid parameters
+ in your cluster.conf, skip this step.
+
+ After saving your changes to the cluster.conf file, copy it to all 
+ the other nodes in the cluster.
+
+
+  10. Update the kernel, and reboot the Node in order to activate the
+  new kernel. You might of course  upgrade the other parts of the 
+  system before rebooting.
+
+
+  11. Install the new version of the Red Hat Cluster suite:
+
+  apt-get install redhat-cluster-suite redhat-cluster-modules
+
+  Note: 

[kernel] r9993 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Thu Dec 20 17:27:01 2007
New Revision: 9993

Log:
minor changes to the upgrade document


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/upgrade.txt

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/upgrade.txt
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/upgrade.txt
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/upgrade.txtThu Dec 
20 17:27:01 2007
@@ -96,11 +96,6 @@
   is recommended only for experimental setups.
   
 
-  12. Make sure clvm uses cluster locking:
-
-  sh /usr/share/doc/clvm/examples/clvmd_fix_conf.sh /lib/lvm2/
-
-
 Now the cluster is migrated, and should look like this:
 
 node01:/# cman_tool status
@@ -141,8 +136,6 @@
 [1 2 3]
 
 
-
-
 TODO
 
 - custom kernels: patch required
@@ -150,6 +143,5 @@
   * cluster.conf changes
   * filesystem locking table changes
   * handling changes
-- double-check with RL upgrade 
-
+- double-check with real upgrade 
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9994 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Thu Dec 20 20:24:45 2007
New Revision: 9994

Log:
Provide upgrade handling from version 1.03 in etch.
Do not depend on redhat-cluster-modules, have gfs-tools and gnbd-client 
recommend it instead.


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.config
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates
   dists/trunk/redhat-cluster/redhat-cluster/debian/control
   dists/trunk/redhat-cluster/redhat-cluster/debian/upgrade.txt

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.config
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.config
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.configThu Dec 
20 20:24:45 2007
@@ -5,18 +5,22 @@
 . /usr/share/debconf/confmodule
 db_version 2.0
 
-if [ -n $2 ]  dpkg --compare-versions $2 lt 2.0; then
-   db_fget cman/upgrade-from-old seen_in_2.0_upgrade
-   if [ $RET = false ]; then
-   db_fset cman/upgrade-from-old seen false
-   db_input critical cman/upgrade-from-old || CODE=$?
-   if [ $CODE = 30 ]; then
-   # non-interactive upgrade. Better die here than sorry.
-   exit 1
+case $1 in
+   upgrade)
+   if dpkg --compare-versions $2 lt 2.0; then
+   db_fget cman/upgrade-warning seen_in_2.0_upgrade 
+   if [ $RET = false ]; then
+   db_fset cman/upgrade-warning seen false
+   db_input critical cman/upgrade-warning || 
CODE=$?
+   if [ $CODE = 30 ]; then
+   # non-interactive upgrade. Better die 
here than sorry.
+   exit 1
+   fi
+   db_go || true
+   db_fset cman/upgrade-warning 
seen_in_2.0_upgrade true
+   fi
fi
-   db_go || true
-   db_fset cman/upgrade-from-old seen_in_2.0_upgrade true
-   fi
-fi
+   ;;
+esac
 
 exit 0

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst   
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst   Thu Dec 
20 20:24:45 2007
@@ -2,17 +2,20 @@
 
 set -e
 
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-if [ -n $2 ]  dpkg --compare-versions $2 lt 2.0; then
-   db_get cman/upgrade-from-old
-   ANSWER=$RET
-   db_fset cman/upgrade-from-old seen_in_2.0_upgrade false
-   if [ $ANSWER = false ]; then
-   exit 1
-   fi
-fi
+case $1 in
+   upgrade)
+   . /usr/share/debconf/confmodule
+   db_version 2.0
+   if dpkg --compare-versions $2 lt 2.0 ; then
+   db_fset cman/upgrade-warning seen_in_2.0_upgrade false
+   db_get cman/upgrade-warning
+   if [ $RET = false ] ; then
+   echo aborting cman installation.
+   exit 1
+   fi
+   fi
+   ;;
+esac
 
 #DEBHELPER#
 

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates 
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates Thu Dec 
20 20:24:45 2007
@@ -1,13 +1,17 @@
-Template: cman/upgrade-from-old
+Template: cman/upgrade-warning
 Type: boolean
 Default: false
-_Description: Really upgrade Cluster Manager?
- An older version of cman installed on the system.
+_Description: Really upgrade the Red Hat Cluster Suite?
+ An older version of the Red Hat Cluster Suite is installed on the
+ system.
  .
- The version that is going to be installed is *NOT* compatible with the old
- one and will break the cluster horribly if not upgraded properly.
+ WARNING: The version of cman that is going to be installed is not 
+ compatible with the currently installed one, upgrading single nodes 
+ without stopping the complete cluster will cause data loss.
  .
- Check https://wiki.debian.org/UpgradingClusterProcedure for the latest
- instructions on how to proceed.
+ In order to upgrade the cluster suite, you need to follow the
+ instructions found on the following Page: 
  .
- Select OK if you wish to continue with the upgrade.
+ http://wiki.debian.org/UpgradeRHCSV1toV2
+ .
+ Select OK if you still wish to continue with the upgrade.

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control

[kernel] r9977 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Wed Dec 19 12:18:57 2007
New Revision: 9977

Log:
Add handling for missing cluster.conf
Enable XEN support on amd64



Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/control
   dists/trunk/redhat-cluster/redhat-cluster/debian/rules

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   Wed Dec 19 
12:18:57 2007
@@ -1,6 +1,5 @@
 Open packaging issues
 
-- add handling for missing cluster.conf (#420229, #381434, #367370)
 - add gnbd-source package containing the gnbd kernel module (#401073, #426769)
 - make initscripts lsb-compliant
 - redo description of gfs-source? (#380002)

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Wed Dec 19 
12:18:57 2007
@@ -11,7 +11,7 @@
   * Add gfs-source package containing the gfs1 kernel module
   * Provide module-assistant support in the gfs-source package.
 Closes: #366498, #412412
-  * fix gnbd-* packages description. Closes: #319204 
+  * Fix gnbd-* packages description. Closes: #319204
   * Lots of bugs fixed:
 - Fix initscripts. Closes: #367171, #336260, #336259
 - Provide manpages for cluster.conf, mkfs.gfs and fsck.gfs.
@@ -19,5 +19,7 @@
 - Provide rgmanager package. Closes: #400204
 - Rgmanager: add dependency on iputils-arping. Closes: #417813
 - Call dh_strip during install. Closes: #437899
-
- -- Frederik Schüler [EMAIL PROTECTED]  Tue, 11 Dec 2007 02:34:52 +0100
+  * Add handling for missing cluster.conf. Closes: #420229, #381434, #367370
+  * Enable XEN support on amd64 too.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Wed, 19 Dec 2007 13:17:28 +0100

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init  Wed Dec 19 
12:18:57 2007
@@ -16,6 +16,8 @@
 CMAN_QUORUM_TIMEOUT=0
 CMAN_SHUTDOWN_TIMEOUT=60
 
+CONF=/etc/cluster/cluster.conf
+
 set -e
 
 load_modules() {
@@ -36,8 +38,23 @@
fi
 }
 
+check_cluster_conf() {
+
+   if [ ! -e $CONF -o ! -s $CONF ] ; then
+   echo 
+   echo $CONF does not exist or is empty.
+   echo See /usr/share/doc/gfs-tools/examples/min-gfs.txt
+   echo for instructions on how to setup a minimal cluster.
+   echo $DESC will not be started.
+   exit 0
+   fi
+
+}
+
 case $1 in
   start)
+   check_cluster_conf
+
echo Starting $DESC:
echo -n  Loading kernel modules:
load_modules

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlWed Dec 19 
12:18:57 2007
@@ -4,7 +4,7 @@
 Maintainer: Debian Kernel Team [EMAIL PROTECTED]
 Uploaders: Bastian Blank [EMAIL PROTECTED], Frederik Schüler [EMAIL 
PROTECTED]
 Standards-Version: 3.7.3.0
-Build-Depends: dpatch, debhelper (= 4.2.28), libxml2-dev, libncurses5-dev, 
libopenais-dev (= 0.82-2), libvolume-id-dev (=  0.105-4), linux-libc-dev (= 
2.6.22-6), libvirt-dev (= 0.3.0) [i386], libnss3-dev [i386], libnspr4-dev 
[i386], bzip2
+Build-Depends: dpatch, debhelper (= 4.2.28), libxml2-dev, libncurses5-dev, 
libopenais-dev (= 0.82-2), libvolume-id-dev (=  0.105-4), linux-libc-dev (= 
2.6.22-6), libvirt-dev (= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], 
libnspr4-dev [amd64 i386], bzip2
 Build-Conflicts: libccs-dev, libcman-dev (= 2.0), libdlm-dev (= 2.0), 
libcman2, libdlm2
 
 Package: redhat-cluster-suite

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/rules
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/rules  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/rules  Wed Dec 19 
12:18:57 2007
@@ -7,11 +7,11 @@
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-ifneq (,$(findstring $(DEB_HOST_ARCH), i386))
+xen_arches = amd64 i386
+ifneq (,$(filter $(DEB_HOST_ARCH), $(xen_arches))) 
   BUILD_XEN = --enable_xen
 endif
 
-
 BUILDROOT := $(shell pwd)
 
 SOMAJOR=2

[kernel] r9982 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Wed Dec 19 13:40:47 2007
New Revision: 9982

Log:
Fix redhat-cluster-source package description.


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/control

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   Wed Dec 19 
13:40:47 2007
@@ -1,7 +1,6 @@
 Open packaging issues
 
 - make initscripts lsb-compliant
-- redo description of gfs-source? (#380002)
 
 W: rgmanager: init.d-script-missing-lsb-section /etc/init.d/rgmanager
 W: gnbd-server: init.d-script-missing-lsb-section /etc/init.d/gnbd-server

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Wed Dec 19 
13:40:47 2007
@@ -23,6 +23,8 @@
   * Enable XEN support on amd64 too.
   * Add gnbd kernel module source to redhat-cluster-source. 
 Closes: #401073, #426769
+  * Mention gfs and gnbd kernel modules in the redhat-cluster-modules source
+and binary package descriptions. Closes: #380002
+  * 
 
-
- -- Frederik Schüler [EMAIL PROTECTED]  Wed, 19 Dec 2007 13:59:49 +0100
+ -- Frederik Schüler [EMAIL PROTECTED]  Wed, 19 Dec 2007 14:39:28 +0100

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlWed Dec 19 
13:40:47 2007
@@ -141,5 +141,6 @@
 Architecture: any
 Depends: bzip2
 Description: Red Hat cluster suite - kernel modules source
- This package contains the source necessary for compiling the
- Red Hat cluster suite kernel modules against the linux tree.
+ This package contains the source necessary for compiling the Red Hat
+ cluster suite out-of-tree kernel modules gfs and gnbd against the 
+ linux tree.

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9981 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . patches

[Frederik Schüler]

Author: fs
Date: Wed Dec 19 13:33:23 2007
New Revision: 9981

Log:
rename gfs-source into redhat-cluster-source
add gnbd kernel module to redhat-cluster-source


Added:
   dists/trunk/redhat-cluster/redhat-cluster/debian/modass.redhat-cluster-source
  - copied, changed from r9976, 
/dists/trunk/redhat-cluster/redhat-cluster/debian/modass.gfs-source
   
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/02_fix_gnbd-kernel-makefile.dpatch
  - copied, changed from r9976, 
/dists/trunk/redhat-cluster/redhat-cluster/debian/patches/01_fix_gfs-kernel-makefile.dpatch
   
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-modules-_KVERS_.postinst
  - copied unchanged from r9976, 
/dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-modules-_KVERS_.postinst
   
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.Makefile
   
dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.README.Debian
  - copied, changed from r9976, 
/dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.README.Debian
   dists/trunk/redhat-cluster/redhat-cluster/debian/redhat-cluster-source.rules
  - copied, changed from r9976, 
/dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.rules
Removed:
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-modules-_KVERS_.postinst
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.README.Debian
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.rules
   dists/trunk/redhat-cluster/redhat-cluster/debian/modass.gfs-source
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/control
   dists/trunk/redhat-cluster/redhat-cluster/debian/control.modules.in
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
   dists/trunk/redhat-cluster/redhat-cluster/debian/rules

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   Wed Dec 19 
13:33:23 2007
@@ -1,6 +1,5 @@
 Open packaging issues
 
-- add gnbd-source package containing the gnbd kernel module (#401073, #426769)
 - make initscripts lsb-compliant
 - redo description of gfs-source? (#380002)
 

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Wed Dec 19 
13:33:23 2007
@@ -21,5 +21,8 @@
 - Call dh_strip during install. Closes: #437899
   * Add handling for missing cluster.conf. Closes: #420229, #381434, #367370
   * Enable XEN support on amd64 too.
+  * Add gnbd kernel module source to redhat-cluster-source. 
+Closes: #401073, #426769
 
- -- Frederik Schüler [EMAIL PROTECTED]  Wed, 19 Dec 2007 13:17:28 +0100
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Wed, 19 Dec 2007 13:59:49 +0100

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlWed Dec 19 
13:33:23 2007
@@ -12,7 +12,7 @@
 Priority: optional
 Architecture: all
 Depends: cman, gfs-tools, gfs2-tools, rgmanager, clvm
-Description: red hat cluster suite (meta package)
+Description: Red Hat cluster suite (meta package)
  The only scope for this package is to install the full Red Hat Cluster Suite
  in one shot. It is safe to remove it.
 
@@ -20,7 +20,7 @@
 Architecture: any
 Section: admin
 Pre-Depends: debconf | debconf-2.0
-Depends: ${shlibs:Depends}, python, openais (= 0.82-2), gfs-modules
+Depends: ${shlibs:Depends}, python, openais (= 0.82-2), redhat-cluster-modules
 Conflicts: magma, libmagma1, libmagma-dev, ccs, fence, libiddev-dev, 
fence-gnbd, gulm, libgulm1, libgulm-dev, magma-plugins
 Replaces: ccs, fence, fence-gnbd
 Description: cluster manager
@@ -75,7 +75,7 @@
 
 Package: gfs-tools
 Architecture: any
-Depends: ${shlibs:Depends}, psmisc, gfs-modules, gfs2-tools
+Depends: ${shlibs:Depends}, psmisc, redhat-cluster-modules, gfs2-tools
 Section: admin
 Description: global file system tools 
  The Global File System allows a cluster of machines to concurrently access
@@ -92,7 +92,7 @@
 
 Package: gfs2-tools
 Architecture: any
-Depends: ${shlibs:Depends}, psmisc, gfs-modules
+Depends: ${shlibs:Depends}, psmisc, redhat-cluster-modules
 Section: admin
 Description: global file system 2 tools (EXPERIMENTAL)
  The Global File System 2 allows a cluster of machines to concurrently access
@@ -108,7 +108,7 @@
 Package: gnbd-client
 Section

[kernel] r9984 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Wed Dec 19 17:28:50 2007
New Revision: 9984

Log:
Add LSB sections to the init scripts


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/gnbd-client.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/gnbd-server.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/rgmanager.init

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Wed Dec 19 
17:28:50 2007
@@ -25,6 +25,5 @@
 Closes: #401073, #426769
   * Mention gfs and gnbd kernel modules in the redhat-cluster-modules source
 and binary package descriptions. Closes: #380002
-  * 
 
  -- Frederik Schüler [EMAIL PROTECTED]  Wed, 19 Dec 2007 14:39:28 +0100

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init  Wed Dec 19 
17:28:50 2007
@@ -1,8 +1,18 @@
-#!/bin/bash
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:  cluster manager
+# Required-Start:$network $time
+# Required-Stop: $network $time
+# Default-Start: 2 3 4 5
+# Default-Stop:  0 1 6
+# Short-Description: Starts and stops cman
+### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 NAME=cman
 DESC=cluster manager
+CONF=/etc/cluster/cluster.conf
 
 test -x /usr/sbin/cman_tool || exit 0
 
@@ -10,15 +20,31 @@
 
 CCSD_OPTS=
 
-# cman
-
-CMAN_CLUSTER_TIMEOUT=120
-CMAN_QUORUM_TIMEOUT=0
-CMAN_SHUTDOWN_TIMEOUT=60
-
-CONF=/etc/cluster/cluster.conf
-
-set -e
+# CMAN_CLUSTER_TIMEOUT -- amount of time to wait for joinging a cluster
+# before giving up.  If CMAN_CLUSTER_TIMEOUT is positive, then we will
+# wait CMAN_CLUSTER_TIMEOUT seconds before giving up and failing when
+# a cluster is not joined.  If CMAN_CLUSTER_TIMEOUT is zero, then
+# wait indefinately for a cluster join.  If CMAN_CLUSTER_TIMEOUT is
+# negative, do not check to see that the cluster has been joined
+[ -z $CMAN_CLUSTER_TIMEOUT ]  CMAN_CLUSTER_TIMEOUT=120
+
+# CMAN_QUORUM_TIMEOUT -- amount of time to wait for a quorate cluster on 
+# startup quorum is needed by many other applications, so we may as 
+# well wait here.  If CMAN_QUORUM_TIMEOUT is less than 1, quorum will 
+# be ignored.
+[ -z $CMAN_QUORUM_TIMEOUT ]  CMAN_QUORUM_TIMEOUT=0
+
+# CMAN_SHUTDOWN_TIMEOUT -- amount of time to wait for cman to become a 
+# cluster member before calling cman_tool leave during shutdown.  
+# default is 60 seconds
+[ -z $CMAN_SHUTDOWN_TIMEOUT ]  CMAN_SHUTDOWN_TIMEOUT=60
+
+# FENCED_START_TIMEOUT -- amount of time to wait for starting fenced
+# before giving up.  If FENCED_START_TIMEOUT is positive, then we will
+# wait FENCED_START_TIMEOUT seconds before giving up and failing when
+# fenced does not start.  If FENCED_START_TIMEOUT is zero, then
+# wait indefinately for fenced to start.
+[ -z $FENCED_START_TIMEOUT ]  FENCED_START_TIMEOUT=300
 
 load_modules() {
modprobe configfs 21 || true
@@ -84,7 +110,7 @@
start-stop-daemon --start --quiet --pidfile /var/run/gfs_controld.pid 
--exec /usr/sbin/gfs_controld
echo  gfs_controld
echo -n  Joining fence domain:
-   fence_tool join
+   fence_tool -w -t $FENCED_START_TIMEOUT join
echo  done
echo -n  Starting Quorum Disk daemon:
start-stop-daemon --start --quiet --pidfile /var/run/qdiskd.pid --exec 
/usr/sbin/qdiskd -- -Q

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.init
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.init 
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.init Wed Dec 
19 17:28:50 2007
@@ -1,4 +1,13 @@
-#!/bin/bash
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:  global filesystem 
+# Required-Start:cman
+# Required-Stop: cman
+# Default-Start: 2 3 4 5
+# Default-Stop:  0 1 6
+# Short-Description: mount and unmount GFS shares
+### END INIT INFO
 
 #
 # This script's behavior is modeled closely after the netfs script.  

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.init
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.init
(original)
+++ dists/trunk/redhat-cluster/redhat

[kernel] r9985 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . patches

[Frederik Schüler]

Author: fs
Date: Wed Dec 19 19:23:35 2007
New Revision: 9985

Log:
fix whatis secions


Added:
   
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/03_manpages-whatis.dpatch
   (contents, props changed)
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   Wed Dec 19 
19:23:35 2007
@@ -2,28 +2,11 @@
 
 - make initscripts lsb-compliant
 
-W: rgmanager: init.d-script-missing-lsb-section /etc/init.d/rgmanager
-W: gnbd-server: init.d-script-missing-lsb-section /etc/init.d/gnbd-server
-W: gnbd-client: init.d-script-missing-lsb-section /etc/init.d/gnbd-client
-W: gfs2-tools: init.d-script-missing-lsb-section /etc/init.d/gfs2-tools
-W: gfs-tools: init.d-script-missing-lsb-section /etc/init.d/gfs-tools
-W: cman: init.d-script-missing-lsb-section /etc/init.d/cman
-
 - lintian issues
 
 E: cman: shlib-with-executable-bit usr/lib/openais/lcrso/service_cman.lcrso 
0755
 W: rgmanager: executable-not-elf-or-script ./usr/share/cluster/ocf-shellfuncs
 
-- fix manpages (check with upstream)
-
-W: libdlm-dev: manpage-has-bad-whatis-entry usr/share/man/man3/libdlm.3.gz
-W: gnbd-server: manpage-has-bad-whatis-entry usr/share/man/man8/gnbd.8.gz
-W: gfs2-tools: manpage-has-bad-whatis-entry usr/share/man/man8/gfs2.8.gz
-W: gfs-tools: manpage-has-bad-whatis-entry usr/share/man/man8/gfs.8.gz
-W: cman: manpage-has-bad-whatis-entry usr/share/man/man5/cman.5.gz
-W: cman: manpage-has-bad-whatis-entry usr/share/man/man5/qdisk.5.gz
-W: cman: manpage-has-bad-whatis-entry usr/share/man/man8/fence.8.gz
-
 - write missing manpages (check with upstream)
 
 W: rgmanager: binary-without-manpage usr/sbin/clunfslock

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list 
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list Wed Dec 
19 19:23:35 2007
@@ -1,3 +1,4 @@
 00_fix_gfs2_quota.dpatch
 01_fix_gfs-kernel-makefile.dpatch
 02_fix_gnbd-kernel-makefile.dpatch
+03_manpages-whatis.dpatch

Added: 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/03_manpages-whatis.dpatch
==
--- (empty file)
+++ 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/03_manpages-whatis.dpatch
  Wed Dec 19 19:23:35 2007
@@ -0,0 +1,106 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_manpages-whatis.dpatch by Frederik Schüler [EMAIL PROTECTED]
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix whatis entries
+
[EMAIL PROTECTED]@
+--- redhat-cluster-2.20071022/dlm/man/libdlm.3.old 2007-12-19 
18:33:55.0 +0100
 redhat-cluster-2.20071022/dlm/man/libdlm.3 2007-12-19 18:34:18.0 
+0100
+@@ -1,6 +1,6 @@
+ .TH LIBDLM 3 July 5, 2007 libdlm functions
+ .SH NAME
+-libdlm, dlm_get_fd, dlm_dispatch, dlm_pthread_init, dlm_ls_pthread_init, 
dlm_cleanup
++libdlm \- dlm_get_fd, dlm_dispatch, dlm_pthread_init, dlm_ls_pthread_init, 
dlm_cleanup
+ .SH SYNOPSIS
+ .nf
+ #include libdlm.h
+--- redhat-cluster-2.20071022/fence/man/fence.8.old2007-12-19 
18:31:38.0 +0100
 redhat-cluster-2.20071022/fence/man/fence.82007-12-19 
18:31:53.0 +0100
+@@ -8,7 +8,7 @@
+ .TH fence 8
+ 
+ .SH NAME
+-I/O Fencing reference guide
++fence \- I/O Fencing reference guide
+ 
+ .SH SYNOPSIS
+ Overview of related manual pages
+--- redhat-cluster-2.20071022/gnbd/man/gnbd.8.old  2007-12-19 
19:51:04.0 +0100
 redhat-cluster-2.20071022/gnbd/man/gnbd.8  2007-12-19 19:51:20.0 
+0100
+@@ -4,7 +4,7 @@
+ .TH gnbd 8
+ 
+ .SH NAME
+-GNBD reference guide
++gnbd \- GNBD reference guide
+ 
+ .SH SYNOPSIS
+ Overview of manpages and their locations
+--- redhat-cluster-2.20071022/gfs2/man/gfs2.8.old  2007-12-19 
19:51:39.0 +0100
 redhat-cluster-2.20071022/gfs2/man/gfs2.8  2007-12-19 19:51:50.0 
+0100
+@@ -4,7 +4,7 @@
+ .TH gfs2 8
+ 
+ .SH NAME
+-GFS2 reference guide
++gfs2 \- GFS2 reference guide
+ 
+ .SH SYNOPSIS
+ Overview of manpages and their locations
+--- redhat-cluster-2.20071022/gfs/man/gfs.8.old2007-12-19 
19:52:04.0 +0100
 redhat-cluster-2.20071022/gfs/man/gfs.82007-12-19 19:52:13.0 
+0100
+@@ -4,7 +4,7 @@
+ .TH gfs 8
+ 
+ .SH NAME
+-GFS reference guide
++gfs \- GFS reference guide
+ 
+ .SH SYNOPSIS
+ Overview of manpages and their locations
+--- redhat-cluster-2.20071022/cman/man/qdisk.5.old 2007-12-19 
19:58:27.0 +0100
 redhat-cluster-2.20071022/cman/man/qdisk.5 2007

[kernel] r9987 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . patches

[Frederik Schüler]

Author: fs
Date: Wed Dec 19 20:47:11 2007
New Revision: 9987

Log:
Handle nostrip option during *.lcrso object installation


Modified:
   
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/04_fix-lcrso-file-permissions.dpatch
   dists/trunk/redhat-cluster/redhat-cluster/debian/rules

Modified: 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/04_fix-lcrso-file-permissions.dpatch
==
--- 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/04_fix-lcrso-file-permissions.dpatch
   (original)
+++ 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/04_fix-lcrso-file-permissions.dpatch
   Wed Dec 19 20:47:11 2007
@@ -12,7 +12,7 @@
  install: all
install -d ${libexecdir}/lcrso
 -  install -s ${TARGET} ${libexecdir}/lcrso
-+  install -s -m 644 ${TARGET} ${libexecdir}/lcrso
++  install -m 644 ${TARGET} ${libexecdir}/lcrso
  
  uninstall:
rm -f ${libexecdir}/lcrso/${TARGET}

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/rules
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/rules  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/rules  Wed Dec 19 
20:47:11 2007
@@ -107,6 +107,9 @@
dh_testdir
dh_testroot
dh_strip -a
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+   strip --remove-section=.comment --remove-section=.note --strip-unneeded 
debian/cman/usr/lib/openais/lcrso/service_cman.lcrso
+endif
dh_compress -a
dh_fixperms -a
dh_installdeb -a

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9932 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Tue Dec 11 01:39:15 2007
New Revision: 9932

Log:
Process bugs


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/control
   dists/trunk/redhat-cluster/redhat-cluster/debian/control.modules.in

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   Tue Dec 11 
01:39:15 2007
@@ -1,7 +1,9 @@
 Open packaging issues
 
-- add gnbd-source package containing the gnbd kernel module
+- add handling for missing cluster.conf (#420229, #381434, #367370)
+- add gnbd-source package containing the gnbd kernel module (#401073, #426769)
 - make initscripts lsb-compliant
+- redo description of gfs-source? (#380002)
 
 W: rgmanager: init.d-script-missing-lsb-section /etc/init.d/rgmanager
 W: gnbd-server: init.d-script-missing-lsb-section /etc/init.d/gnbd-server

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Tue Dec 11 
01:39:15 2007
@@ -1,10 +1,23 @@
 redhat-cluster (2.20071022-1) UNRELEASED; urgency=low
 
+  * New upstream release. Closes: #426276
+- Drop Magma. Closes: #374541
   * First Debian release of the redhat cluster suite v2, based on the
 packaging by Fabio M. Di Nitto [EMAIL PROTECTED]
+  * Acknowledge NMU. Closes: #377791
   * Update copyright file.
   * Fix maintainer scripts, add missing ones.
   * Fix debconf template.
   * Add gfs-source package containing the gfs1 kernel module
-
- -- Frederik Schüler [EMAIL PROTECTED]  Mon, 03 Dec 2007 11:23:01 +0100
+  * Provide module-assistant support in the gfs-source package.
+Closes: #366498, #412412
+  * fix gnbd-* packages description. Closes: #319204 
+  * Lots of bugs fixed:
+- Fix initscripts. Closes: #367171, #336260, #336259
+- Provide manpages for cluster.conf, mkfs.gfs and fsck.gfs.
+  Closes: #406364, #270537
+- Provide rgmanager package. Closes: #400204
+- Rgmanager: add dependency on iputils-arping. Closes: #417813
+- Call dh_strip during install. Closes: #437899
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Tue, 11 Dec 2007 02:34:52 +0100

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlTue Dec 11 
01:39:15 2007
@@ -111,7 +111,7 @@
 Depends: ${shlibs:Depends}, gfs-modules
 Recommends: fence-gnbd (= ${binary:Version})
 Description: global network block device - client tools
- GNBD allows to usage block devices over the network. It is a modified
+ GNBD allows to use block devices over the network. It is a modified
  version of the linux network block device for the use within a cluster
  environment.
  .
@@ -123,7 +123,7 @@
 Depends: ${shlibs:Depends}, gfs-modules
 Recommends: fence-gnbd (= ${binary:Version})
 Description: global network block device - server tools
- GNBD allows to usage block devices over the network. It is a modified
+ GNBD allows to use block devices over the network. It is a modified
  version of the linux network block device for the use within a cluster
  environment.
  .

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control.modules.in
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control.modules.in 
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/control.modules.in Tue Dec 
11 01:39:15 2007
@@ -18,7 +18,7 @@
  can be deployed to build high available services without the single point
  of failure a file server would be.
  .
- This package contains the compiled kernel module for _KVERS_
+ This package contains the compiled gfs kernel module for _KVERS_
  .
  If you compiled a custom kernel, you will most likely need to compile a
  custom version of this module as well. The gfs-source

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9926 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Sat Dec  8 15:53:53 2007
New Revision: 9926

Log:
split module-assistant stuf into separate rules file


Added:
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.rules   
(contents, props changed)
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/control
   dists/trunk/redhat-cluster/redhat-cluster/debian/rules

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlSat Dec  8 
15:53:53 2007
@@ -139,7 +139,7 @@
 
 Package: gfs-source
 Architecture: any
-Depends: bzip2 dpatch
+Depends: bzip2
 Description: Global File System v1 - kernel module source
  This package contains the source necessary for compiling the
  Global File System version 1 kernel modules against the linux tree.

Added: dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.rules
==
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.rules   Sat Dec 
 8 15:53:53 2007
@@ -0,0 +1,37 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+# module assistant stuff
+PACKAGE=gfs-modules
+MA_DIR ?= /usr/share/modass
+-include $(MA_DIR)/include/generic.make
+-include $(MA_DIR)/include/common-rules.make
+
+kdist_clean: prep-deb-files
+   dh_clean
+   $(MAKE) -C $(KSRC) M=$(CURDIR) clean 
+
+kdist_config: prep-deb-files
+binary-modules: kdist_config
+   dh_testdir
+   dh_testroot
+   dh_clean -k
+   # build the module
+   make -C $(KSRC) M=$(CURDIR)/ modules USING_KBUILD=1
+   mkdir -p $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/extra/
+   install -m644 -b gfs.ko 
$(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/extra/gfs.ko 
+   # this is broken, dunno why:
+   # #make -C $(KSRC) M=$(CURDIR)/ modules_install 
INSTALL_MOD_PATH=$(CURDIR)/debian/$(PKGNAME) INSTALL_MOD_DIR=extra/
+   dh_installdocs
+   dh_installchangelogs
+   dh_compress
+   dh_fixperms
+   dh_installdeb
+   dh_installmodules
+   dh_gencontrol -- -v$(VERSION)
+   dh_md5sums
+   dh_builddeb --destdir=$(DEB_DESTDIR)
+
+.PHONY: binary-modules kdist kdist_config kdist_image kdist_clean

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/rules
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/rules  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/rules  Sat Dec  8 
15:53:53 2007
@@ -20,7 +20,7 @@
 configure: patch configure-stamp
 configure-stamp:
dh_testdir
-
+   
./configure --kernel_src=$(BUILDROOT) \
--kernel_build=$(BUILDROOT) \
--sbindir=/usr/sbin \
@@ -30,10 +30,10 @@
--libexecdir=/usr/lib/openais \
--release_major=$(SOMAJOR) \
--release_minor=$(SOMINOR)
-
+   
# disable kernel modules
sed -i -e 's/-kernel.* \?=/ 1/g' make/defines.mk
-
+   
touch $@
 
 build: configure build-stamp
@@ -68,10 +68,12 @@

# prepare the debian dir
cd debian ; \
-   cp compat copyright gfs-modules-_KVERS_.postinst changelog rules \
+   cp compat copyright gfs-modules-_KVERS_.postinst changelog \
control.modules.in gfs-source/usr/src/modules/gfs/debian
cp debian/gfs-source.README.Debian \
debian/gfs-source/usr/src/modules/gfs/debian/README.Debian
+   cp debian/gfs-source.rules \
+   debian/gfs-source/usr/src/modules/gfs/debian/rules

# hack to fix changelog in the module source package
cat debian/changelog | sed -e s/^redhat-cluster/gfs/  \
@@ -131,35 +133,3 @@
rm -rf *-stamp
rm -rf debian/patched
 
-# module assistant stuff
-PACKAGE=gfs-modules
-MA_DIR ?= /usr/share/modass
--include $(MA_DIR)/include/generic.make
--include $(MA_DIR)/include/common-rules.make
-
-kdist_clean: prep-deb-files
-   dh_clean
-   $(MAKE) -C $(KSRC) M=$(CURDIR) clean 
-
-kdist_config: prep-deb-files
-binary-modules: kdist_config
-   dh_testdir
-   dh_testroot
-   dh_clean -k
-   # build the module
-   make -C $(KSRC) M=$(CURDIR)/ modules USING_KBUILD=1
-   mkdir -p $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/extra/
-   install -m644 -b gfs.ko 
$(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/extra/gfs.ko 
-   # this is broken, dunno why:
-   # #make -C $(KSRC) M=$(CURDIR)/ modules_install 
INSTALL_MOD_PATH=$(CURDIR)/debian/$(PKGNAME) INSTALL_MOD_DIR=extra/
-   dh_installdocs
-   dh_installchangelogs
-   dh_compress
-   dh_fixperms
-   

[kernel] r9925 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Sat Dec  8 15:08:45 2007
New Revision: 9925

Log:
Fix gfs-source build dependency
deactivate broken cman debconf query


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postinst
   dists/trunk/redhat-cluster/redhat-cluster/debian/control

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postinst
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postinst  
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postinst  Sat Dec 
 8 15:08:45 2007
@@ -5,10 +5,10 @@
 case $1 in
configure)
. /usr/share/debconf/confmodule
-   db_get cman/upgrade-from-old
-   if [ $RET != true ] ; then
-   exit 1
-   fi
+   # FIXME db_get cman/upgrade-from-old
+   # FIXME if [ $RET != true ] ; then
+   # FIXME exit 1
+   # FIXME fi
;;
*)
echo postinst called with unknown argument \`$1' 12

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlSat Dec  8 
15:08:45 2007
@@ -139,7 +139,7 @@
 
 Package: gfs-source
 Architecture: any
-Depends: bzip2
+Depends: bzip2 dpatch
 Description: Global File System v1 - kernel module source
  This package contains the source necessary for compiling the
  Global File System version 1 kernel modules against the linux tree.

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9927 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Sat Dec  8 18:09:14 2007
New Revision: 9927

Log:
Do not depend on gnbd-* in the meta-package


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/control

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlSat Dec  8 
18:09:14 2007
@@ -11,7 +11,7 @@
 Section: admin
 Priority: optional
 Architecture: all
-Depends: cman, gfs-tools, gfs2-tools, gnbd-client, gnbd-server, rgmanager, clvm
+Depends: cman, gfs-tools, gfs2-tools, rgmanager, clvm
 Description: red hat cluster suite (meta package)
  The only scope for this package is to install the full Red Hat Cluster Suite
  in one shot. It is safe to remove it.

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9928 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . patches

[Frederik Schüler]

Author: fs
Date: Sat Dec  8 19:26:52 2007
New Revision: 9928

Log:
Add patch descriptions
add missing force-reload to init scripts


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.init
   
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00_fix_gfs2_quota.dpatch
   
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/01_fix_gfs-kernel-makefile.dpatch

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.init
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.init 
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.init Sat Dec 
 8 19:26:52 2007
@@ -73,11 +73,11 @@
$0 start
;;
 
-  reload)
+  reload|force-reload)
 $0 start
;;
   *)
-   echo $Usage: $0 {start|stop|restart|reload|status}
+   echo $Usage: $0 {start|stop|restart|reload|force-reload|status}
exit 1
 esac
 

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.init
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.init
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.initSat Dec 
 8 19:26:52 2007
@@ -73,11 +73,11 @@
$0 start
;;
 
-  reload)
+  reload|force-reload)
 $0 start
;;
   *)
-   echo $Usage: $0 {start|stop|restart|reload|status}
+   echo $Usage: $0 {start|stop|restart|reload|force-reload|status}
exit 1
 esac
 

Modified: 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00_fix_gfs2_quota.dpatch
==
--- 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00_fix_gfs2_quota.dpatch
   (original)
+++ 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00_fix_gfs2_quota.dpatch
   Sat Dec  8 19:26:52 2007
@@ -2,7 +2,7 @@
 ## 00_fix_gfs2_quota.dpatch by  [EMAIL PROTECTED]
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: patch taken from Ubuntu, description is missing.
 
 @DPATCH@
 diff -urNad redhat-cluster-suite-2.20071022~/gfs2/include/gfs2_ondisk.h 
redhat-cluster-suite-2.20071022/gfs2/include/gfs2_ondisk.h

Modified: 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/01_fix_gfs-kernel-makefile.dpatch
==
--- 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/01_fix_gfs-kernel-makefile.dpatch
  (original)
+++ 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/01_fix_gfs-kernel-makefile.dpatch
  Sat Dec  8 19:26:52 2007
@@ -2,7 +2,7 @@
 ## 01_fix_gfs-kernel-makefile.dpatch by Frederik Schüler [EMAIL PROTECTED]
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Remove unneeded include from Makefile
 
 @DPATCH@
 --- redhat-cluster-2.20071022/gfs-kernel/src/gfs/Makefile.old  2007-12-07 
22:58:12.0 +0100

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9929 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Sat Dec  8 19:38:59 2007
New Revision: 9929

Log:
update todo


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/TODO

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/TODO   Sat Dec  8 
19:38:59 2007
@@ -1,11 +1,8 @@
-Merge cman.init changes from upstream to handle xen.
-Review *.init. 
-check scsi_reserve stuff
+Open packaging issues
+
+- add gnbd-source package containing the gnbd kernel module
+- make initscripts lsb-compliant
 
-broken init scripts
-
-E: gfs2-tools: init.d-script-does-not-implement-required-option 
/etc/init.d/gfs2-tools force-reload
-E: gfs-tools: init.d-script-does-not-implement-required-option 
/etc/init.d/gfs-tools force-reload
 W: rgmanager: init.d-script-missing-lsb-section /etc/init.d/rgmanager
 W: gnbd-server: init.d-script-missing-lsb-section /etc/init.d/gnbd-server
 W: gnbd-client: init.d-script-missing-lsb-section /etc/init.d/gnbd-client
@@ -13,13 +10,12 @@
 W: gfs-tools: init.d-script-missing-lsb-section /etc/init.d/gfs-tools
 W: cman: init.d-script-missing-lsb-section /etc/init.d/cman
 
-overrides?
+- lintian issues
 
 E: cman: shlib-with-executable-bit usr/lib/openais/lcrso/service_cman.lcrso 
0755
 W: rgmanager: executable-not-elf-or-script ./usr/share/cluster/ocf-shellfuncs
 
-
-upstream
+- fix manpages (check with upstream)
 
 W: libdlm-dev: manpage-has-bad-whatis-entry usr/share/man/man3/libdlm.3.gz
 W: gnbd-server: manpage-has-bad-whatis-entry usr/share/man/man8/gnbd.8.gz
@@ -29,8 +25,7 @@
 W: cman: manpage-has-bad-whatis-entry usr/share/man/man5/qdisk.5.gz
 W: cman: manpage-has-bad-whatis-entry usr/share/man/man8/fence.8.gz
 
-
-missing manpages
+- write missing manpages (check with upstream)
 
 W: rgmanager: binary-without-manpage usr/sbin/clunfslock
 W: rgmanager: binary-without-manpage usr/sbin/rg_test

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9916 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . patches

[Frederik Schüler]

Author: fs
Date: Fri Dec  7 22:38:10 2007
New Revision: 9916

Log:
Add module-assistant stuff


Added:
   dists/trunk/redhat-cluster/redhat-cluster/debian/control.modules.in
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-modules-_KVERS_.postinst
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.README.Debian
   dists/trunk/redhat-cluster/redhat-cluster/debian/modass.gfs-source
   
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/01_fix_gfs-kernel-makefile.dpatch
   (contents, props changed)
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/compat
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
   dists/trunk/redhat-cluster/redhat-cluster/debian/rules

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/compat
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/compat (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/compat Fri Dec  7 
22:38:10 2007
@@ -1 +1 @@
-4
+5

Added: dists/trunk/redhat-cluster/redhat-cluster/debian/control.modules.in
==
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/control.modules.in Fri Dec 
 7 22:38:10 2007
@@ -0,0 +1,26 @@
+Source: gfs
+Section: admin
+Priority: optional
+Maintainer: Debian Kernel Team [EMAIL PROTECTED]
+Uploaders: Bastian Blank [EMAIL PROTECTED], Frederik Schüler [EMAIL 
PROTECTED]
+Standards-Version: 3.7.3.0
+Build-Depends: debhelper ( 5.0.0), linux-headers-_KVERS_
+
+Package: gfs-modules-_KVERS_
+Section: admin
+Priority: optional
+Architecture: any
+Recommends: kernel-image-_KVERS_, gfs-tools
+Provides: gfs-modules
+Description: global file system kernel module
+ The Global File System 2 allows a cluster of machines to concurrently access
+ shared storage hardware like SANs or iSCSI and network block devices. GFS
+ can be deployed to build high available services without the single point
+ of failure a file server would be.
+ .
+ This package contains the compiled kernel module for _KVERS_
+ .
+ If you compiled a custom kernel, you will most likely need to compile a
+ custom version of this module as well. The gfs-source
+ package has been provided for this purpose.
+

Added: 
dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-modules-_KVERS_.postinst
==
--- (empty file)
+++ 
dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-modules-_KVERS_.postinst   
Fri Dec  7 22:38:10 2007
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+
+SYSTEMMAP=/boot/System.map-_KVERS_
+
+if [ -f $SYSTEMMAP ]
+then
+   depmod -ae -F $SYSTEMMAP _KVERS_
+elif [ `uname -r` = _KVERS_ ]
+then
+   depmod -a 
+fi
+
+#DEBHELPER#
+

Added: dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.README.Debian
==
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-source.README.Debian   
Fri Dec  7 22:38:10 2007
@@ -0,0 +1,28 @@
+GFS for Debian
+--
+
+o How do i build this module the debian way?
+
+- Building with module-assistant
+
+$ m-a -t a-i gfs
+
+(for kernel source or headers in non-standard directory, add the option 
+-k /path/to/kernel/source with the correct path)
+
+- Building with make-kpkg
+
+$ cd /usr/src/
+$ ta jxvf gfs.tar.bz2
+$ cd /usr/src/kernel-source-2.6.23-1-amd64
+$ make-kpkg --added-modules=gfs modules
+
+- Building without make-kpkg
+
+$ cd /usr/src/
+$ tar jxvf gfs.tar.bz2
+$ cd modules/gfs
+$ fakeroot debian/rules kdist_image
+
+(no fakeroot needed if you run this as root)
+

Added: dists/trunk/redhat-cluster/redhat-cluster/debian/modass.gfs-source
==
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/modass.gfs-source  Fri Dec 
 7 22:38:10 2007
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+MA_DIR=${MA_DIR:-/usr/share/modass}
+
+TARBALL=/usr/src/gfs.tar.bz2
+BUILDDIR=${MODULE_LOC:-/usr/src/modules}/gfs
+
+. $MA_DIR/packages/generic.sh
+
+$1 $@
+

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list 
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list Fri Dec 
 7 22:38:10 2007
@@ -1 +1,2 @@
 00_fix_gfs2_quota.dpatch
+01_fix_gfs-kernel-makefile.dpatch

Added: 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/01_fix_gfs-kernel-makefile.dpatch
==
--- (empty file)
+++ 
dists/trunk/redhat-cluster/redhat-cluster/debian/patches/01_fix_gfs-kernel-makefile.dpatch
  Fri Dec  7 22:38:10 2007
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run

[kernel] r9917 - in dists/sid/linux-2.6/debian: . patches/features/all patches/series

[Frederik Schüler]

Author: fs
Date: Fri Dec  7 22:53:52 2007
New Revision: 9917

Log:
Export gfs2 locking symbols required to build gfs1 module.


Added:
   
dists/sid/linux-2.6/debian/patches/features/all/export-gfs2-locking-symbols.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/2

Modified: dists/sid/linux-2.6/debian/changelog
==
--- dists/sid/linux-2.6/debian/changelog(original)
+++ dists/sid/linux-2.6/debian/changelogFri Dec  7 22:53:52 2007
@@ -7,7 +7,10 @@
   * [arm/iop32x] Use the new i2c framework to load rtc-rs5c372 for the
 GLAN Tank.
 
- -- Gordon Farquharson [EMAIL PROTECTED]  Thu,  6 Dec 2007 22:27:14 -0700
+  [ Frederik Schüler ]
+  * Export gfs2 locking symbols required to build gfs1 module.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Fri, 07 Dec 2007 23:52:23 +0100
 
 linux-2.6 (2.6.23-1) unstable; urgency=low
 

Added: 
dists/sid/linux-2.6/debian/patches/features/all/export-gfs2-locking-symbols.patch
==
--- (empty file)
+++ 
dists/sid/linux-2.6/debian/patches/features/all/export-gfs2-locking-symbols.patch
   Fri Dec  7 22:53:52 2007
@@ -0,0 +1,21 @@
+From: Amit Kucheria [EMAIL PROTECTED]
+Date: Fri, 29 Jun 2007 16:23:52 + (+0300)
+Subject: UBUNTU: Export symbols required to build GFS1 in LUM
+X-Git-Tag: Ubuntu-2.6.22-8.15
+X-Git-Url: 
http://kernel.ubuntu.com/git?p=ubuntu/ubuntu-gutsy.git;a=commitdiff;h=58139b9eb3cd66e923fecc030d990fd2f51511d7
+
+UBUNTU: Export symbols required to build GFS1 in LUM
+
+Signed-off-by: Amit Kucheria [EMAIL PROTECTED]
+---
+
+--- a/fs/gfs2/locking.c
 b/fs/gfs2/locking.c
+@@ -181,4 +181,7 @@ void gfs2_withdraw_lockproto(struct lm_l
+ 
+ EXPORT_SYMBOL_GPL(gfs2_register_lockproto);
+ EXPORT_SYMBOL_GPL(gfs2_unregister_lockproto);
++EXPORT_SYMBOL_GPL(gfs2_unmount_lockproto);
++EXPORT_SYMBOL_GPL(gfs2_mount_lockproto);
++EXPORT_SYMBOL_GPL(gfs2_withdraw_lockproto);
+ 

Modified: dists/sid/linux-2.6/debian/patches/series/2
==
--- dists/sid/linux-2.6/debian/patches/series/2 (original)
+++ dists/sid/linux-2.6/debian/patches/series/2 Fri Dec  7 22:53:52 2007
@@ -1 +1,2 @@
 + bugfix/arm/glantank-rtc.patch
++ features/all/export-gfs2-locking-symbols.patch

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9868 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . po

[Frederik Schüler]

  (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog  Mon Dec  3 
10:28:08 2007
@@ -2,5 +2,9 @@
 
   * First Debian release of the redhat cluster suite v2, based on the
 packaging by Fabio M. Di Nitto [EMAIL PROTECTED]
+  * Update copyright file.
+  * Fix maintainer scripts, add missing ones.
+  * Fix debconf template.
+  * Add gfs-source package containing the gfs1 kernel module
 
- -- Frederik Schüler [EMAIL PROTECTED]  Sun, 02 Dec 2007 17:14:52 +0100
+ -- Frederik Schüler [EMAIL PROTECTED]  Mon, 03 Dec 2007 11:23:01 +0100

Added: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postinst
==
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postinst  Mon Dec 
 3 10:28:08 2007
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+set -e
+
+case $1 in
+   configure)
+   . /usr/share/debconf/confmodule
+   db_get cman/upgrade-from-old
+   if [ $RET != true ] ; then
+   exit 1
+   fi
+   ;;
+   *)
+   echo postinst called with unknown argument \`$1' 12
+   exit 1
+   ;;
+esac
+
+#DEBHELPER#
+
+exit 0

Added: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postrm
==
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postrmMon Dec 
 3 10:28:08 2007
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+case $1 in
+   purge)
+   if [ -e /usr/share/debconf/confmodule ] ; then
+   . /usr/share/debconf/confmodule
+   db_purge
+   fi
+   ;;
+   
+   *)
+   echo prerm called with unknown argument \`$1' 2
+   exit 1
+   ;;
+
+esac
+
+
+#DEBHELPER#
+
+exit 0

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst   
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst   Mon Dec 
 3 10:28:08 2007
@@ -14,4 +14,6 @@
fi
 fi
 
+#DEBHELPER#
+
 exit 0

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates 
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates Mon Dec 
 3 10:28:08 2007
@@ -1,13 +1,13 @@
 Template: cman/upgrade-from-old
 Type: boolean
 Default: false
-_Description: Cluster Manager Upgrade
+_Description: Really upgrade Cluster Manager?
  An older version of cman installed on the system.
  .
  The version that is going to be installed is *NOT* compatible with the old
  one and will break the cluster horribly if not upgraded properly.
  .
- Check https://wiki.ubuntu.com/UpgradingClusterProcedure for the latest
+ Check https://wiki.debian.org/UpgradingClusterProcedure for the latest
  instructions on how to proceed.
  .
- Continue with the upgrade?
+ Select OK if you wish to continue with the upgrade.

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/controlMon Dec  3 
10:28:08 2007
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Kernel Team [EMAIL PROTECTED]
 Uploaders: Bastian Blank [EMAIL PROTECTED], Frederik Schüler [EMAIL 
PROTECTED]
-Standards-Version: 3.7.2.2
-Build-Depends: dpatch, debhelper (= 4.2.28), libxml2-dev, libncurses5-dev, 
libopenais-dev (= 0.82-1), libvolume-id-dev (=  0.105-4), linux-libc-dev (= 
2.6.22-6), libvirt-dev (= 0.3.0) [i386], libnss3-dev [i386], libnspr4-dev 
[i386]
+Standards-Version: 3.7.3.0
+Build-Depends: dpatch, debhelper (= 4.2.28), libxml2-dev, libncurses5-dev, 
libopenais-dev (= 0.82-2), libvolume-id-dev (=  0.105-4), linux-libc-dev (= 
2.6.22-6), libvirt-dev (= 0.3.0) [i386], libnss3-dev [i386], libnspr4-dev 
[i386], bzip2
 Build-Conflicts: libccs-dev, libcman-dev (= 2.0), libdlm-dev (= 2.0), 
libcman2, libdlm2
 
 Package: redhat-cluster-suite
@@ -20,7 +20,7 @@
 Architecture: any
 Section: admin
 Pre-Depends: debconf | debconf-2.0
-Depends: ${shlibs:Depends}, ${misc:Depends}, openais (= 0.82-0ubuntu1), 
gfs-modules
+Depends: ${shlibs:Depends}, python, openais (= 0.82-2), gfs-modules
 Conflicts: magma, libmagma1, libmagma-dev, ccs, fence, libiddev-dev, 
fence-gnbd, gulm, libgulm1, libgulm-dev, magma-plugins
 Replaces: ccs, fence, fence-gnbd
 Description: cluster manager
@@ -36,7 +36,7 @@
 Package: libcman2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends

[kernel] r9859 - dists/trunk/redhat-cluster/openais/debian

[Frederik Schüler]

Author: fs
Date: Sun Dec  2 14:28:16 2007
New Revision: 9859

Log:
Prepare for release


Modified:
   dists/trunk/redhat-cluster/openais/debian/changelog

Modified: dists/trunk/redhat-cluster/openais/debian/changelog
==
--- dists/trunk/redhat-cluster/openais/debian/changelog (original)
+++ dists/trunk/redhat-cluster/openais/debian/changelog Sun Dec  2 14:28:16 2007
@@ -1,4 +1,4 @@
-openais (0.82-1) UNRELEASED; urgency=low
+openais (0.82-1) unstable; urgency=low
 
   [ Bastian Blank ]
   * Drop unnecessary patches.
@@ -8,8 +8,8 @@
   * Add myself to uploaders.
   * Rediff 001_makefile.dpatch
   * Drop 002_fix_include_path.dpatch
-
- -- Frederik Schüler [EMAIL PROTECTED]  Sat, 01 Dec 2007 19:55:14 +0100
+  
+ -- Frederik Schüler [EMAIL PROTECTED]  Sun, 02 Dec 2007 15:27:15 +0100
 
 openais (0.81-1) unstable; urgency=low
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9860 - in dists/trunk/redhat-cluster/openais/debian: . patches

[Frederik Schüler]

Author: fs
Date: Sun Dec  2 20:14:50 2007
New Revision: 9860

Log:
Install openais/service/logsys.h too


Modified:
   dists/trunk/redhat-cluster/openais/debian/changelog
   dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch

Modified: dists/trunk/redhat-cluster/openais/debian/changelog
==
--- dists/trunk/redhat-cluster/openais/debian/changelog (original)
+++ dists/trunk/redhat-cluster/openais/debian/changelog Sun Dec  2 20:14:50 2007
@@ -1,3 +1,9 @@
+openais (0.82-2) UNRELEASED; urgency=low
+
+  * Install openais/service/logsys.h
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Sun, 02 Dec 2007 21:11:16 +0100
+
 openais (0.82-1) unstable; urgency=low
 
   [ Bastian Blank ]

Modified: dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch
==
--- dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch   
(original)
+++ dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch   
Sun Dec  2 20:14:50 2007
@@ -54,11 +54,13 @@
install -m 755 exec/aisexec $(DESTDIR)$(SBINDIR)
install -m 700 exec/keygen $(DESTDIR)$(SBINDIR)/ais-keygen
  
-@@ -138,7 +124,6 @@
+@@ -138,8 +124,8 @@
install -m 644 exec/service.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
install -m 644 exec/timer.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
install -m 644 exec/objdb.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
 -  install -m 644 exec/print.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
install -m 644 exec/config.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
++  install -m 644 exec/logsys.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
install -m 644 include/swab.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
install -m 644 man/*.3 $(DESTDIR)$(MANDIR)/man3
+   install -m 644 man/*.5 $(DESTDIR)$(MANDIR)/man5

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9867 - dists/trunk/redhat-cluster/openais/debian

[Frederik Schüler]

Author: fs
Date: Sun Dec  2 23:37:27 2007
New Revision: 9867

Log:
Release 0.82-2


Modified:
   dists/trunk/redhat-cluster/openais/debian/changelog

Modified: dists/trunk/redhat-cluster/openais/debian/changelog
==
--- dists/trunk/redhat-cluster/openais/debian/changelog (original)
+++ dists/trunk/redhat-cluster/openais/debian/changelog Sun Dec  2 23:37:27 2007
@@ -1,8 +1,8 @@
-openais (0.82-2) UNRELEASED; urgency=low
+openais (0.82-2) unstable; urgency=low
 
   * Install openais/service/logsys.h
 
- -- Frederik Schüler [EMAIL PROTECTED]  Sun, 02 Dec 2007 21:11:16 +0100
+ -- Frederik Schüler [EMAIL PROTECTED]  Mon, 03 Dec 2007 00:35:46 +0100
 
 openais (0.82-1) unstable; urgency=low
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9852 - in dists/trunk/redhat-cluster/openais/debian: . patches

[Frederik Schüler]

Author: fs
Date: Sat Dec  1 23:26:24 2007
New Revision: 9852

Log:
Package new upstream release 0.82
Add myself to uploaders
Rediff 001_makefile.dpatch, split out lcr path fix
Drop 002_fix_include_path.dpatch



Added:
   dists/trunk/redhat-cluster/openais/debian/patches/003_lcr-fixpath.dpatch   
(contents, props changed)
Modified:
   dists/trunk/redhat-cluster/openais/debian/changelog
   dists/trunk/redhat-cluster/openais/debian/control
   dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch
   dists/trunk/redhat-cluster/openais/debian/patches/00list

Modified: dists/trunk/redhat-cluster/openais/debian/changelog
==
--- dists/trunk/redhat-cluster/openais/debian/changelog (original)
+++ dists/trunk/redhat-cluster/openais/debian/changelog Sat Dec  1 23:26:24 2007
@@ -1,8 +1,15 @@
-openais (0.81-2) UNRELEASED; urgency=low
+openais (0.82-1) UNRELEASED; urgency=low
 
+  [ Bastian Blank ]
   * Drop unnecessary patches.
 
- -- Bastian Blank [EMAIL PROTECTED]  Sat, 22 Sep 2007 10:40:07 +0200
+  [ Frederik Schüler ]
+  * New upstream release (Closes: #453438)
+  * Add myself to uploaders.
+  * Rediff 001_makefile.dpatch
+  * Drop 002_fix_include_path.dpatch
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Sat, 01 Dec 2007 19:55:14 +0100
 
 openais (0.81-1) unstable; urgency=low
 

Modified: dists/trunk/redhat-cluster/openais/debian/control
==
--- dists/trunk/redhat-cluster/openais/debian/control   (original)
+++ dists/trunk/redhat-cluster/openais/debian/control   Sat Dec  1 23:26:24 2007
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Debian Kernel Team [EMAIL PROTECTED]
-Uploaders: Bastian Blank [EMAIL PROTECTED]
+Uploaders: Bastian Blank [EMAIL PROTECTED], Frederik Schüler [EMAIL 
PROTECTED]
 Standards-Version: 3.7.2
 Build-Depends: dpatch, debhelper ( 5)
 

Modified: dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch
==
--- dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch   
(original)
+++ dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch   
Sat Dec  1 23:26:24 2007
@@ -5,55 +5,60 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad openais~/Makefile openais/Makefile
 openais~/Makefile  2006-08-16 02:08:52.0 +0200
-+++ openais/Makefile   2007-05-31 10:05:58.012462012 +0200
-@@ -37,23 +37,9 @@
- INCLUDEDIR_SERVICE=/usr/include/openais/service
- MANDIR=/usr/share/man
- ETCDIR=/etc/ais
--LCRSODIR=/usr/libexec/lcrso
--ARCH=$(shell uname -p)
-+LCRSODIR=/usr/lib/openais/lcrso
- 
+--- openais/Makefile.old   2007-12-01 19:47:41.0 +0100
 openais/Makefile   2007-12-02 00:13:22.0 +0100
+@@ -38,23 +38,9 @@
+ INCLUDEDIR_SERVICE=$(PREFIX)/include/openais/service
+ MANDIR=$(PREFIX)/share/man
+ ETCDIR=/etc
+-LCRSODIR=$(PREFIX)/libexec/lcrso
+ ARCH=$(shell uname -p)
+-
 -ifeq (,$(findstring 64,$(ARCH)))
--LIBDIR=/usr/lib/openais
+-LIBDIR=$(PREFIX)/lib/openais
 -else
--LIBDIR=/usr/lib64/openais
+-LIBDIR=$(PREFIX)/lib64/openais
 -endif
 -ifeq (s390,$(ARCH))
- LIBDIR=/usr/lib/openais
+-LIBDIR=$(PREFIX)/lib/openais
 -endif
 -ifeq (s390x,$(ARCH))
--LIBDIR=/usr/lib64/openais
+-LIBDIR=$(PREFIX)/lib64/openais
 -endif
 -ifeq (ia64,$(ARCH))
--LIBDIR=/usr/lib/openais
++LCRSODIR=$(PREFIX)/lib/openais/lcrso
+ LIBDIR=$(PREFIX)/lib/openais
 -endif
  
  all:
(cd lcr; echo  `pwd` ===; $(MAKE) all);
-@@ -130,9 +116,9 @@
-   install -m 755 exec/libtotem_pg.a $(DESTDIR)$(LIBDIR)
- endif
+@@ -103,17 +89,17 @@
+   $(CP) -a lib/lib$$aLib.so $(DESTDIR)$(LIBDIR);  \
+   $(CP) -a lib/lib$$aLib.so.2 $(DESTDIR)$(LIBDIR);\
+   install -m 755 lib/lib$$aLib.so.2.* $(DESTDIR)$(LIBDIR);\
+-  if [ xNO = x$(STATICLIBS) ]; then   \
+-  install -m 755 lib/lib$$aLib.a $(DESTDIR)$(LIBDIR); \
++  if [ x = x$(STATICLIBS) ]; then \
++  $(CP) -a lib/lib$$aLib.a $(DESTDIR)$(LIBDIR);   \
+   if [ ${OPENAIS_COMPAT} = DARWIN ]; then   \
+   ranlib $(DESTDIR)$(LIBDIR)/lib$$aLib.a; \
+   fi  \
+   fi  \
+   done
  
--  echo $(LIBDIR)  $(DESTDIR)/etc/ld.so.conf.d/openais-$(ARCH).conf
-+  echo $(LIBDIR)  $(DESTDIR)/etc/ld.so.conf.d/openais.conf
+-  echo $(LIBDIR)  $(DESTDIR)$(ETCDIR)/ld.so.conf.d/openais-$(ARCH).conf
++  echo $(LIBDIR)  $(DESTDIR)$(ETCDIR)/ld.so.conf.d/openais.conf
  
 -  install -m 755 exec/*lcrso $(DESTDIR)$(LCRSODIR)
 +  install -m 644 exec/*lcrso $(DESTDIR)$(LCRSODIR)
- 
install -m 755 exec/aisexec $(DESTDIR)$(SBINDIR)
install -m 700 exec

[kernel] r9654 - in people/fs: firmware-0.1 linux-2.6

[Frederik Schüler]

Author: fs
Date: Sat Oct 13 20:43:02 2007
New Revision: 9654

Log:
delete old stuff


Removed:
   people/fs/firmware-0.1/
   people/fs/linux-2.6/

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9540 - dists/trunk/tgt/debian

[Frederik Schüler]

Author: fs
Date: Mon Sep 24 18:11:52 2007
New Revision: 9540

Log:
Prepare for release


Modified:
   dists/trunk/tgt/debian/changelog

Modified: dists/trunk/tgt/debian/changelog
==
--- dists/trunk/tgt/debian/changelog(original)
+++ dists/trunk/tgt/debian/changelogMon Sep 24 18:11:52 2007
@@ -1,7 +1,7 @@
-tgt (20070807-1) UNRELEASED; urgency=low
+tgt (20070924-1) unstable; urgency=low
 
   [ Frederik Schüler ]
   * Initial release (Closes: #436320)
 
- -- Frederik Schüler [EMAIL PROTECTED]  Tue, 07 Aug 2007 02:14:19 +0200
+ -- Frederik Schüler [EMAIL PROTECTED]  Mon, 24 Sep 2007 20:04:05 +0200
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9541 - dists/trunk/tgt/debian

[Frederik Schüler]

Author: fs
Date: Mon Sep 24 18:25:50 2007
New Revision: 9541

Log:
Fix lintian warnings and really release


Modified:
   dists/trunk/tgt/debian/control
   dists/trunk/tgt/debian/copyright
   dists/trunk/tgt/debian/rules

Modified: dists/trunk/tgt/debian/control
==
--- dists/trunk/tgt/debian/control  (original)
+++ dists/trunk/tgt/debian/control  Mon Sep 24 18:25:50 2007
@@ -22,9 +22,9 @@
  .
  Currently, tgt supports three target drivers:
  .
- - IBM VIO server (ibmvstgt)
- - iSCSI
- - Xen vscsifront/back
+  - IBM VIO server (ibmvstgt)
+  - iSCSI
+  - Xen vscsifront/back
  .
  Note that tgt is under active development. Don't play with important
  data.

Modified: dists/trunk/tgt/debian/copyright
==
--- dists/trunk/tgt/debian/copyright(original)
+++ dists/trunk/tgt/debian/copyrightMon Sep 24 18:25:50 2007
@@ -3,7 +3,7 @@
 
 It was downloaded from 
git://git.kernel.org/pub/scm/linux/kernel/git/tomo/tgt.git
 
-Upstream Author(s): 
+Upstream Authors: 
 
Mike Christie [EMAIL PROTECTED]
FUJITA Tomonori [EMAIL PROTECTED]

Modified: dists/trunk/tgt/debian/rules
==
--- dists/trunk/tgt/debian/rules(original)
+++ dists/trunk/tgt/debian/rulesMon Sep 24 18:25:50 2007
@@ -38,10 +38,13 @@
dh_installchangelogs 
dh_installdocs
dh_installman
+   dh_link
dh_strip
dh_compress
dh_fixperms
+   dh_makeshlibs
dh_installdeb
+   dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9515 - in dists/trunk/linux-2.6/debian: . config config/alpha config/amd64 config/arm config/hppa config/i386 config/ia64 config/m68k config/mips config/mipsel config/powerpc

[Frederik Schüler]

Author: fs
Date: Sat Sep 15 12:01:46 2007
New Revision: 9515

Log:
Move new global options into the global config file
Clean up new amd64 options



Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/alpha/config
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/arm/config.footbridge
   dists/trunk/linux-2.6/debian/config/arm/config.iop32x
   dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/config/arm/config.versatile
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/hppa/config
   dists/trunk/linux-2.6/debian/config/i386/config
   dists/trunk/linux-2.6/debian/config/ia64/config
   dists/trunk/linux-2.6/debian/config/m68k/config
   dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.qemu
   dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
   dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
   dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.qemu
   dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
   dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/config/powerpc/config.apus
   dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot

Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog  (original)
+++ dists/trunk/linux-2.6/debian/changelog  Sat Sep 15 12:01:46 2007
@@ -40,8 +40,10 @@
   [ Frederik Schüler ]
   * Move all PATA options into the global config file, exept PATA_ARTOP
 (arm/ixp4xx) and PATA_MPC52xx (powerpc).
+  * Move new global options into the global config file
+  * Clean up new amd64 options
 
- -- Frederik Schüler [EMAIL PROTECTED]  Sat, 15 Sep 2007 00:51:05 +0200
+ -- Frederik Schüler [EMAIL PROTECTED]  Sat, 15 Sep 2007 13:34:26 +0200
 
 linux-2.6 (2.6.22-2) UNRELEASED; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==
--- dists/trunk/linux-2.6/debian/config/alpha/config(original)
+++ dists/trunk/linux-2.6/debian/config/alpha/configSat Sep 15 12:01:46 2007
@@ -1361,6 +1361,5 @@
 CONFIG_STALLION=m
 CONFIG_ISTALLION=m
 CONFIG_I2C_ELEKTOR=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_MATHEMU=m
 # CONFIG_AUDIT is not set

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==
--- dists/trunk/linux-2.6/debian/config/amd64/config(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/configSat Sep 15 12:01:46 2007
@@ -421,7 +421,6 @@
 # CONFIG_AF_RXRPC_DEBUG is not set
 CONFIG_RXKAD=m
 
-CONFIG_NETDEVICES_MULTIQUEUE=m
 CONFIG_DUMMY=m
 CONFIG_NET_SB1000=m
 CONFIG_ARCNET=m
@@ -1346,3 +1345,50 @@
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_SYS_IMAGEBLIT=m
+CONFIG_VIDEO_IR_I2C=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_HOTPLUG=y
+CONFIG_EDAC_I5000=m
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_HAS_IOPORT=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_PM_SLEEP=y
+CONFIG_HIBERNATION_SMP_POSSIBLE=y
+CONFIG_HAS_DMA=y
+CONFIG_BASE_SMALL=0
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_QUICKLIST=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+CONFIG_ZONE_DMA=y
+CONFIG_HAS_IOMEM=y
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_PATA_ARTOP=m
+CONFIG_BOUNCE=y
+CONFIG_NR_QUICK=2
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_ACPI_BAY=m
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
+CONFIG_ASYNC_CORE=m
+CONFIG_MMU=y
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_PHYSICAL_ALIGN=0x20
+CONFIG_VIRT_TO_BUS=y
+CONFIG_BASE_FULL=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_SUSPEND_SMP_POSSIBLE=y
+CONFIG_BLK_DEV_IDEACPI=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_NETDEVICES_MULTIQUEUE=y

Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge
==
--- dists/trunk/linux-2.6/debian/config/arm/config.footbridge   (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge   Sat Sep 15 
12:01:46 2007
@@ -9,7

[kernel] r9506 - dists/trunk/linux-2.6/debian/config

[Frederik Schüler]

Author: fs
Date: Wed Sep 12 16:51:56 2007
New Revision: 9506

Log:
Disable CONFIG_SMCTR


Modified:
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/config/config
==
--- dists/trunk/linux-2.6/debian/config/config  (original)
+++ dists/trunk/linux-2.6/debian/config/config  Wed Sep 12 16:51:56 2007
@@ -1573,7 +1573,7 @@
 CONFIG_SKISA=m
 CONFIG_PROTEON=m
 CONFIG_ABYSS=m
-CONFIG_SMCTR=m
+# CONFIG_SMCTR is not set
 
 #
 # Wireless LAN

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9352 - in dists/etch/linux-2.6/debian: . patches/features/all/drivers patches/series

[Frederik Schüler]

Author: fs
Date: Thu Aug 23 10:07:32 2007
New Revision: 9352

Log:
Add support for 3ware 9650SE controllers.


Added:
   dists/etch/linux-2.6/debian/patches/features/all/drivers/3w-9560se.patch
Modified:
   dists/etch/linux-2.6/debian/changelog
   dists/etch/linux-2.6/debian/patches/series/14

Modified: dists/etch/linux-2.6/debian/changelog
==
--- dists/etch/linux-2.6/debian/changelog   (original)
+++ dists/etch/linux-2.6/debian/changelog   Thu Aug 23 10:07:32 2007
@@ -1,5 +1,6 @@
 linux-2.6 (2.6.18.dfsg.1-14) UNRELEASED; urgency=high
 
+  [ dann frazier ]
   * Update abi reference files for ABI 5
   * [bluetooth] Fix panic caused by race between RFCOMM socket layer and
 RFCOMM TTY layer. Thanks to Mikko Rapeli. (closes: #394742)
@@ -11,7 +12,10 @@
   * Fix intel-agp hang on large memory systems. (closes: #438458)
 ***THIS PATCH HAS NOT YET BEEN VERIFIED TO FIX THIS BUG***
 
- -- dann frazier [EMAIL PROTECTED]  Tue, 21 Aug 2007 18:46:53 -0600
+  [ Frederik Schüler ]
+  * Add support for 3ware 9650SE controllers.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Wed, 22 Aug 2007 21:54:29 +0200
 
 linux-2.6 (2.6.18.dfsg.1-13etch1) stable-security; urgency=high
 

Added: dists/etch/linux-2.6/debian/patches/features/all/drivers/3w-9560se.patch
==
--- (empty file)
+++ dists/etch/linux-2.6/debian/patches/features/all/drivers/3w-9560se.patch
Thu Aug 23 10:07:32 2007
@@ -0,0 +1,416 @@
+--- a/drivers/scsi/3w-9xxx.h   2006-09-20 05:42:06.0 +0200
 b/drivers/scsi/3w-9xxx.h   2007-07-09 01:32:17.0 +0200
+@@ -289,7 +289,6 @@
+ #define TW_STATUS_VALID_INTERRUPT  0x00DF
+ 
+ /* PCI related defines */
+-#define TW_NUMDEVICES 1
+ #define TW_PCI_CLEAR_PARITY_ERRORS 0xc100
+ #define TW_PCI_CLEAR_PCI_ABORT 0x2000
+ 
+@@ -335,6 +334,7 @@
+ #define TW_ALIGNMENT_9000 4  /* 4 bytes */
+ #define TW_ALIGNMENT_9000_SGL 0x3
+ #define TW_MAX_UNITS16
++#define TW_MAX_UNITS_9650SE 32
+ #define TW_INIT_MESSAGE_CREDITS 0x100
+ #define TW_INIT_COMMAND_PACKET_SIZE 0x3
+ #define TW_INIT_COMMAND_PACKET_SIZE_EXTENDED  0x6
+@@ -354,7 +354,6 @@
+ #define TW_MAX_RESPONSE_DRAIN   256
+ #define TW_MAX_AEN_DRAIN40
+ #define TW_IN_RESET   2
+-#define TW_IN_CHRDEV_IOCTL3
+ #define TW_IN_ATTENTION_LOOP4
+ #define TW_MAX_SECTORS256
+ #define TW_AEN_WAIT_TIME  1000
+@@ -417,6 +416,9 @@
+ #ifndef PCI_DEVICE_ID_3WARE_9550SX
+ #define PCI_DEVICE_ID_3WARE_9550SX 0x1003
+ #endif
++#ifndef PCI_DEVICE_ID_3WARE_9650SE
++#define PCI_DEVICE_ID_3WARE_9650SE 0x1004
++#endif
+ 
+ /* Bitmask macros to eliminate bitfields */
+ 
+@@ -442,6 +444,7 @@
+ #define TW_CONTROL_REG_ADDR(x) (x-base_addr)
+ #define TW_STATUS_REG_ADDR(x) ((unsigned char __iomem *)x-base_addr + 0x4)
+ #define TW_COMMAND_QUEUE_REG_ADDR(x) (sizeof(dma_addr_t)  4 ? ((unsigned 
char __iomem *)x-base_addr + 0x20) : ((unsigned char __iomem *)x-base_addr + 
0x8))
++#define TW_COMMAND_QUEUE_REG_ADDR_LARGE(x) ((unsigned char __iomem 
*)x-base_addr + 0x20)
+ #define TW_RESPONSE_QUEUE_REG_ADDR(x) ((unsigned char __iomem *)x-base_addr 
+ 0xC)
+ #define TW_RESPONSE_QUEUE_REG_ADDR_LARGE(x) ((unsigned char __iomem 
*)x-base_addr + 0x30)
+ #define TW_CLEAR_ALL_INTERRUPTS(x) (writel(TW_STATUS_VALID_INTERRUPT, 
TW_CONTROL_REG_ADDR(x)))
+@@ -626,6 +629,9 @@
+   unsigned short driver_srl_low;
+   unsigned short driver_branch_low;
+   unsigned short driver_build_low;
++  unsigned short fw_on_ctlr_srl;
++  unsigned short fw_on_ctlr_branch;
++  unsigned short fw_on_ctlr_build;
+ } TW_Compatibility_Info;
+ 
+ #pragma pack()
+@@ -668,9 +674,7 @@
+   wait_queue_head_t   ioctl_wqueue;
+   struct mutexioctl_lock;
+   charaen_clobber;
+-  unsigned short  working_srl;
+-  unsigned short  working_branch;
+-  unsigned short  working_build;
++  TW_Compatibility_Info   tw_compat_info;
+ } TW_Device_Extension;
+ 
+ #endif /* _3W_9XXX_H */
+--- a/drivers/scsi/3w-9xxx.c   2006-09-20 05:42:06.0 +0200
 b/drivers/scsi/3w-9xxx.c   2007-07-09 01:32:17.0 +0200
+@@ -66,6 +66,9 @@
+2.26.02.006 - Fix 9550SX pchip reset timeout.
+  Add big endian support.
+2.26.02.007 - Disable local interrupts during kmap/unmap_atomic().
++   2.26.02.008 - Free irq handler in __twa_shutdown().
++ Serialize reset code.
++ Add support for 9650SE controllers.
+ */
+ 
+ #include linux/module.h
+@@ -89,7 +92,7 @@
+ #include 3w-9xxx.h
+ 
+ /* Globals */
+-#define TW_DRIVER_VERSION 2.26.02.007
++#define TW_DRIVER_VERSION 2.26.02.008
+ static

[kernel] r9367 - dists/etch/linux-2.6/debian

[Frederik Schüler]

Author: fs
Date: Thu Aug 23 22:06:17 2007
New Revision: 9367

Log:
Add bugnumber: 9650se support requested in #402562


Modified:
   dists/etch/linux-2.6/debian/changelog

Modified: dists/etch/linux-2.6/debian/changelog
==
--- dists/etch/linux-2.6/debian/changelog   (original)
+++ dists/etch/linux-2.6/debian/changelog   Thu Aug 23 22:06:17 2007
@@ -13,7 +13,7 @@
 ***THIS PATCH HAS NOT YET BEEN VERIFIED TO FIX THIS BUG***
 
   [ Frederik Schüler ]
-  * Add support for 3ware 9650SE controllers.
+  * Add support for 3ware 9650SE controllers. (closes: #402562)
 
  -- Frederik Schüler [EMAIL PROTECTED]  Wed, 22 Aug 2007 21:54:29 +0200
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9343 - in dists/trunk/redhat-cluster/openais/debian: . patches

[Frederik Schüler]

Author: fs
Date: Tue Aug 21 11:17:17 2007
New Revision: 9343

Log:
New upstream release.
Drop 002_fix_include_path.dpatch, fixed upstream.
Do not install README.recovery, removed upstream.



Removed:
   dists/trunk/redhat-cluster/openais/debian/patches/002_fix_include_path.dpatch
Modified:
   dists/trunk/redhat-cluster/openais/debian/changelog
   dists/trunk/redhat-cluster/openais/debian/openais.docs
   dists/trunk/redhat-cluster/openais/debian/patches/00list

Modified: dists/trunk/redhat-cluster/openais/debian/changelog
==
--- dists/trunk/redhat-cluster/openais/debian/changelog (original)
+++ dists/trunk/redhat-cluster/openais/debian/changelog Tue Aug 21 11:17:17 2007
@@ -1,4 +1,12 @@
-openais (0.81-1) unstable; urgency=low
+openais (0.80.2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Drop 002_fix_include_path.dpatch, fixed upstream.
+  * Do not install README.recovery, removed upstream.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Tue, 21 Aug 2007 13:10:25 +0200
+
+openais (0.80.1-1) unstable; urgency=low
 
   * Initial Release (closes: #421816).
 - Pull tarball from Ubuntu.

Modified: dists/trunk/redhat-cluster/openais/debian/openais.docs
==
--- dists/trunk/redhat-cluster/openais/debian/openais.docs  (original)
+++ dists/trunk/redhat-cluster/openais/debian/openais.docs  Tue Aug 21 
11:17:17 2007
@@ -1,4 +1,3 @@
 QUICKSTART
 README.amf
-README.recovery
 SECURITY

Modified: dists/trunk/redhat-cluster/openais/debian/patches/00list
==
--- dists/trunk/redhat-cluster/openais/debian/patches/00list(original)
+++ dists/trunk/redhat-cluster/openais/debian/patches/00listTue Aug 21 
11:17:17 2007
@@ -1,2 +1 @@
 001_makefile
-002_fix_include_path

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9344 - dists/trunk/redhat-cluster/openais/debian/patches

[Frederik Schüler]

Author: fs
Date: Tue Aug 21 18:01:00 2007
New Revision: 9344

Log:
Add exec/timer.h include


Modified:
   dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch

Modified: dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch
==
--- dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch   
(original)
+++ dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch   
Tue Aug 21 18:01:00 2007
@@ -97,6 +97,14 @@
  
install -m 755 exec/aisexec $(DESTDIR)$(SBINDIR)
install -m 700 exec/keygen $(DESTDIR)$(SBINDIR)/ais-keygen
+@@ -189,6 +175,7 @@
+   install -m 644 exec/objdb.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+   install -m 644 exec/print.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+   install -m 644 exec/config.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
++  install -m 644 exec/timer.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+   install -m 644 include/swab.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+   install -m 644 man/*.3 $(DESTDIR)$(MANDIR)/man3
+   install -m 644 man/*.5 $(DESTDIR)$(MANDIR)/man5
 diff -urNad openais~/lcr/lcr_ifact.c openais/lcr/lcr_ifact.c
 --- openais~/lcr/lcr_ifact.c   2007-03-12 18:28:44.0 +0100
 +++ openais/lcr/lcr_ifact.c2007-05-31 10:05:22.220462012 +0200

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9333 - dists/trunk/tgt

[Frederik Schüler]

Author: fs
Date: Mon Aug 20 16:28:19 2007
New Revision: 9333

Log:
Move linux target tree to trunk


Added:
   dists/trunk/tgt/
  - copied from r9332, /people/fs/tgt/

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r9283 - in people/fs/tgt: . debian

[Frederik Schüler]

Author: fs
Date: Tue Aug  7 00:16:46 2007
New Revision: 9283

Log:
First draft of tgt debian dir


Added:
   people/fs/tgt/
   people/fs/tgt/debian/
   people/fs/tgt/debian/changelog
   people/fs/tgt/debian/compat
   people/fs/tgt/debian/control
   people/fs/tgt/debian/copyright
   people/fs/tgt/debian/dirs
   people/fs/tgt/debian/docs
   people/fs/tgt/debian/rules   (contents, props changed)
   people/fs/tgt/debian/tgt.install
   people/fs/tgt/debian/tgt.manpages

Added: people/fs/tgt/debian/changelog
==
--- (empty file)
+++ people/fs/tgt/debian/changelog  Tue Aug  7 00:16:46 2007
@@ -0,0 +1,7 @@
+tgt (20070807-1) UNRELEASED; urgency=low
+
+  [ Frederik Schüler ]
+  * Initial release (Closes: #436320)
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Tue, 07 Aug 2007 02:14:19 +0200
+

Added: people/fs/tgt/debian/compat
==
--- (empty file)
+++ people/fs/tgt/debian/compat Tue Aug  7 00:16:46 2007
@@ -0,0 +1 @@
+5

Added: people/fs/tgt/debian/control
==
--- (empty file)
+++ people/fs/tgt/debian/controlTue Aug  7 00:16:46 2007
@@ -0,0 +1,31 @@
+Source: tgt
+Section: net
+Priority: optional
+Maintainer: Debian Kernel Team [EMAIL PROTECTED]
+Uploaders: Frederik Schüler [EMAIL PROTECTED]
+Build-Depends: debhelper (= 5), libssl-dev
+Standards-Version: 3.7.2
+
+Package: tgt
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Linux target framework user-space tools
+ Linux target framework (tgt) aims to simplify various SCSI target
+ driver (iSCSI, Fibre Channel, SRP, etc) creation and maintenance.
+ .
+ Tgt consists of kernel modules, user-space daemon, and user-space
+ tools. Some target drivers uses all of them and some use only
+ user-space daemon and tools (i.e. they completely runs in user space).
+ .
+ This package contains the user-space daemon and tools, a recent Linux
+ kernel is required for the modules.
+ .
+ Currently, tgt supports three target drivers:
+ .
+ - IBM VIO server (ibmvstgt)
+ - iSCSI
+ - Xen vscsifront/back
+ .
+ Note that tgt is under active development. Don't play with important
+ data.
+

Added: people/fs/tgt/debian/copyright
==
--- (empty file)
+++ people/fs/tgt/debian/copyright  Tue Aug  7 00:16:46 2007
@@ -0,0 +1,36 @@
+This package was debianized by Frederik Schüler [EMAIL PROTECTED] on
+Tue, 07 Aug 2007 01:33:34 +0200.
+
+It was downloaded from 
git://git.kernel.org/pub/scm/linux/kernel/git/tomo/tgt.git
+
+Upstream Author(s): 
+
+   Mike Christie [EMAIL PROTECTED]
+   FUJITA Tomonori [EMAIL PROTECTED]
+
+Copyright: 
+
+Copyright (C) 2005-2007 Name FUJITA Tomonori and Mike Christie
+
+License:
+
+This package is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+ 
+This package is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+ 
+You should have received a copy of the GNU General Public License
+along with this package; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2007, Frederik Schüler [EMAIL PROTECTED] and
+is licensed under the GPL, see above.
+

Added: people/fs/tgt/debian/dirs
==
--- (empty file)
+++ people/fs/tgt/debian/dirs   Tue Aug  7 00:16:46 2007
@@ -0,0 +1 @@
+usr/sbin

Added: people/fs/tgt/debian/docs
==
--- (empty file)
+++ people/fs/tgt/debian/docs   Tue Aug  7 00:16:46 2007
@@ -0,0 +1,7 @@
+README
+doc/README.ibmvstgt
+doc/README.iscsi
+doc/README.lu_configuration
+doc/README.passthrough
+doc/TODO
+doc/tmf.txt

Added: people/fs/tgt/debian/rules
==
--- (empty file)
+++ people/fs/tgt/debian/rules  Tue Aug  7 00:16:46 2007
@@ -0,0 +1,50 @@
+#!/usr/bin/make -f
+#export DH_VERBOSE=1
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+   CFLAGS += -O0
+else
+   CFLAGS += -O2
+endif
+
+build: build-stamp
+
+build-stamp: 
+   dh_testdir
+   $(MAKE) -C usr/ ISCSI=1
+   touch $@
+
+clean:
+   dh_testdir
+   dh_testroot
+   rm -f build-stamp

[kernel] r8854 - people/waldi/redhat-cluster/openais/debian

[Frederik Schüler]

Author: fs
Date: Fri Jun  1 11:01:41 2007
New Revision: 8854

Log:
add maintainer scripts to handle the openais system user


Added:
   people/waldi/redhat-cluster/openais/debian/openais.postinst
   people/waldi/redhat-cluster/openais/debian/openais.postrm

Added: people/waldi/redhat-cluster/openais/debian/openais.postinst
==
--- (empty file)
+++ people/waldi/redhat-cluster/openais/debian/openais.postinst Fri Jun  1 
11:01:41 2007
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+db_version 2.0
+
+case $1 in
+   configure)
+
+   if ! getent passwd Debian-ais  /dev/null ; then
+   echo 'Adding system-user for openais' 12
+   adduser --system --group --home /var/lib/openais \
+   --no-create-home --disabled-login \
+   --force-badname Debian-ais  /dev/null
+   fi
+
+   chown Debian-ais:Debian-ais /var/lib/openais
+   chown Debian-ais:Debian-ais /var/log/openais
+
+   ;;
+esac
+
+
+# vim:tw=72

Added: people/waldi/redhat-cluster/openais/debian/openais.postrm
==
--- (empty file)
+++ people/waldi/redhat-cluster/openais/debian/openais.postrm   Fri Jun  1 
11:01:41 2007
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case $1 in
+   purge)
+   userdel  Debian-ais /dev/null 21 || true
+   groupdel Debian-ais /dev/null 21 || true
+   ;;
+esac
+
+

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r8324 - in dists/trunk/linux-2.6/debian/patches: bugfix series

[Frederik Schüler]

Author: fs
Date: Sun Feb 25 17:22:30 2007
New Revision: 8324

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/forcedeth-napi-broken.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
Make FORCEDETH_NAPI depend on BROKEN.


Added: dists/trunk/linux-2.6/debian/patches/bugfix/forcedeth-napi-broken.patch
==
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/forcedeth-napi-broken.patch 
Sun Feb 25 17:22:30 2007
@@ -0,0 +1,12 @@
+diff -ruN a/drivers/net/Kconfig b/drivers/net/Kconfig
+--- a/drivers/net/Kconfig  2007-02-04 19:44:54.0 +0100
 b/drivers/net/Kconfig  2007-02-25 01:47:11.0 +0100
+@@ -1438,7 +1438,7 @@
+ 
+ config FORCEDETH_NAPI
+   bool Use Rx and Tx Polling (NAPI) (EXPERIMENTAL)
+-  depends on FORCEDETH  EXPERIMENTAL
++  depends on FORCEDETH  EXPERIMENTAL  BROKEN
+   help
+ NAPI is a new driver API designed to reduce CPU and interrupt load
+ when the driver is receiving lots of packets from the card. It is

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1Sun Feb 
25 17:22:30 2007
@@ -34,3 +34,4 @@
 + bugfix/alpha/asm-subarchs.patch
 + bugfix/powerpc/drivers_macintosh-broken.patch
 + bugfix/sparc/drivers_net-broken.patch
++ bugfix/forcedeth-napi-broken.patch

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r8278 - in dists/trunk/linux-2.6/debian/arch: _vserver amd64

[Frederik Schüler]

Author: fs
Date: Tue Feb  6 15:32:42 2007
New Revision: 8278

Modified:
   dists/trunk/linux-2.6/debian/arch/_vserver/config
   dists/trunk/linux-2.6/debian/arch/amd64/defines
Log:
Activate vserver on amd64
enable UTS_NS on vserver flavours


Modified: dists/trunk/linux-2.6/debian/arch/_vserver/config
==
--- dists/trunk/linux-2.6/debian/arch/_vserver/config   (original)
+++ dists/trunk/linux-2.6/debian/arch/_vserver/config   Tue Feb  6 15:32:42 2007
@@ -18,3 +18,6 @@
 # CONFIG_PROPAGATE is not set
 CONFIG_VSERVER_PRIVACY=y
 # CONFIG_VSERVER_DEBUG is not set
+CONFIG_VSERVER_HARDCPU=y
+CONFIG_VSERVER_HARDCPU_IDLE=y
+CONFIG_UTS_NS=y

Modified: dists/trunk/linux-2.6/debian/arch/amd64/defines
==
--- dists/trunk/linux-2.6/debian/arch/amd64/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/defines Tue Feb  6 15:32:42 2007
@@ -4,7 +4,7 @@
 kernel-arch: x86_64
 kernel-header-dirs: x86_64 i386
 subarches:
-# vserver
+ vserver
 # xen
 # xen-vserver
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r8279 - dists/trunk/linux-2.6/debian/arch/i386

[Frederik Schüler]

Author: fs
Date: Tue Feb  6 15:33:04 2007
New Revision: 8279

Modified:
   dists/trunk/linux-2.6/debian/arch/i386/defines
Log:
Enable vserver on i386 too


Modified: dists/trunk/linux-2.6/debian/arch/i386/defines
==
--- dists/trunk/linux-2.6/debian/arch/i386/defines  (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/defines  Tue Feb  6 15:33:04 2007
@@ -7,7 +7,7 @@
 kernel-arch: i386
 kernel-header-dirs: i386
 subarches:
-# vserver
+ vserver
 # xen
 # xen-vserver
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r8280 - dists/trunk/linux-2.6/debian/arch/_vserver

[Frederik Schüler]

Author: fs
Date: Tue Feb  6 16:31:41 2007
New Revision: 8280

Modified:
   dists/trunk/linux-2.6/debian/arch/_vserver/config
Log:
Remove double VSERVER_HARDCPU setting


Modified: dists/trunk/linux-2.6/debian/arch/_vserver/config
==
--- dists/trunk/linux-2.6/debian/arch/_vserver/config   (original)
+++ dists/trunk/linux-2.6/debian/arch/_vserver/config   Tue Feb  6 16:31:41 2007
@@ -18,6 +18,4 @@
 # CONFIG_PROPAGATE is not set
 CONFIG_VSERVER_PRIVACY=y
 # CONFIG_VSERVER_DEBUG is not set
-CONFIG_VSERVER_HARDCPU=y
-CONFIG_VSERVER_HARDCPU_IDLE=y
 CONFIG_UTS_NS=y

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r8268 - in dists/trunk/linux-2.6/debian: arch arch/alpha arch/amd64 arch/i386 arch/ia64 arch/powerpc patches/series

[Frederik Schüler]

Author: fs
Date: Mon Feb  5 20:34:06 2007
New Revision: 8268

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
Update generic and amd64 options.


Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==
--- dists/trunk/linux-2.6/debian/arch/alpha/config  (original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config  Mon Feb  5 20:34:06 2007
@@ -638,7 +638,6 @@
 CONFIG_DLCI_COUNT=24
 CONFIG_DLCI_MAX=8
 CONFIG_SDLA=m
-CONFIG_WAN_ROUTER_DRIVERS=y
 CONFIG_CYCLADES_SYNC=m
 CONFIG_CYCLOMX_X25=y
 CONFIG_LAPBETHER=m

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==
--- dists/trunk/linux-2.6/debian/arch/amd64/config  (original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config  Mon Feb  5 20:34:06 2007
@@ -554,7 +554,6 @@
 CONFIG_DLCI=m
 CONFIG_DLCI_COUNT=24
 CONFIG_DLCI_MAX=8
-CONFIG_WAN_ROUTER_DRIVERS=y
 CONFIG_CYCLADES_SYNC=m
 CONFIG_CYCLOMX_X25=y
 CONFIG_LAPBETHER=m
@@ -1439,3 +1438,11 @@
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_BLK_DEV_IDEPNP=y
 CONFIG_USB_APPLETOUCH=m
+CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+# CONFIG_HZ_300 is not set
+# CONFIG_MCORE2 is not set
+CONFIG_KVM_AMD=m
+CONFIG_IOMAP_COPY=y
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set

Modified: dists/trunk/linux-2.6/debian/arch/config
==
--- dists/trunk/linux-2.6/debian/arch/config(original)
+++ dists/trunk/linux-2.6/debian/arch/configMon Feb  5 20:34:06 2007
@@ -1261,3 +1261,81 @@
 CONFIG_HDLC_PPP=m
 CONFIG_HDLC_CISCO=m
 CONFIG_HDLC_FR=m
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK=m
+CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CRYPTO_LRW=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_NET_SCH_FIFO=y
+CONFIG_NF_CONNTRACK_SUPPORT=y
+CONFIG_NETXEN_NIC=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_PC87413_WDT=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_IP_DCCP_CCID3_RTO=100
+CONFIG_MTD_BLKDEVS=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+# CONFIG_MTD_ESB2ROM is not set
+CONFIG_USB_SERIAL_DEBUG=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+# CONFIG_DLM_SCTP is not set
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_DVB_TUNER_LGH06XF=m
+CONFIG_HID=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_SENSORS_PC87427=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_GENERIC_BUG=y
+CONFIG_SCSI_SRP=m
+CONFIG_NF_CONNTRACK_IPV4=m
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_DLM_TCP=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_MOXA_SMARTIO_NEW=m
+CONFIG_NF_CT_ACCT=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_BITREVERSE=y
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_AC97_BUS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SIP=m
+# CONFIG_MTD_CK804XROM is not set
+# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_SENSORS_W83793=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_NAT=m
+CONFIG_PATA_MARVELL=m
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_MTD_NAND_CAFE=m
+# CONFIG_ITCO_VENDOR_SUPPORT is not set
+CONFIG_USB_TOUCHSCREEN_DMC_TSC10=y
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_WAN_ROUTER_DRIVERS=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==
--- dists/trunk/linux-2.6/debian/arch/i386/config   (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config   Mon Feb  5 20:34:06 2007
@@ -705,7 +705,6 @@
 CONFIG_DLCI_COUNT=24
 CONFIG_DLCI_MAX=8
 CONFIG_SDLA=m
-CONFIG_WAN_ROUTER_DRIVERS=y
 CONFIG_CYCLADES_SYNC=m
 CONFIG_CYCLOMX_X25=y
 CONFIG_LAPBETHER=m

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
==
--- dists/trunk/linux-2.6/debian/arch/ia64/config   (original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config   Mon Feb  5 20:34:06 2007
@@ -533,7 +533,6 @@
 CONFIG_DLCI=m
 

[kernel] r8269 - in dists/trunk/linux-2.6/debian/patches: bugfix series

[Frederik Schüler]

Author: fs
Date: Mon Feb  5 20:50:51 2007
New Revision: 8269

Modified:
   dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
rediff drivers-bus_to_virt.patch


Modified: dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch
==
--- dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch   
(original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch   
Mon Feb  5 20:50:51 2007
@@ -1,8 +1,7 @@
-diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
-index 3368745..ed842ad 100644
 a/drivers/atm/Kconfig
-+++ b/drivers/atm/Kconfig
-@@ -139,7 +139,7 @@ config ATM_ENI_BURST_RX_2W
+diff -ruN a/drivers/atm/Kconfig b/drivers/atm/Kconfig
+--- a/drivers/atm/Kconfig  2007-02-04 19:44:54.0 +0100
 b/drivers/atm/Kconfig  2007-02-05 20:45:33.0 +0100
+@@ -139,7 +139,7 @@
  
  config ATM_FIRESTREAM
tristate Fujitsu FireStream (FS50/FS155) 
@@ -11,7 +10,7 @@
help
  Driver for the Fujitsu FireStream 155 (MB86697) and
  FireStream 50 (MB86695) ATM PCI chips.
-@@ -149,7 +149,7 @@ config ATM_FIRESTREAM
+@@ -149,7 +149,7 @@
  
  config ATM_ZATM
tristate ZeitNet ZN1221/ZN1225
@@ -20,7 +19,7 @@
help
  Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM
  adapters.
-@@ -237,7 +237,7 @@ config ATM_IDT77252_USE_SUNI
+@@ -237,7 +237,7 @@
  
  config ATM_AMBASSADOR
tristate Madge Ambassador (Collage PCI 155 Server)
@@ -29,7 +28,7 @@
select BITREVERSE
help
  This is a driver for ATMizer based ATM card produced by Madge
-@@ -262,7 +262,7 @@ config ATM_AMBASSADOR_DEBUG
+@@ -262,7 +262,7 @@
  
  config ATM_HORIZON
tristate Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 
Client)
@@ -38,11 +37,10 @@
help
  This is a driver for the Horizon chipset ATM adapter cards once
  produced by Madge Networks Ltd. Say Y (or M to compile as a module
-diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
-index 58c1deb..4067086 100644
 a/drivers/block/Kconfig
-+++ b/drivers/block/Kconfig
-@@ -141,7 +141,7 @@ source drivers/block/paride/Kconfig
+diff -ruN a/drivers/block/Kconfig b/drivers/block/Kconfig
+--- a/drivers/block/Kconfig2007-02-04 19:44:54.0 +0100
 b/drivers/block/Kconfig2007-02-05 20:45:33.0 +0100
+@@ -141,7 +141,7 @@
  
  config BLK_CPQ_DA
tristate Compaq SMART2 support
@@ -51,11 +49,10 @@
help
  This is the driver for Compaq Smart Array controllers.  Everyone
  using these boards should say Y here.  See the file
-diff --git a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig
-index 6443392..dee6e54 100644
 a/drivers/message/i2o/Kconfig
-+++ b/drivers/message/i2o/Kconfig
-@@ -56,7 +56,7 @@ config I2O_EXT_ADAPTEC_DMA64
+diff -ruN a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig
+--- a/drivers/message/i2o/Kconfig  2007-02-04 19:44:54.0 +0100
 b/drivers/message/i2o/Kconfig  2007-02-05 20:45:33.0 +0100
+@@ -56,7 +56,7 @@
  
  config I2O_CONFIG
tristate I2O Configuration support
@@ -64,24 +61,22 @@
---help---
  Say Y for support of the configuration interface for the I2O adapters.
  If you have a RAID controller from Adaptec and you want to use the
-diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
-index 8aa8dd0..9f65883 100644
 a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -1469,7 +1469,7 @@ config CS89x0
+diff -ruN a/drivers/net/Kconfig b/drivers/net/Kconfig
+--- a/drivers/net/Kconfig  2007-02-05 20:44:50.0 +0100
 b/drivers/net/Kconfig  2007-02-05 20:45:33.0 +0100
+@@ -1469,7 +1469,7 @@
  
  config TC35815
tristate TOSHIBA TC35815 Ethernet support
 -  depends on NET_PCI  PCI  TOSHIBA_JMR3927
 +  depends on NET_PCI  PCI  TOSHIBA_JMR3927  !PPC64
  
- config DGRS
-   tristate Digi Intl. RightSwitch SE-X support
-diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
-index 21f76f5..14799d6 100644
 a/drivers/net/wan/Kconfig
-+++ b/drivers/net/wan/Kconfig
-@@ -62,7 +62,7 @@ config COSA
+ config EEPRO100
+   tristate EtherExpressPro/100 support (eepro100, original Becker 
driver)
+diff -ruN a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
+--- a/drivers/net/wan/Kconfig  2007-02-04 19:44:54.0 +0100
 b/drivers/net/wan/Kconfig  2007-02-05 20:45:33.0 +0100
+@@ -62,7 +62,7 @@
  #
  config LANMEDIA
tristate LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards
@@ -90,11 +85,10 @@
---help---
  Driver for the following Lan Media family of serial boards:
  
-diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
-index 60f5827..96b1e8a 100644
 a/drivers/scsi/Kconfig
-+++ 

[kernel] r8270 - dists/trunk/linux-2.6/debian/arch/i386

[Frederik Schüler]

Author: fs
Date: Mon Feb  5 20:55:19 2007
New Revision: 8270

Modified:
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/i386/config.686
Log:
Update i386 options


Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==
--- dists/trunk/linux-2.6/debian/arch/i386/config   (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config   Mon Feb  5 20:55:19 2007
@@ -1525,9 +1525,6 @@
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_IPOIB=m
-CONFIG_KVM=m   
-CONFIG_KVM_INTEL=m 
-CONFIG_KVM_AMD=m   
 CONFIG_JBD=m
 CONFIG_XFS_RT=y
 # CONFIG_HUGETLBFS is not set
@@ -1688,3 +1685,21 @@
 CONFIG_SENSORS_K8TEMP=m
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_SCSI_ARCMSR=m
+CONFIG_CRYPTO_TWOFISH_586=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_SERIAL_8250_EXAR_ST16C554=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+# CONFIG_HZ_300 is not set
+# CONFIG_RELOCATABLE is not set
+# CONFIG_MCORE2 is not set
+CONFIG_IOMAP_COPY=y
+CONFIG_PATA_WINBOND_VLB=m
+CONFIG_CRYPTO_DEV_GEODE=m
+# CONFIG_FB_GEODE_GX_SET_FBSIZE is not set
+CONFIG_PHYSICAL_ALIGN=0x10
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_PARAVIRT=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_LEDS_WRAP=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.686
==
--- dists/trunk/linux-2.6/debian/arch/i386/config.686   (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.686   Mon Feb  5 20:55:19 2007
@@ -63,4 +63,3 @@
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_SUSPEND_SMP=y
 CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_CRYPTO_TWOFISH_586=m

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r8143 - in dists/trunk/linux-2.6/debian: . arch/amd64 arch/i386

[Frederik Schüler]

Author: fs
Date: Tue Jan  9 10:19:25 2007
New Revision: 8143

Modified:
   dists/trunk/linux-2.6/debian/arch/amd64/defines
   dists/trunk/linux-2.6/debian/arch/i386/defines
   dists/trunk/linux-2.6/debian/rules.real
Log:
move amd64 and i386 images to type: plain


Modified: dists/trunk/linux-2.6/debian/arch/amd64/defines
==
--- dists/trunk/linux-2.6/debian/arch/amd64/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/defines Tue Jan  9 10:19:25 2007
@@ -16,4 +16,5 @@
 [amd64]
 class: AMD64
 longclass: all 64bit single- and multiprocessor AMD and Intel
+type: plain
 

Modified: dists/trunk/linux-2.6/debian/arch/i386/defines
==
--- dists/trunk/linux-2.6/debian/arch/i386/defines  (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/defines  Tue Jan  9 10:19:25 2007
@@ -18,10 +18,12 @@
 [486]
 class: x86
 longclass: x86 and compatible
+type: plain
 
 [686]
 class: PPro/Celeron/PII/PIII/P4
 longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
+type: plain
 
 [686_image]
 recommends: libc6-i686
@@ -29,6 +31,7 @@
 [686-bigmem]
 class: PPro/Celeron/PII/PIII/P4
 longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with 4-64G RAM
+type: plain
 
 [686-bigmem_image]
 recommends: libc6-i686
@@ -36,6 +39,7 @@
 [k7]
 class: AMD K7
 longclass: 32bit AMD Duron/Athlon/AthlonXP
+type: plain
 
 [k7_image]
 recommends: libc6-i686

Modified: dists/trunk/linux-2.6/debian/rules.real
==
--- dists/trunk/linux-2.6/debian/rules.real (original)
+++ dists/trunk/linux-2.6/debian/rules.real Tue Jan  9 10:19:25 2007
@@ -371,6 +371,12 @@
 install-image-s390-$(SUBARCH)-$(FLAVOUR)-plain_image:
cp '$(DIR)/arch/s390/boot/image' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
 
+install-image-amd64-$(SUBARCH)-$(FLAVOUR)-plain_image:
+   cp '$(DIR)/arch/x86_64/boot/bzImage' 
$(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
+
+install-image-i386-$(SUBARCH)-$(FLAVOUR)-plain_image:
+   cp '$(DIR)/arch/i386/boot/bzImage' 
$(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
+
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape:
dh_testdir
dh_testroot

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r8147 - dists/trunk/linux-2.6/debian

[Frederik Schüler]

Author: fs
Date: Tue Jan  9 11:07:33 2007
New Revision: 8147

Modified:
   dists/trunk/linux-2.6/debian/rules.real
Log:
Fix the debian/rules.real fix :)


Modified: dists/trunk/linux-2.6/debian/rules.real
==
--- dists/trunk/linux-2.6/debian/rules.real (original)
+++ dists/trunk/linux-2.6/debian/rules.real Tue Jan  9 11:07:33 2007
@@ -366,7 +366,7 @@
$(MAKE) -f debian/rules.real install-base
 
 install-image-amd64-$(SUBARCH)-$(FLAVOUR)-plain_image:
-   cp '$(DIR)/arch/x86_64/boot/bzImage' 
$(INSTALL_DIR)/vmlinuxz$(REAL_VERSION)
+   cp '$(DIR)/arch/x86_64/boot/bzImage' 
$(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
 
 install-image-i386-$(SUBARCH)-$(FLAVOUR)-plain_image:
cp '$(DIR)/arch/i386/boot/bzImage' 
$(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r8108 - dists/trunk/linux-2.6/debian/patches/debian/dsfg

[Frederik Schüler]

Author: fs
Date: Fri Jan  5 13:52:03 2007
New Revision: 8108

Added:
   dists/trunk/linux-2.6/debian/patches/debian/dsfg/
   dists/trunk/linux-2.6/debian/patches/debian/dsfg/files-1
Log:
Add the list of firmware files and drivers to remove on orig.tar.gz creation


Added: dists/trunk/linux-2.6/debian/patches/debian/dsfg/files-1
==
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dsfg/files-1Fri Jan  5 
13:52:03 2007
@@ -0,0 +1,46 @@
+drivers/media/video/dabusb.c
+drivers/media/video/dabusb.h
+
+drivers/net/dgrs.c
+drivers/net/dgrs_es4h.h
+drivers/net/dgrs.h
+drivers/net/dgrs_ether.h
+drivers/net/dgrs_firmware.c
+drivers/net/dgrs_asstruct.h
+drivers/net/dgrs_plx9060.h
+drivers/net/dgrs_i82596.h
+drivers/net/dgrs_bcomm.h
+
+drivers/usb/misc/emi62.c
+drivers/usb/misc/emi62_fw_s.h
+drivers/usb/misc/emi62_fw_m.h
+
+drivers/net/tokenring/smctr.h
+drivers/net/tokenring/smctr_firmware.h
+drivers/net/tokenring/smctr.c
+
+drivers/net/appletalk/cops.h
+drivers/net/appletalk/cops_ltdrv.h
+drivers/net/appletalk/cops.c
+drivers/net/appletalk/cops_ffdrv.h
+
+drivers/usb/misc/emi26_fw.h
+drivers/usb/misc/emi26.c
+
+drivers/net/tokenring/3c359_microcode.h
+drivers/net/tokenring/3c359.h
+drivers/net/tokenring/3c359.c
+drivers/usb/serial/keyspan_usa19_fw.h
+drivers/usb/serial/keyspan_usa19qi_fw.h
+drivers/usb/serial/keyspan_usa19qw_fw.h
+drivers/usb/serial/keyspan_usa18x_fw.h
+drivers/usb/serial/keyspan_usa19w_fw.h
+drivers/usb/serial/keyspan_pda_fw.h
+drivers/usb/serial/keyspan_usa49wlc_fw.h
+drivers/usb/serial/keyspan_usa28xb_fw.h
+drivers/usb/serial/keyspan_usa28x_fw.h
+drivers/usb/serial/Makefile-keyspan_pda_fw
+drivers/usb/serial/keyspan_usa49w_fw.h
+drivers/usb/serial/keyspan_usa28xa_fw.h
+drivers/usb/serial/keyspan_usa28_fw.h
+drivers/usb/serial/keyspan_mpr_fw.h

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r8114 - dists/sid/linux-2.6/debian/patches/debian/dfsg

[Frederik Schüler]

Author: fs
Date: Fri Jan  5 16:24:33 2007
New Revision: 8114

Added:
   dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-dgrs.patch
   
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch
Modified:
   dists/sid/linux-2.6/debian/patches/debian/dfsg/files-1
Log:
Add removal patches for dgrs, emi62 and emi26


Added: dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-dgrs.patch
==
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-dgrs.patch   
Fri Jan  5 16:24:33 2007
@@ -0,0 +1,36 @@
+diff -ruN a/drivers/net/Kconfig b/drivers/net/Kconfig
+--- a/drivers/net/Kconfig  2006-11-29 21:57:37.0 +
 b/drivers/net/Kconfig  2007-01-05 15:13:26.0 +
+@@ -1460,21 +1460,6 @@
+   tristate TOSHIBA TC35815 Ethernet support
+   depends on NET_PCI  PCI  TOSHIBA_JMR3927
+ 
+-config DGRS
+-  tristate Digi Intl. RightSwitch SE-X support
+-  depends on NET_PCI  (PCI || EISA)
+-  ---help---
+-This is support for the Digi International RightSwitch series of
+-PCI/EISA Ethernet switch cards. These include the SE-4 and the SE-6
+-models.  If you have a network card of this type, say Y and read the
+-Ethernet-HOWTO, available from
+-http://www.tldp.org/docs.html#howto.  More specific
+-information is contained in file:Documentation/networking/dgrs.txt.
+-
+-To compile this driver as a module, choose M here and read
+-file:Documentation/networking/net-modules.txt.  The module
+-will be called dgrs.
+-
+ config EEPRO100
+   tristate EtherExpressPro/100 support (eepro100, original Becker 
driver)
+   depends on NET_PCI  PCI
+diff -ruN a/drivers/net/Makefile b/drivers/net/Makefile
+--- a/drivers/net/Makefile 2006-11-29 21:57:37.0 +
 b/drivers/net/Makefile 2007-01-05 15:13:10.0 +
+@@ -38,7 +38,6 @@
+ 
+ obj-$(CONFIG_OAKNET) += oaknet.o 8390.o
+ 
+-obj-$(CONFIG_DGRS) += dgrs.o
+ obj-$(CONFIG_VORTEX) += 3c59x.o
+ obj-$(CONFIG_TYPHOON) += typhoon.o
+ obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o

Added: 
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch
==
--- (empty file)
+++ 
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-misc-emi62-emi26.patch
   Fri Jan  5 16:24:33 2007
@@ -0,0 +1,50 @@
+diff -ruN a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
+--- a/drivers/usb/misc/Kconfig 2006-11-29 21:57:37.0 +
 b/drivers/usb/misc/Kconfig 2007-01-05 15:22:14.0 +
+@@ -4,34 +4,6 @@
+ comment USB Miscellaneous drivers
+   depends on USB
+ 
+-config USB_EMI62
+-  tristate EMI 6|2m USB Audio interface support
+-  depends on USB
+-  ---help---
+-This driver loads firmware to Emagic EMI 6|2m low latency USB
+-Audio and Midi interface.
+-
+-After firmware load the device is handled with standard linux
+-USB Audio driver.
+-
+-This code is also available as a module ( = code which can be
+-inserted in and removed from the running kernel whenever you want).
+-The module will be called audio. If you want to compile it as a
+-module, say M here and read file:Documentation/kbuild/modules.txt.
+-
+-config USB_EMI26
+-  tristate EMI 2|6 USB Audio interface support
+-  depends on USB
+-  ---help---
+-This driver loads firmware to Emagic EMI 2|6 low latency USB
+-Audio interface.
+-
+-After firmware load the device is handled with standard linux
+-USB Audio driver.
+-
+-To compile this driver as a module, choose M here: the
+-module will be called emi26.
+-
+ config USB_ADUTUX
+   tristate ADU devices from Ontrak Control Systems (EXPERIMENTAL)
+   depends on USB  EXPERIMENTAL
+diff -ruN a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
+--- a/drivers/usb/misc/Makefile2006-11-29 21:57:37.0 +
 b/drivers/usb/misc/Makefile2007-01-05 15:22:03.0 +
+@@ -7,8 +7,6 @@
+ obj-$(CONFIG_USB_AUERSWALD)   += auerswald.o
+ obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o
+ obj-$(CONFIG_USB_CYTHERM) += cytherm.o
+-obj-$(CONFIG_USB_EMI26)   += emi26.o
+-obj-$(CONFIG_USB_EMI62)   += emi62.o
+ obj-$(CONFIG_USB_FTDI_ELAN)   += ftdi-elan.o
+ obj-$(CONFIG_USB_IDMOUSE) += idmouse.o
+ obj-$(CONFIG_USB_LCD) += usblcd.o

Modified: dists/sid/linux-2.6/debian/patches/debian/dfsg/files-1
==
--- dists/sid/linux-2.6/debian/patches/debian/dfsg/files-1  (original)
+++ dists/sid/linux-2.6/debian/patches/debian/dfsg/files-1  Fri Jan  5 
16:24:33 2007
@@ -15,6 +15,8 @@
 drivers/usb/misc/emi62.c
 

[kernel] r8121 - dists/sid/linux-2.6/debian/patches/debian/dfsg

[Frederik Schüler]

Author: fs
Date: Fri Jan  5 16:55:24 2007
New Revision: 8121

Added:
   
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-appletalk-cops.patch
   
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-tokenring-3c359-smctr.patch
   
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan.patch
Modified:
   dists/sid/linux-2.6/debian/patches/debian/dfsg/files-1
Log:
Add removal patches for: 3c359, smctr, keyspan, cops


Added: 
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-appletalk-cops.patch
==
--- (empty file)
+++ 
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-appletalk-cops.patch 
Fri Jan  5 16:55:24 2007
@@ -0,0 +1,45 @@
+diff -ruN a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig
+--- a/drivers/net/appletalk/Kconfig2006-11-29 21:57:37.0 +
 b/drivers/net/appletalk/Kconfig2007-01-05 15:34:44.0 +
+@@ -49,32 +49,6 @@
+ This driver is experimental, which means that it may not work.
+ See the file file:Documentation/networking/ltpc.txt.
+ 
+-config COPS
+-  tristate COPS LocalTalk PC support
+-  depends on DEV_APPLETALK  (ISA || EISA)
+-  help
+-This allows you to use COPS AppleTalk cards to connect to LocalTalk
+-networks. You also need version 1.3.3 or later of the netatalk
+-package. This driver is experimental, which means that it may not
+-work. This driver will only work if you choose AppleTalk DDP
+-networking support, above.
+-Please read the file file:Documentation/networking/cops.txt.
+-
+-config COPS_DAYNA
+-  bool Dayna firmware support
+-  depends on COPS
+-  help
+-Support COPS compatible cards with Dayna style firmware (Dayna
+-DL2000/ Daynatalk/PC (half length), COPS LT-95, Farallon PhoneNET PC
+-III, Farallon PhoneNET PC II).
+-
+-config COPS_TANGENT
+-  bool Tangent firmware support
+-  depends on COPS
+-  help
+-Support COPS compatible cards with Tangent style firmware (Tangent
+-ATB_II, Novell NL-1000, Daystar Digital LT-200.
+-
+ config IPDDP
+   tristate Appletalk-IP driver support
+   depends on DEV_APPLETALK  ATALK
+diff -ruN a/drivers/net/appletalk/Makefile b/drivers/net/appletalk/Makefile
+--- a/drivers/net/appletalk/Makefile   2006-11-29 21:57:37.0 +
 b/drivers/net/appletalk/Makefile   2007-01-05 15:34:11.0 +
+@@ -3,5 +3,4 @@
+ #
+ 
+ obj-$(CONFIG_IPDDP) += ipddp.o
+-obj-$(CONFIG_COPS) += cops.o
+ obj-$(CONFIG_LTPC) += ltpc.o

Added: 
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-tokenring-3c359-smctr.patch
==
--- (empty file)
+++ 
dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-tokenring-3c359-smctr.patch
  Fri Jan  5 16:55:24 2007
@@ -0,0 +1,59 @@
+diff -ruN a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
+--- a/drivers/net/tokenring/Kconfig2006-11-29 21:57:37.0 +
 b/drivers/net/tokenring/Kconfig2007-01-05 15:26:27.0 +
+@@ -64,24 +64,6 @@
+ To compile this driver as a module, choose M here: the module will be
+ called lanstreamer.
+ 
+-config 3C359
+-  tristate 3Com 3C359 Token Link Velocity XL adapter support
+-  depends on TR  PCI
+-  ---help---
+-This is support for the 3Com PCI Velocity XL cards, specifically
+-the 3Com 3C359, please note this is not for the 3C339 cards, you
+-should use the tms380 driver instead.
+-
+-If you have such an adapter, say Y and read the Token-Ring
+-mini-HOWTO, available from http://www.tldp.org/docs.html#howto.
+-
+-To compile this driver as a module, choose M here: the module will be
+-called 3c359.
+-
+-Also read the file file:Documentation/networking/3c359.txt or check 
the 
+-Linux Token Ring Project site for the latest information at
+-http://www.linuxtr.net
+-
+ config TMS380TR
+   tristate Generic TMS380 Token Ring ISA/PCI adapter support
+   depends on TR  (PCI || ISA  ISA_DMA_API || MCA)
+@@ -166,21 +148,5 @@
+ To compile this driver as a module, choose M here: the module will be
+ called madgemc.
+ 
+-config SMCTR
+-  tristate SMC ISA/MCA adapter support
+-  depends on TR  (ISA || MCA_LEGACY)  (BROKEN || !64BIT)
+-  ---help---
+-This is support for the ISA and MCA SMC Token Ring cards,
+-specifically SMC TokenCard Elite (8115T) and SMC TokenCard Elite/A
+-(8115T/A) adapters.
+-
+-If you have such an adapter and would like to use it, say Y or M and
+-read the Token-Ring mini-HOWTO, available from
+-http://www.tldp.org/docs.html#howto and the file
+-file:Documentation/networking/smctr.txt.
+-
+-To compile this driver as 

[kernel] r8088 - in dists/trunk/linux-2.6/debian/arch: . alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc

[Frederik Schüler]

Author: fs
Date: Thu Jan  4 15:36:26 2007
New Revision: 8088

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
   dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
   dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
   dists/trunk/linux-2.6/debian/arch/arm/config.versatile
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/hppa/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/arch/m68k/config
   dists/trunk/linux-2.6/debian/arch/mips/config.qemu
   dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22
   dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32
   dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/arch/mipsel/config.qemu
   dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
   dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/s390/config
   dists/trunk/linux-2.6/debian/arch/sparc/config
Log:
Global:
- Make BLK_DEV_IDEPNP per-arch
- Make NET_PKTGEN a global module
- Activate new PATA_* options globally
- Activate sata options globally
- Activate ext4 and GFS2
- CC_STACKPROTECTOR is disabled for now, this needs to be discussed
- Activate lots of usb|scsi|sensors|dvb drivers globally

New per-arch settings:
- CONFIG_PCIEAER=y
- CONFIG_HT_IRQ=y
- CONFIG_ARCH_POPULATES_NODE_MAP=y



Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==
--- dists/trunk/linux-2.6/debian/arch/alpha/config  (original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config  Thu Jan  4 15:36:26 2007
@@ -409,7 +409,6 @@
 CONFIG_NET_ESTIMATOR=y
 # CONFIG_NET_EMATCH is not set
 CONFIG_NET_CLS_POLICE=y
-CONFIG_NET_PKTGEN=m
 CONFIG_NETPOLL=y
 CONFIG_NETPOLL_RX=y
 CONFIG_NETPOLL_TRAP=y
@@ -627,7 +626,6 @@
 CONFIG_SEALEVEL_4021=m
 CONFIG_SYNCLINK_SYNCPPP=m
 CONFIG_HDLC=m
-CONFIG_HDLC_RAW=y
 CONFIG_HDLC_RAW_ETH=y
 CONFIG_HDLC_CISCO=y
 CONFIG_HDLC_FR=y

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==
--- dists/trunk/linux-2.6/debian/arch/amd64/config  (original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config  Thu Jan  4 15:36:26 2007
@@ -85,7 +85,6 @@
 CONFIG_HOTPLUG_PCI_FAKE=m
 CONFIG_HOTPLUG_PCI_ACPI=m
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 CONFIG_IA32_EMULATION=y
@@ -548,7 +547,6 @@
 CONFIG_DSCC4_PCI_RST=y
 CONFIG_LANMEDIA=m
 CONFIG_HDLC=m
-CONFIG_HDLC_RAW=y
 CONFIG_HDLC_RAW_ETH=y
 CONFIG_HDLC_CISCO=y
 CONFIG_HDLC_FR=y
@@ -1441,3 +1439,9 @@
 CONFIG_AUDIT_ARCH=y
 # CONFIG_ASFS_FS is not set
 CONFIG_SCSI_ARCMSR=m
+CONFIG_PCIEAER=y
+CONFIG_HT_IRQ=y
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_CRYPTO_TWOFISH_X86_64=m
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_BLK_DEV_IDEPNP=y

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
==
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge Thu Jan  4 
15:36:26 2007
@@ -238,7 +238,6 @@
 #
 # Network testing
 #
-# CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
 CONFIG_IRDA=m
 

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
==
--- dists/trunk/linux-2.6/debian/arch/arm/config.iop32x (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.iop32x Thu Jan  4 15:36:26 2007
@@ -443,7 +443,6 @@
 #
 # Network testing
 #
-CONFIG_NET_PKTGEN=m
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 CONFIG_BT=m
@@ -760,39 +759,6 @@
 CONFIG_SATA_ULI=m
 CONFIG_SATA_VIA=m
 CONFIG_SATA_VITESSE=m
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NS87410 is not set
-# 

[kernel] r8089 - in dists/trunk/linux-2.6/debian/arch: . alpha amd64 i386 ia64 mips mipsel powerpc

[Frederik Schüler]

Author: fs
Date: Thu Jan  4 16:30:28 2007
New Revision: 8089

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/i386/config.686
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/arch/mips/config.qemu
   dists/trunk/linux-2.6/debian/arch/mipsel/config.qemu
   dists/trunk/linux-2.6/debian/arch/powerpc/config
Log:
make HDLC_* options modular and global
update i386 options


Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==
--- dists/trunk/linux-2.6/debian/arch/alpha/config  (original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config  Thu Jan  4 16:30:28 2007
@@ -626,11 +626,6 @@
 CONFIG_SEALEVEL_4021=m
 CONFIG_SYNCLINK_SYNCPPP=m
 CONFIG_HDLC=m
-CONFIG_HDLC_RAW_ETH=y
-CONFIG_HDLC_CISCO=y
-CONFIG_HDLC_FR=y
-CONFIG_HDLC_PPP=y
-CONFIG_HDLC_X25=y
 CONFIG_PCI200SYN=m
 CONFIG_WANXL=m
 CONFIG_PC300=m

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==
--- dists/trunk/linux-2.6/debian/arch/amd64/config  (original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config  Thu Jan  4 16:30:28 2007
@@ -547,11 +547,6 @@
 CONFIG_DSCC4_PCI_RST=y
 CONFIG_LANMEDIA=m
 CONFIG_HDLC=m
-CONFIG_HDLC_RAW_ETH=y
-CONFIG_HDLC_CISCO=y
-CONFIG_HDLC_FR=y
-CONFIG_HDLC_PPP=y
-CONFIG_HDLC_X25=y
 CONFIG_PCI200SYN=m
 CONFIG_WANXL=m
 CONFIG_PC300=m

Modified: dists/trunk/linux-2.6/debian/arch/config
==
--- dists/trunk/linux-2.6/debian/arch/config(original)
+++ dists/trunk/linux-2.6/debian/arch/configThu Jan  4 16:30:28 2007
@@ -167,7 +167,6 @@
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_AES=m
 CONFIG_REISERFS_FS=m
@@ -1244,3 +1243,15 @@
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_PATA_LEGACY=m
+CONFIG_PATA_CS5535=m
+CONFIG_AUDIT_GENERIC=y
+CONFIG_PATA_QDI=m
+CONFIG_PATA_ISAPNP=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_X25=m
+CONFIG_HDLC_PPP=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==
--- dists/trunk/linux-2.6/debian/arch/i386/config   (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config   Thu Jan  4 16:30:28 2007
@@ -695,11 +695,6 @@
 CONFIG_LANMEDIA=m
 CONFIG_SEALEVEL_4021=m
 CONFIG_HDLC=m
-CONFIG_HDLC_RAW_ETH=y
-CONFIG_HDLC_CISCO=y
-CONFIG_HDLC_FR=y
-CONFIG_HDLC_PPP=y
-CONFIG_HDLC_X25=y
 CONFIG_PCI200SYN=m
 CONFIG_WANXL=m
 CONFIG_PC300=m
@@ -1680,6 +1675,10 @@
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_PAGE_OFFSET=0xC000
 CONFIG_INPUT_MOUSEDEV=y
-CONFIG_SCSI_ARCMSR=m 
 CONFIG_SX=m
 CONFIG_BLK_DEV_IDEPNP=y
+CONFIG_PCIEAER=y
+CONFIG_HT_IRQ=y
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SCSI_ARCMSR=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.686
==
--- dists/trunk/linux-2.6/debian/arch/i386/config.686   (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.686   Thu Jan  4 16:30:28 2007
@@ -69,3 +69,4 @@
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_SUSPEND_SMP=y
 CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_CRYPTO_TWOFISH_586=m

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
==
--- dists/trunk/linux-2.6/debian/arch/ia64/config   (original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config   Thu Jan  4 16:30:28 2007
@@ -524,10 +524,6 @@
 CONFIG_LANMEDIA=m
 CONFIG_SYNCLINK_SYNCPPP=m
 CONFIG_HDLC=m
-CONFIG_HDLC_RAW_ETH=y
-CONFIG_HDLC_CISCO=y
-CONFIG_HDLC_FR=y
-CONFIG_HDLC_PPP=y
 CONFIG_PCI200SYN=m
 CONFIG_WANXL=m
 CONFIG_PC300=m

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.qemu
==
--- dists/trunk/linux-2.6/debian/arch/mips/config.qemu  (original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.qemu  Thu Jan  4 16:30:28 2007
@@ -1319,7 +1319,6 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_LIBCRC32C=m
-CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_TEXTSEARCH=y

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.qemu
==
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.qemu(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.qemuThu Jan  4 
16:30:28 2007
@@ -1324,7 +1324,6 

[kernel] r7712 - dists/sid/linux-latest-2.6/debian

[Frederik Schüler]

Author: fs
Date: Tue Nov  7 18:05:33 2006
New Revision: 7712

Modified:
   dists/sid/linux-latest-2.6/debian/changelog
Log:
Prepare for release.


Modified: dists/sid/linux-latest-2.6/debian/changelog
==
--- dists/sid/linux-latest-2.6/debian/changelog (original)
+++ dists/sid/linux-latest-2.6/debian/changelog Tue Nov  7 18:05:33 2006
@@ -1,4 +1,4 @@
-linux-latest-2.6 (4) UNRELESED; urgency=low
+linux-latest-2.6 (4) unstable; urgency=low
 
   * Update to 2.6.18-2.
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7708 - in dists/trunk/linux-2.6/debian: . arch/i386

[Frederik Schüler]

Author: fs
Date: Tue Nov  7 01:00:22 2006
New Revision: 7708

Modified:
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/i386/config.486
   dists/trunk/linux-2.6/debian/arch/i386/config.686
   dists/trunk/linux-2.6/debian/arch/i386/config.k7
   dists/trunk/linux-2.6/debian/changelog
Log:
[i386] Acticate CONFIG_SX for all flavours


Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==
--- dists/trunk/linux-2.6/debian/arch/i386/config   (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config   Tue Nov  7 01:00:22 2006
@@ -1685,3 +1685,4 @@
 CONFIG_PAGE_OFFSET=0xC000
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_SCSI_ARCMSR=m 
+CONFIG_SX=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.486
==
--- dists/trunk/linux-2.6/debian/arch/i386/config.486   (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.486   Tue Nov  7 01:00:22 2006
@@ -72,7 +72,6 @@
 CONFIG_COMPUTONE=m
 CONFIG_DIGIEPCA=m
 CONFIG_MOXA_INTELLIO=m
-CONFIG_SX=m
 CONFIG_RIO=m
 CONFIG_RIO_OLDPCI=y
 CONFIG_STALLION=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.686
==
--- dists/trunk/linux-2.6/debian/arch/i386/config.686   (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.686   Tue Nov  7 01:00:22 2006
@@ -50,7 +50,6 @@
 # CONFIG_COMPUTONE is not set
 # CONFIG_DIGIEPCA is not set
 # CONFIG_MOXA_INTELLIO is not set
-# CONFIG_SX is not set
 # CONFIG_RIO is not set
 # CONFIG_STALLION is not set
 # CONFIG_ISTALLION is not set

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.k7
==
--- dists/trunk/linux-2.6/debian/arch/i386/config.k7(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.k7Tue Nov  7 01:00:22 2006
@@ -51,7 +51,6 @@
 # CONFIG_COMPUTONE is not set
 # CONFIG_DIGIEPCA is not set
 # CONFIG_MOXA_INTELLIO is not set
-# CONFIG_SX is not set
 # CONFIG_RIO is not set
 # CONFIG_STALLION is not set
 # CONFIG_ISTALLION is not set

Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog  (original)
+++ dists/trunk/linux-2.6/debian/changelog  Tue Nov  7 01:00:22 2006
@@ -17,7 +17,10 @@
   * [ia64] Move to upstream version of sal-flush-fix patch, which is slightly
 different than the early version added in 2.6.18-3.
 
- -- dann frazier [EMAIL PROTECTED]  Mon,  6 Nov 2006 15:15:17 -0700
+  [ Frederik Schüler ]
+  * [i386] Acticate CONFIG_SX for all flavours
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Tue,  7 Nov 2006 00:59:40 +0100
 
 linux-2.6 (2.6.18-4) unstable; urgency=low
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7709 - dists/trunk/linux-2.6/debian

[Frederik Schüler]

Author: fs
Date: Tue Nov  7 01:01:16 2006
New Revision: 7709

Modified:
   dists/trunk/linux-2.6/debian/changelog
Log:
close CONFIG_SX bug in the changelog.


Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog  (original)
+++ dists/trunk/linux-2.6/debian/changelog  Tue Nov  7 01:01:16 2006
@@ -18,9 +18,9 @@
 different than the early version added in 2.6.18-3.
 
   [ Frederik Schüler ]
-  * [i386] Acticate CONFIG_SX for all flavours
+  * [i386] Acticate CONFIG_SX for all flavours. (closes: #391275)
 
- -- Frederik Schüler [EMAIL PROTECTED]  Tue,  7 Nov 2006 00:59:40 +0100
+ -- Frederik Schüler [EMAIL PROTECTED]  Tue,  7 Nov 2006 01:00:34 +0100
 
 linux-2.6 (2.6.18-4) unstable; urgency=low
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7674 - in dists/trunk/linux-2.6/debian: . arch arch/alpha

[Frederik Schüler]

Author: fs
Date: Wed Nov  1 16:48:20 2006
New Revision: 7674

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/defines
   dists/trunk/linux-2.6/debian/arch/defines
   dists/trunk/linux-2.6/debian/changelog
Log:
Revert reversion of alpha compiler switch.
Bump the ABI to 2.


Modified: dists/trunk/linux-2.6/debian/arch/alpha/defines
==
--- dists/trunk/linux-2.6/debian/arch/alpha/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/defines Wed Nov  1 16:48:20 2006
@@ -1,5 +1,4 @@
 [base]
-compiler: gcc-4.0
 flavours: alpha-generic alpha-smp alpha-legacy
 kernel-arch: alpha
 kernel-header-dirs: alpha

Modified: dists/trunk/linux-2.6/debian/arch/defines
==
--- dists/trunk/linux-2.6/debian/arch/defines   (original)
+++ dists/trunk/linux-2.6/debian/arch/defines   Wed Nov  1 16:48:20 2006
@@ -1,5 +1,5 @@
 [abi]
-abiname: 1
+abiname: 2
 
 [base]
 arches:

Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog  (original)
+++ dists/trunk/linux-2.6/debian/changelog  Wed Nov  1 16:48:20 2006
@@ -1,4 +1,7 @@
-linux-2.6 (2.6.18-4) UNRELEASED; urgency=low
+linux-2.6 (2.6.18-4) UNRELEASED; urgency=high
+
+  [ Norbert Tretkowski ]
+  * [alpha] Switched to gcc-4.1.
 
   [ Jurij Smakov ]
   * [sparc] Remove sparc64-atyfb-xl-gr.patch, it does more harm than
@@ -42,7 +45,10 @@
   [ Sven Luther ]
   * [powerpc] Added exception alignement patch from Benjamin Herrenschmidt.
 
- -- Sven Luther [EMAIL PROTECTED]  Wed,  1 Nov 2006 08:57:13 +0100
+  [ Frederik Schüler ]
+  * Bump ABI to 2.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Wed,  1 Nov 2006 16:37:17 +0100
 
 linux-2.6 (2.6.18-3) unstable; urgency=low
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7571 - in dists/trunk/linux-2.6/debian: . arch arch/alpha arch/amd64 arch/arm arch/armeb arch/hppa arch/i386 arch/ia64 arch/m68k arch/mips arch/mipsel arch/powerpc arch/sparc

[Frederik Schüler]

-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_NET_CLS_IND is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
 CONFIG_NET_EMATCH_NBYTE=m
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
-# CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_CLS_POLICE=y
 CONFIG_NET_PKTGEN=m
 CONFIG_NETPOLL=y
@@ -1239,3 +1227,4 @@
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_IPW2100 is not set
 CONFIG_HVC_RTAS=y
+CONFIG_SCSI_ARCMSR=m

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
==
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot 
(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot Mon Oct 
 2 13:23:20 2006
@@ -22,7 +22,6 @@
 # CONFIG_NETFILTER is not set
 # CONFIG_NET_DIVERT is not set
 # CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
 # CONFIG_NETPOLL_RX is not set
 # CONFIG_NETPOLL_TRAP is not set
 # CONFIG_HAMRADIO is not set
@@ -73,7 +72,6 @@
 # CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED=deadline
 
 CONFIG_FB_CONTROL=y
 CONFIG_FB_PLATINUM=y

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config
==
--- dists/trunk/linux-2.6/debian/arch/sparc/config  (original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config  Mon Oct  2 13:23:20 2006
@@ -72,7 +72,6 @@
 # CONFIG_INPUT_EVBUG is not set
 CONFIG_NET_SCH_NETEM=m
 # Wireless LAN (non-hamradio)
-CONFIG_VIDEO_V4L2=y
 # CONFIG_HP100 is not set
 # I2C support
 # CONFIG_DVB is not set
@@ -82,7 +81,6 @@
 # CONFIG_IPMI_HANDLER is not set
 # RTC interfaces
 # CONFIG_USB_GADGET is not set
-CONFIG_NET_CLS_TCINDEX=m
 # CONFIG_FB_P9100 is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_SND_SERIAL_U16550 is not set
@@ -149,7 +147,6 @@
 CONFIG_NET_POLL_CONTROLLER=y
 # CONFIG_INPUT_JOYDEV is not set
 CONFIG_INPUT_MOUSEDEV=y
-CONFIG_NET_CLS_RSVP=m
 CONFIG_ATALK=m
 CONFIG_IP_PNP_RARP=y
 CONFIG_INPUT_MOUSE=y
@@ -186,7 +183,6 @@
 # CONFIG_KEYBOARD_XTKBD is not set
 # Network device support
 CONFIG_DECNET_ROUTE_FWMARK=y
-CONFIG_NET_CLS_FW=m
 CONFIG_PPPOE=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_AFFS_FS=m
@@ -277,9 +273,7 @@
 # CONFIG_SND_ICE1712 is not set
 # Ftape, the floppy tape device driver
 # PHY device support
-# CONFIG_CLS_U32_MARK is not set
 # CONFIG_INFINIBAND is not set
-# CONFIG_CLS_U32_PERF is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_NET_RADIO is not set
 # CONFIG_VXFS_FS is not set
@@ -357,7 +351,6 @@
 # CONFIG_R8169 is not set
 CONFIG_FONT_SUN8x16=y
 CONFIG_BNX2=m
-# CONFIG_NET_CLS_IND is not set
 # CONFIG_FB_RIVA is not set
 # CONFIG_MTD is not set
 # CONFIG_ULTRIX_PARTITION is not set
@@ -380,10 +373,7 @@
 # CONFIG_IP_PNP_DHCP is not set
 # TIPC Configuration (EXPERIMENTAL)
 # CONFIG_CIFS_STATS is not set
-CONFIG_NET_CLS=y
-# CONFIG_NET_CLS_ACT is not set
 # CONFIG_FONTS is not set
-CONFIG_NET_CLS_RSVP6=m
 # Network testing
 # CONFIG_INPUT_TSDEV is not set
 # Pseudo filesystems
@@ -410,15 +400,12 @@
 CONFIG_SERIO=y
 # Fusion MPT device support
 # CONFIG_AMIGA_PARTITION is not set
-CONFIG_NET_CLS_ROUTE4=m
 # Parallel port support
 # CONFIG_SND_ICE1724 is not set
-CONFIG_NET_CLS_BASIC=m
 CONFIG_HW_CONSOLE=y
 # SPI Master Controller Drivers
 # CONFIG_BSD_DISKLABEL is not set
 # CONFIG_FB_SAVAGE is not set
-CONFIG_NET_CLS_U32=m
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 # CONFIG_NETPOLL_RX is not set
 # CONFIG_FB_MATROX is not set
@@ -440,3 +427,4 @@
 # CONFIG_SND_HDA_INTEL is not set
 # MII PHY device drivers
 # CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
+CONFIG_SCSI_ARCMSR=m

Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog  (original)
+++ dists/trunk/linux-2.6/debian/changelog  Mon Oct  2 13:23:20 2006
@@ -7,7 +7,12 @@
   * [alpha] restore alpha-prctl.patch, which keeps disappearing every time
 there's a kernel upgrade :/
 
- -- Steve Langasek [EMAIL PROTECTED]  Sat, 30 Sep 2006 02:28:29 -0700
+  [ Frederik Schüler ]
+  * Activate CONFIG_IDE_TASK_IOCTL globally. (Closes: #390616)
+  * Activate CONFIG_NET_CLS_* globaly. (Closes: #389918)
+  * Make CONFIG_EFI_VARS modular on i386. (Closes: #381951)
+  * Activate CONFIG_SCSI_ARCMSR on amd64, powerpc, sparc too.
+ -- Frederik Schüler [EMAIL PROTECTED]  Mon,  2 Oct 2006 15:17:27 +0200
 
 linux-2.6 (2.6.18-2) unstable; urgency=low
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7572 - dists/sid/linux-latest-2.6/debian

[Frederik Schüler]

Author: fs
Date: Mon Oct  2 13:52:47 2006
New Revision: 7572

Modified:
   dists/sid/linux-latest-2.6/debian/changelog
   dists/sid/linux-latest-2.6/debian/rules.defs

Log:
Update linux-latest to 2.6.18.



Modified: dists/sid/linux-latest-2.6/debian/changelog
==
--- dists/sid/linux-latest-2.6/debian/changelog (original)
+++ dists/sid/linux-latest-2.6/debian/changelog Mon Oct  2 13:52:47 2006
@@ -1,3 +1,9 @@
+linux-latest-2.6 (3) unstable; urgency=low
+
+  * Update linux-latest to 2.6.18.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Mon,  2 Oct 2006 13:16:57 +0200
+
 linux-latest-2.6 (2) unstable; urgency=high
 
   [ Bastian Blank ]

Modified: dists/sid/linux-latest-2.6/debian/rules.defs
==
--- dists/sid/linux-latest-2.6/debian/rules.defs(original)
+++ dists/sid/linux-latest-2.6/debian/rules.defsMon Oct  2 13:52:47 2006
@@ -1 +1 @@
-KERNELVERSION := 2.6.17-2
+KERNELVERSION := 2.6.18-1

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7440 - in dists/sid/linux-latest-2.6/debian: . templates

[Frederik Schüler]

Author: fs
Date: Mon Sep 18 14:36:16 2006
New Revision: 7440

Modified:
   dists/sid/linux-latest-2.6/debian/changelog
   dists/sid/linux-latest-2.6/debian/templates/control.extra.in

Log:
[amd64] Add kernel-image-2.6-* transition packages. Closes: #377228


Modified: dists/sid/linux-latest-2.6/debian/changelog
==
--- dists/sid/linux-latest-2.6/debian/changelog (original)
+++ dists/sid/linux-latest-2.6/debian/changelog Mon Sep 18 14:36:16 2006
@@ -1,8 +1,12 @@
 linux-latest-2.6 (2) UNRELEASED; urgency=low
 
-  * Don't generate headers packages for module-less kernels. 
+  [ Bastian Blank ]
+  * Don't generate headers packages for module-less kernels.
 
- -- Bastian Blank [EMAIL PROTECTED]  Mon, 18 Sep 2006 07:48:50 +0200
+  [ Frederik Schüler ]
+  * [amd64] Add kernel-image-2.6-* transition packages. Closes: #377228
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Mon, 18 Sep 2006 16:32:51 +0200
 
 linux-latest-2.6 (1) unstable; urgency=low
 

Modified: dists/sid/linux-latest-2.6/debian/templates/control.extra.in
==
--- dists/sid/linux-latest-2.6/debian/templates/control.extra.in
(original)
+++ dists/sid/linux-latest-2.6/debian/templates/control.extra.inMon Sep 
18 14:36:16 2006
@@ -327,4 +327,47 @@
 Description: Linux 2.6 image on multi-processor 64-bit UltraSPARC class - 
transition package
  This package is for transition only.
 
+Package: kernel-image-2.6-amd64-generic 
+X-Version-Overwrite-Epoch: 1
+Architecture: amd64
+Section: admin
+Priority: extra
+Depends: linux-image-2.6-amd64
+Description: Linux kernel image for version 2.6 on generic x86_64 systems - 
transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-amd64-k8 
+X-Version-Overwrite-Epoch: 1
+Architecture: amd64
+Section: admin
+Priority: extra
+Depends: linux-image-2.6-amd64
+Description: Linux kernel image for version 2.6 on AMD64 systems - transition 
package
+ This package is for transition only.
+
+Package: kernel-image-2.6-amd64-k8-smp 
+X-Version-Overwrite-Epoch: 1
+Architecture: amd64
+Section: admin
+Priority: extra
+Depends: linux-image-2.6-amd64
+Description: Linux kernel image for version 2.6 on AMD64 SMP systems - 
transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-em64t-p4 
+X-Version-Overwrite-Epoch: 1
+Architecture: amd64
+Section: admin
+Priority: extra
+Depends: linux-image-2.6-amd64
+Description: Linux kernel image for version 2.6 on Intel EM64T systems - 
transition package
+ This package is for transition only.
 
+Package: kernel-image-2.6-em64t-p4-smp 
+X-Version-Overwrite-Epoch: 1
+Architecture: amd64
+Section: admin
+Priority: extra
+Depends: linux-image-2.6-amd64
+Description: Linux kernel image for version 2.6 on Intel EM64T SMP systems - 
transition package
+ This package is for transition only.

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7442 - dists/sid/linux-latest-2.6/debian

[Frederik Schüler]

Author: fs
Date: Mon Sep 18 14:57:15 2006
New Revision: 7442

Modified:
   dists/sid/linux-latest-2.6/debian/changelog

Log:
Prepare for release.


Modified: dists/sid/linux-latest-2.6/debian/changelog
==
--- dists/sid/linux-latest-2.6/debian/changelog (original)
+++ dists/sid/linux-latest-2.6/debian/changelog Mon Sep 18 14:57:15 2006
@@ -1,10 +1,10 @@
-linux-latest-2.6 (2) UNRELEASED; urgency=low
+linux-latest-2.6 (2) unstable; urgency=high
 
   [ Bastian Blank ]
   * Don't generate headers packages for module-less kernels.
 
   [ Frederik Schüler ]
-  * [amd64] Add kernel-image-2.6-* transition packages. Closes: #377228
+  * [amd64] Add kernel-image-2.6-* transition packages. Closes: #377228 
 
  -- Frederik Schüler [EMAIL PROTECTED]  Mon, 18 Sep 2006 16:32:51 +0200
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7443 - dists/sid/linux-latest-2.6/debian/templates

[Frederik Schüler]

Author: fs
Date: Mon Sep 18 15:43:04 2006
New Revision: 7443

Modified:
   dists/sid/linux-latest-2.6/debian/templates/control.source.in

Log:
Add myself to uploaders


Modified: dists/sid/linux-latest-2.6/debian/templates/control.source.in
==
--- dists/sid/linux-latest-2.6/debian/templates/control.source.in   
(original)
+++ dists/sid/linux-latest-2.6/debian/templates/control.source.in   Mon Sep 
18 15:43:04 2006
@@ -2,6 +2,6 @@
 Section: admin
 Priority: optional
 Maintainer: Debian Kernel Team debian-kernel@lists.debian.org
-Uploaders: Bastian Blank [EMAIL PROTECTED]
+Uploaders: Bastian Blank [EMAIL PROTECTED], Frederik Schüler [EMAIL 
PROTECTED]
 Standards-Version: 3.7.2
 Build-Depends: debhelper (= 4.1.0)

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7417 - in dists/trunk/linux-2.6/debian: . patches/series

[Frederik Schüler]

Author: fs
Date: Thu Sep 14 11:18:29 2006
New Revision: 7417

Removed:
   dists/trunk/linux-2.6/debian/patches/series/0experimental.2
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/0experimental.1

Log:
Prepare for 2.6.18-rc7


Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog  (original)
+++ dists/trunk/linux-2.6/debian/changelog  Thu Sep 14 11:18:29 2006
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.17+2.6.18-rc6-0experimental.2) UNRELEASED; urgency=low
+linux-2.6 (2.6.17+2.6.18-rc7-0experimental.1) UNRELEASED; urgency=low
 
   [ Martin Michlmayr ]
   * Bump build-dependency on kernel-package to 10.054.
@@ -25,13 +25,7 @@
   [ maximilian attems ]
   * Enable CONFIG_PRINTER=m for all powerpc flavours.
 
- -- maximilian attems [EMAIL PROTECTED]  Tue, 12 Sep 2006 14:57:37 +0200
-
-linux-2.6 (2.6.17+2.6.18-rc6-0experimental.1) UNRELEASED; urgency=low
-
-  *
-
- -- Bastian Blank [EMAIL PROTECTED]  Tue,  5 Sep 2006 11:05:54 +0200
+ -- Frederik Schüler [EMAIL PROTECTED]  Wed, 13 Sep 2006 12:12:24 +0200
 
 linux-2.6 (2.6.17-8) UNRELEASED; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1
==
--- dists/trunk/linux-2.6/debian/patches/series/0experimental.1 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1 Thu Sep 14 
11:18:29 2006
@@ -25,4 +25,8 @@
 + arm-iop-mtd-maps.patch
 + arm-iop-n2100.patch
 + arm-iop-glantank.patch
-+ arm-nslu2-include-irq.patch
+#+ arm-nslu2-include-irq.patch
++ powerpc-mkvmlinuz-support-ppc.patch
++ powerpc-mkvmlinuz-support-powerpc.patch
++ arm-iop-fix-cpuid
++ arm-get_unaligned-gcc41-const.patch

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7398 - dists/sid/linux-2.6/debian

[Frederik Schüler]

Author: fs
Date: Wed Sep 13 18:26:28 2006
New Revision: 7398

Modified:
   dists/sid/linux-2.6/debian/changelog

Log:
Fix released changedlog entry


Modified: dists/sid/linux-2.6/debian/changelog
==
--- dists/sid/linux-2.6/debian/changelog(original)
+++ dists/sid/linux-2.6/debian/changelogWed Sep 13 18:26:28 2006
@@ -59,7 +59,7 @@
 - s390-kernel-futex-barrier.patch
   * Unpatch ia64-mman.h-fix.patch
 
- -- Sven Luther [EMAIL PROTECTED]  Wed, 13 Sep 2006 19:07:25 +0200
+ -- Bastian Blank [EMAIL PROTECTED]  Wed, 13 Sep 2006 14:54:14 +0200
 
 linux-2.6 (2.6.17-8) unstable; urgency=low
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7377 - dists/trunk/linux-2.6/debian/arch/amd64/xen

[Frederik Schüler]

Author: fs
Date: Fri Sep  8 11:41:02 2006
New Revision: 7377

Removed:
   dists/trunk/linux-2.6/debian/arch/amd64/xen/config.amd64
Modified:
   dists/trunk/linux-2.6/debian/arch/amd64/xen/config
   dists/trunk/linux-2.6/debian/arch/amd64/xen/defines

Log:
Update amd64 xen subarch config and defines to work with new config creation.


Modified: dists/trunk/linux-2.6/debian/arch/amd64/xen/config
==
--- dists/trunk/linux-2.6/debian/arch/amd64/xen/config  (original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/xen/config  Fri Sep  8 11:41:02 2006
@@ -1,21 +1 @@
 CONFIG_X86_64_XEN=y
-CONFIG_XEN_PCIDEV_FRONTEND=y
-# CONFIG_XEN_PCIDEV_FE_DEBUG is not set
-CONFIG_XEN_PRIVILEGED_GUEST=y
-CONFIG_XEN_BACKEND=y
-CONFIG_XEN_PCIDEV_BACKEND=y
-CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
-# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
-# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
-CONFIG_XEN_BLKDEV_BACKEND=y
-CONFIG_XEN_NETDEV_BACKEND=y
-# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
-# CONFIG_XEN_TPMDEV_BACKEND is not set
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_LOOPBACK=m
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DISABLE_SERIAL=y
-CONFIG_XEN_SYSFS=y
-CONFIG_XEN_COMPAT_030002_AND_LATER=y
-# CONFIG_XEN_COMPAT_LATEST_ONLY is not set

Modified: dists/trunk/linux-2.6/debian/arch/amd64/xen/defines
==
--- dists/trunk/linux-2.6/debian/arch/amd64/xen/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/xen/defines Fri Sep  8 11:41:02 2006
@@ -3,8 +3,13 @@
  amd64
 
 [image]
+configs: amd64/xen/config _xen/config
 initramfs-generators: initramfs-tools 
 type: plain-xen
 
 [xen]
 flavour: amd64
+
+[amd64_image]
+configs: amd64/config.amd64
+

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7353 - dists/trunk/firmware-nonfree/debian

[Frederik Schüler]

Author: fs
Date: Wed Sep  6 09:10:54 2006
New Revision: 7353

Modified:
   dists/trunk/firmware-nonfree/debian/changelog

Log:
Prepare for release


Modified: dists/trunk/firmware-nonfree/debian/changelog
==
--- dists/trunk/firmware-nonfree/debian/changelog   (original)
+++ dists/trunk/firmware-nonfree/debian/changelog   Wed Sep  6 09:10:54 2006
@@ -1,9 +1,10 @@
-firmware-nonfree (0.3) UNRELEASED; urgency=low
+firmware-nonfree (0.3) unstable; urgency=low
 
   * Rename qlogic initramfs-tools hook, closes: #386175
   * Make initramfs-tools hooks executable, closes: #386172
+  * Bump standars to 3.7.2, no changes required.
 
- -- Frederik Schüler [EMAIL PROTECTED]  Tue,  5 Sep 2006 23:19:23 +0200
+ -- Frederik Schüler [EMAIL PROTECTED]  Wed,  6 Sep 2006 11:10:29 +0200
 
 firmware-nonfree (0.2) unstable; urgency=low
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7337 - dists/trunk/linux-2.6/debian/arch

[Frederik Schüler]

Author: fs
Date: Tue Sep  5 14:18:25 2006
New Revision: 7337

Modified:
   dists/trunk/linux-2.6/debian/arch/config

Log:
Deactivate CONFIG_OSS_OBSOLETE_DRIVER


Modified: dists/trunk/linux-2.6/debian/arch/config
==
--- dists/trunk/linux-2.6/debian/arch/config(original)
+++ dists/trunk/linux-2.6/debian/arch/configTue Sep  5 14:18:25 2006
@@ -1024,3 +1024,4 @@
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
 CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_OSS_OBSOLETE_DRIVER is not set

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7343 - in dists/trunk/firmware-nonfree: . debian

[Frederik Schüler]

Author: fs
Date: Tue Sep  5 15:37:13 2006
New Revision: 7343

Modified:
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/update-firmware.sh

Log:
Prepare for release



Modified: dists/trunk/firmware-nonfree/debian/changelog
==
--- dists/trunk/firmware-nonfree/debian/changelog   (original)
+++ dists/trunk/firmware-nonfree/debian/changelog   Tue Sep  5 15:37:13 2006
@@ -1,3 +1,10 @@
+firmware-nonfree (0.2) unstable; urgency=low
+
+  * Release into unstable.
+  * Build-depend on linux-support-2.6.17-2.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Tue,  5 Sep 2006 17:36:33 +0200
+
 firmware-nonfree (0.1) experimental; urgency=low
 
   [ Frederik Schüler ]

Modified: dists/trunk/firmware-nonfree/update-firmware.sh
==
--- dists/trunk/firmware-nonfree/update-firmware.sh (original)
+++ dists/trunk/firmware-nonfree/update-firmware.sh Tue Sep  5 15:37:13 2006
@@ -1,3 +1,3 @@
 #!/bin/sh -e
 
-wget -r -nH -N --cut-dirs=3 -P qlogic-fw 
ftp://ftp.qlogic.com/outgoing/linux/firmware/
+wget -r -nH -N --cut-dirs=3 -P qlogic 
ftp://ftp.qlogic.com/outgoing/linux/firmware/

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7349 - in dists/trunk/firmware-nonfree/debian: . bin

[Frederik Schüler]

Author: fs
Date: Tue Sep  5 21:20:05 2006
New Revision: 7349

Modified:
   dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
   dists/trunk/firmware-nonfree/debian/changelog

Log:
Make initramfs-tools hooks executable


Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py   (original)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py   Tue Sep  5 
21:20:05 2006
@@ -80,6 +80,7 @@
 hook = self.templates['hook.initramfs-tools']
 hook_filename = debian/firmware_%s % package
 file(hook_filename, 'w').write(self.substitute(hook, vars))
+os.chmod(hook_filename, 0755)
 install_deb.append(%s /usr/share/initramfs-tools/hooks % 
hook_filename)
 
 postinst = self.templates['postinst.initramfs-tools']

Modified: dists/trunk/firmware-nonfree/debian/changelog
==
--- dists/trunk/firmware-nonfree/debian/changelog   (original)
+++ dists/trunk/firmware-nonfree/debian/changelog   Tue Sep  5 21:20:05 2006
@@ -1,8 +1,9 @@
 firmware-nonfree (0.3) UNRELEASED; urgency=low
 
   * Rename qlogic initramfs-tools hook, closes: #386175
+  * Make initramfs-tools hooks executable, closes: #386172
 
- -- Frederik Schüler [EMAIL PROTECTED]  Tue,  5 Sep 2006 22:32:05 +0200
+ -- Frederik Schüler [EMAIL PROTECTED]  Tue,  5 Sep 2006 23:19:23 +0200
 
 firmware-nonfree (0.2) unstable; urgency=low
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7269 - dists/trunk/linux-2.6/debian/arch/i386

[Frederik Schüler]

Author: fs
Date: Tue Aug 29 13:59:54 2006
New Revision: 7269

Modified:
   dists/trunk/linux-2.6/debian/arch/i386/config

Log:
remove obsolete config options for i386.


Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==
--- dists/trunk/linux-2.6/debian/arch/i386/config   (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config   Tue Aug 29 13:59:54 2006
@@ -2,7 +2,6 @@
 CONFIG_UID16=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
-CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
 CONFIG_EMBEDDED=y
 # CONFIG_KALLSYMS_ALL is not set
@@ -50,8 +49,6 @@
 CONFIG_SOFTWARE_SUSPEND=y
 CONFIG_PM_STD_PARTITION=
 CONFIG_ACPI=y
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SLEEP_PROC_FS=y
 # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
@@ -69,10 +66,8 @@
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=m
@@ -126,8 +121,6 @@
 CONFIG_HOTPLUG_PCI_PCIE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_PCI_MSI=y
-# CONFIG_PCI_LEGACY_PROC is not set
-CONFIG_PCI_NAMES=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
@@ -188,7 +181,6 @@
 # CONFIG_MTD_CFI_I8 is not set
 CONFIG_MTD_CFI_INTELEXT=m
 CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_AMDSTD_RETRY=0
 CONFIG_MTD_CFI_STAA=m
 CONFIG_MTD_CFI_UTIL=m
 CONFIG_MTD_RAM=m
@@ -204,7 +196,6 @@
 CONFIG_MTD_NETSC520=m
 CONFIG_MTD_TS5500=m
 CONFIG_MTD_SBC_GXX=m
-CONFIG_MTD_ELAN_104NC=m
 CONFIG_MTD_SCx200_DOCFLASH=m
 # CONFIG_MTD_AMD76XROM is not set
 # CONFIG_MTD_ICHXROM is not set
@@ -224,7 +215,6 @@
 CONFIG_MTD_MTDRAM=m
 CONFIG_MTDRAM_TOTAL_SIZE=4096
 CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLKMTD=m
 CONFIG_MTD_BLOCK2MTD=m
 CONFIG_MTD_DOC2000=m
 CONFIG_MTD_DOC2001=m
@@ -340,7 +330,6 @@
 CONFIG_BLK_DEV_PDC202XX_OLD=m
 CONFIG_PDC202XX_BURST=y
 CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_PDC202XX_FORCE=y
 CONFIG_BLK_DEV_SVWKS=m
 CONFIG_BLK_DEV_SIIMAGE=m
 CONFIG_BLK_DEV_SIS5513=m
@@ -364,7 +353,6 @@
 CONFIG_SCSI_ATA_PIIX=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
-# CONFIG_SCSI_CPQFCTS is not set
 CONFIG_SCSI_DMX3191D=m
 CONFIG_SCSI_DTC3280=m
 CONFIG_SCSI_EATA=m
@@ -389,20 +377,15 @@
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
 CONFIG_SCSI_IPR=m
 # CONFIG_SCSI_IPR_TRACE is not set
 # CONFIG_SCSI_IPR_DUMP is not set
 CONFIG_SCSI_PAS16=m
-# CONFIG_SCSI_PCI2000 is not set
-# CONFIG_SCSI_PCI2220I is not set
 CONFIG_SCSI_PSI240I=m
 CONFIG_SCSI_QLOGIC_FAS=m
-CONFIG_SCSI_QLOGIC_ISP=m
 CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLOGIC_1280_1040=y
 CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_SEAGATE is not set
 CONFIG_SCSI_SYM53C416=m
@@ -444,16 +427,12 @@
 CONFIG_IEEE1394_ETH1394=m
 CONFIG_IEEE1394_DV1394=m
 CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_CMP=m
-CONFIG_IEEE1394_AMDTP=m
 CONFIG_I2O=m
 CONFIG_I2O_CONFIG=m
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
 # CONFIG_IP_PNP is not set
-CONFIG_IP_TCPDIAG=m
-CONFIG_IP_TCPDIAG_IPV6=y
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
@@ -473,7 +452,6 @@
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=y
 CONFIG_LTPC=m
 CONFIG_COPS=m
 CONFIG_COPS_DAYNA=y
@@ -505,7 +483,6 @@
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_QOS=y
 CONFIG_NET_ESTIMATOR=y
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
@@ -588,7 +565,6 @@
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
-# CONFIG_BT_HCIUART_BCSP_TXCRC is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -696,7 +672,6 @@
 CONFIG_BNX2=m
 CONFIG_IXGB=m
 CONFIG_S2IO=m
-# CONFIG_2BUFF_MODE is not set
 CONFIG_TR=y
 CONFIG_IBMTR=m
 CONFIG_IBMOL=m
@@ -745,7 +720,6 @@
 CONFIG_DSCC4_PCI_RST=y
 CONFIG_LANMEDIA=m
 CONFIG_SEALEVEL_4021=m
-CONFIG_SYNCLINK_SYNCPPP=m
 CONFIG_HDLC=m
 CONFIG_HDLC_RAW=y
 CONFIG_HDLC_RAW_ETH=y
@@ -765,7 +739,6 @@
 CONFIG_DLCI_MAX=8
 CONFIG_SDLA=m
 CONFIG_WAN_ROUTER_DRIVERS=y
-# CONFIG_VENDOR_SANGOMA is not set
 CONFIG_CYCLADES_SYNC=m
 CONFIG_CYCLOMX_X25=y
 CONFIG_LAPBETHER=m
@@ -975,9 +948,7 @@
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_VORTEX=m
 CONFIG_GAMEPORT_FM801=m
-CONFIG_GAMEPORT_CS461X=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
@@ -999,13 +970,11 @@
 CONFIG_SERIAL_8250_PCI=m
 CONFIG_SERIAL_8250_PNP=m
 CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_ACPI is not set
 CONFIG_SERIAL_8250_NR_UARTS=16
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set

[kernel] r7232 - in dists/sid/linux-2.6/debian: arch/i386

[Frederik Schüler]

Author: fs
Date: Wed Aug 23 13:55:55 2006
New Revision: 7232

Modified:
   dists/sid/linux-2.6/debian/arch/i386/config
   dists/sid/linux-2.6/debian/changelog

Log:
Activate EFI boot support on i386.


Modified: dists/sid/linux-2.6/debian/arch/i386/config
==
--- dists/sid/linux-2.6/debian/arch/i386/config (original)
+++ dists/sid/linux-2.6/debian/arch/i386/config Wed Aug 23 13:55:55 2006
@@ -44,7 +44,6 @@
 CONFIG_EDD=m
 # CONFIG_HIGHMEM64G is not set
 CONFIG_MTRR=y
-# CONFIG_EFI is not set
 CONFIG_REGPARM=y
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
@@ -1797,3 +1796,6 @@
 CONFIG_CLEAN_COMPILE=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
+CONFIG_EFI_VARS=y
+CONFIG_BOOT_IOREMAP=y
+CONFIG_EFI=y

Modified: dists/sid/linux-2.6/debian/changelog
==
--- dists/sid/linux-2.6/debian/changelog(original)
+++ dists/sid/linux-2.6/debian/changelogWed Aug 23 13:55:55 2006
@@ -9,9 +9,6 @@
   * mipsel/r5k-cobalt: Increase 8250 NR_UARTS and RUNTIME_UARTS to 4.
   * mipsel/r5k-cobalt: Fix MAC detection problem on Qube 2700.
 
-  [ Kyle McMartin ]
-  * Apply patch to fix pa8800 (mostly...)
-
   [ Bastian Blank ]
   * Update vserver patch to 2.0.2-rc29.
   * Add stable release 2.6.17.10:
@@ -27,6 +24,7 @@
 
   [ Frederik Schüler ]
   * Activate CONFIG_R8169_VLAN on amd64. (closes: #383707)
+  * Activate EFI boot support on i386. (closes: #381951)
 
   [ dann frazier ]
   * Include module.lds in headers package if it exists. (closes: #342246)

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7211 - dists/trunk

[Frederik Schüler]

Author: fs
Date: Sun Aug 20 15:52:31 2006
New Revision: 7211

Modified:
   dists/trunk/MAINTAINERS.Debian

Log:
Updated maintainers list.


Modified: dists/trunk/MAINTAINERS.Debian
==
--- dists/trunk/MAINTAINERS.Debian  (original)
+++ dists/trunk/MAINTAINERS.Debian  Sun Aug 20 15:52:31 2006
@@ -3,29 +3,24 @@
 
 General kernel work:
 
-  - William Lee Irwin III
-  - Christoph Hellwig
-  - Maximilian Attems
+Security support:
+  - Dann Frazier
+  - Moritz Muehlenhoff
 
 Kernel packages, sorted by architecture:
 
   * alpha
 - Norbert Tretkowski
   * amd64
-- Goswin von Brederlow
 - Frederik Schueler
   * arm
-- N.N.
+- Martin Michlmayr
   * hppa
-- Matthew Wilcox
 - Kyle McMartin
   * i386
-- Andres Salomon
-- Simon Horman
-- Joshua Kwan
+  - Maximilian Attems
   * ia64
-- Matthew Wilcox
-- dann frazier
+- Dann Frazier
   * m68k
 - Christian T. Steigies
   * mips
@@ -34,21 +29,20 @@
 - Thiemo Seufer
   * powerpc
 - Sven Luther
-- Jens Schmalzing
   * s390
 - Bastian Blank
   * sparc
-- Joshua Kwan
-- Ben Collins
+- Jurij Smakov
 
 Kernel-related packages:
 
-  * initrd-tools
-- Jeff Bailey
-  * cramfs
-- Francesco P. Lovergine
+  * initramfs-tools:
+- Maximilian Attems
+  * mkvmlinuz
+- Sven Luther
   * module-init-tools
 - Marco d'Itri 
-  * mkvmlinuz
-- Jens Schmalzing
-
+  * udev
+- Marco d'Itri
+  * yaird
+- Jonas Smedegaard

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7192 - in dists/sid/linux-2.6/debian: .

[Frederik Schüler]

Author: fs
Date: Fri Aug 18 22:20:23 2006
New Revision: 7192

Modified:
   dists/sid/linux-2.6/debian/arch/amd64/config.amd64
   dists/sid/linux-2.6/debian/changelog

Log:
Activate CONFIG_R8169_VLAN on amd64


Modified: dists/sid/linux-2.6/debian/arch/amd64/config.amd64
==
--- dists/sid/linux-2.6/debian/arch/amd64/config.amd64  (original)
+++ dists/sid/linux-2.6/debian/arch/amd64/config.amd64  Fri Aug 18 22:20:23 2006
@@ -7,7 +7,7 @@
 CONFIG_HAVE_DEC_LOCK=y
 CONFIG_NR_CPUS=32
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
-# CONFIG_R8169_VLAN is not set
+CONFIG_R8169_VLAN=y
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_MAVEN=m
 # CONFIG_SOUND_AWE32_SYNTH is not set

Modified: dists/sid/linux-2.6/debian/changelog
==
--- dists/sid/linux-2.6/debian/changelog(original)
+++ dists/sid/linux-2.6/debian/changelogFri Aug 18 22:20:23 2006
@@ -23,7 +23,10 @@
 - powerpc: Clear HID0 attention enable on PPC970 at boot time
 (CVE-2006-4093)
 
- -- maximilian attems [EMAIL PROTECTED]  Fri, 18 Aug 2006 20:25:24 +0200
+  [ Frederik Schüler ]
+  * Activate CONFIG_R8169_VLAN on amd64. (closes: #383707)
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Sat, 19 Aug 2006 00:19:31 +0200
 
 linux-2.6 (2.6.17-6) unstable; urgency=low
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7121 - dists/sid/linux-2.6/debian/templates

[Frederik Schüler]

Author: fs
Date: Fri Aug 11 10:30:50 2006
New Revision: 7121

Modified:
   dists/sid/linux-2.6/debian/templates/control.extra.in

Log:
Add transitional amd64 packages


Modified: dists/sid/linux-2.6/debian/templates/control.extra.in
==
--- dists/sid/linux-2.6/debian/templates/control.extra.in   (original)
+++ dists/sid/linux-2.6/debian/templates/control.extra.in   Fri Aug 11 
10:30:50 2006
@@ -20,10 +20,42 @@
 Architecture: amd64
 Section: admin
 Priority: extra
-Depends: linux-image-2.6-amd64-k8
+Depends: linux-image-2.6-amd64
 Description: Linux 2.6 image on all x86-64 - transition package
  This package is for transition only.
 
+Package: linux-image-2.6-amd64-k8
+Architecture: amd64
+Section: admin
+Priority: extra
+Depends: linux-image-2.6-amd64
+Description: Linux 2.6 image on AMD64 K8 machines - transition package
+ This package is for transition only.
+
+Package: linux-image-2.6-amd64-k8-smp
+Architecture: amd64
+Section: admin
+Priority: extra
+Depends: linux-image-2.6-amd64
+Description: Linux 2.6 image on AMD64 K8 SMP machines - transition package
+ This package is for transition only.
+
+Package: linux-image-2.6-em64t-p4
+Architecture: amd64
+Section: admin
+Priority: extra
+Depends: linux-image-2.6-amd64
+Description: Linux 2.6 image on Intel em64t P4 machines - transition package
+ This package is for transition only.
+
+Package: linux-image-2.6-em64t-p4-smp
+Architecture: amd64
+Section: admin
+Priority: extra
+Depends: linux-image-2.6-amd64
+Description: Linux 2.6 image on Intel em64t P4/Xeon SMP - transition package
+ This package is for transition only.
+
 Package: kernel-image-2.6-386
 X-Version-Overwrite-Epoch: 1
 Architecture: i386

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7122 - dists/sid/linux-2.6/debian/templates

[Frederik Schüler]

Author: fs
Date: Fri Aug 11 10:45:51 2006
New Revision: 7122

Modified:
   dists/sid/linux-2.6/debian/templates/control.extra.in

Log:
Add transitional packages for vserver flavours, too.


Modified: dists/sid/linux-2.6/debian/templates/control.extra.in
==
--- dists/sid/linux-2.6/debian/templates/control.extra.in   (original)
+++ dists/sid/linux-2.6/debian/templates/control.extra.in   Fri Aug 11 
10:45:51 2006
@@ -56,6 +56,22 @@
 Description: Linux 2.6 image on Intel em64t P4/Xeon SMP - transition package
  This package is for transition only.
 
+Package: linux-image-2.6-vserver-amd64-k8-smp
+Architecture: amd64
+Section: admin
+Priority: extra
+Depends: linux-image-2.6-vserver-amd64
+Description: Linux 2.6 image on AMD64 K8 SMP machines - transition package
+ This package is for transition only.
+
+Package: linux-image-2.6-vserver-em64t-p4-smp
+Architecture: amd64
+Section: admin
+Priority: extra
+Depends: linux-image-2.6-vserver-amd64
+Description: Linux 2.6 image on Intel em64t P4/Xeon SMP - transition package
+ This package is for transition only.
+
 Package: kernel-image-2.6-386
 X-Version-Overwrite-Epoch: 1
 Architecture: i386

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7129 - dists/sid/linux-2.6/debian

[Frederik Schüler]

Author: fs
Date: Fri Aug 11 16:00:31 2006
New Revision: 7129

Modified:
   dists/sid/linux-2.6/debian/changelog

Log:
Prepare for release.


Modified: dists/sid/linux-2.6/debian/changelog
==
--- dists/sid/linux-2.6/debian/changelog(original)
+++ dists/sid/linux-2.6/debian/changelogFri Aug 11 16:00:31 2006
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.17-6) UNRELEASED; urgency=low
+linux-2.6 (2.6.17-6) unstable; urgency=low
 
   [ maximilian attems ]
   * debian/arch/i386/defines: Activate 686-bigmem flavour for enterprise

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7108 - in dists/sid/linux-2.6/debian: . arch arch/amd64 arch/amd64/vserver arch/amd64/xen patches patches/series

[Frederik Schüler]

]
 initramfs: false
 type: plain-xen
 
-[amd64-k8]
-class: AMD64 K8 
-longclass: 64bit AMD Athlon64, AthlonFX, Opteron and Turion64
-
-[em64t-p4]
-class: Intel em64t P4
-longclass: 64bit Intel em64t Pentium4/Pentium D/Xeon
+[amd64]
+class: AMD64
+longclass: all 64bit single- and multiprocessor AMD and Intel
 

Modified: dists/sid/linux-2.6/debian/arch/config
==
--- dists/sid/linux-2.6/debian/arch/config  (original)
+++ dists/sid/linux-2.6/debian/arch/config  Mon Aug  7 11:34:43 2006
@@ -215,7 +215,7 @@
 CONFIG_PROC_KCORE=y
 CONFIG_NFS_COMMON=y
 CONFIG_USB_MON=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_SCSI_SATA=m
 CONFIG_SCSI_SATA_AHCI=m

Modified: dists/sid/linux-2.6/debian/changelog
==
--- dists/sid/linux-2.6/debian/changelog(original)
+++ dists/sid/linux-2.6/debian/changelogMon Aug  7 11:34:43 2006
@@ -15,7 +15,38 @@
   * Make gcc-4.1 the default compiler.
   * [powerpc]: Use gcc-4.1.
 
- -- Bastian Blank [EMAIL PROTECTED]  Mon,  7 Aug 2006 10:58:54 +0200
+  [ Frederik Schüler ]
+  * [amd64] Add smp-alternatives backport.
+  * [amd64] Drop smp flavours.
+  * [amd64] Merge k8 and p4 flavours into a generic one, following upstreams
+advice.
+  * Activate BSD_PROCESS_ACCT_V3.
+  * Add stable release 2.6.17.8:
+- ALSA: Don't reject O_RDWR at opening PCM OSS
+- Add stable branch to maintainers file
+- tty serialize flush_to_ldisc
+- S390: fix futex_atomic_cmpxchg_inatomic
+- Fix budget-av compile failure
+- cond_resched() fix
+- e1000: add forgotten PCI ID for supported device
+- ext3: avoid triggering ext3_error on bad NFS file handle
+- ext3 -nobh option causes oops
+- Fix race related problem when adding items to and svcrpc auth cache.
+- ieee1394: sbp2: enable auto spin-up for Maxtor disks
+- invalidate_bdev() speedup
+- Sparc64 quad-float emulation fix
+- VLAN state handling fix
+- Update frag_list in pskb_trim
+- UHCI: Fix handling of short last packet
+- sky2: NAPI bug
+- i2c: Fix 'ignore' module parameter handling in i2c-core
+- scx200_acb: Fix the block transactions
+- scx200_acb: Fix the state machine
+- H.323 helper: fix possible NULL-ptr dereference
+- Don't allow chmod() on the /proc/pid/ files
+- PCI: fix issues with extended conf space when MMCONFIG disabled because 
of e820
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Mon,  7 Aug 2006 13:00:02 +0200
 
 linux-2.6 (2.6.17-5) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/2.6.17.8
==
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/2.6.17.8 Mon Aug  7 11:34:43 2006
@@ -0,0 +1,942 @@
+diff --git a/MAINTAINERS b/MAINTAINERS
+index c3c5842..6a1bb87 100644
+--- a/MAINTAINERS
 b/MAINTAINERS
+@@ -2572,6 +2572,14 @@ M:  [EMAIL PROTECTED]
+ L:[EMAIL PROTECTED]
+ S:Maintained
+ 
++STABLE BRANCH:
++P:Greg Kroah-Hartman
++M:[EMAIL PROTECTED]
++P:Chris Wright
++M:[EMAIL PROTECTED]
++L:[EMAIL PROTECTED]
++S:Maintained
++
+ TPM DEVICE DRIVER
+ P:Kylene Hall
+ M:[EMAIL PROTECTED]
+diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
+index 6b1ea0c..e545b09 100644
+--- a/arch/i386/pci/mmconfig.c
 b/arch/i386/pci/mmconfig.c
+@@ -15,7 +15,9 @@ #include linux/acpi.h
+ #include asm/e820.h
+ #include pci.h
+ 
+-#define MMCONFIG_APER_SIZE (256*1024*1024)
++/* aperture is up to 256MB but BIOS may reserve less */
++#define MMCONFIG_APER_MIN (2 * 1024*1024)
++#define MMCONFIG_APER_MAX (256 * 1024*1024)
+ 
+ /* Assume systems with more busses have correct MCFG */
+ #define MAX_CHECK_BUS 16
+@@ -197,9 +199,10 @@ void __init pci_mmcfg_init(void)
+   return;
+ 
+   if (!e820_all_mapped(pci_mmcfg_config[0].base_address,
+-  pci_mmcfg_config[0].base_address + MMCONFIG_APER_SIZE,
++  pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN,
+   E820_RESERVED)) {
+-  printk(KERN_ERR PCI: BIOS Bug: MCFG area is not 
E820-reserved\n);
++  printk(KERN_ERR PCI: BIOS Bug: MCFG area at %x is not 
E820-reserved\n,
++  pci_mmcfg_config[0].base_address);
+   printk(KERN_ERR PCI: Not using MMCONFIG.\n);
+   return;
+   }
+diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c
+index a2060e4..3c55c76 100644
+--- a/arch/x86_64/pci/mmconfig.c
 b/arch/x86_64/pci/mmconfig.c
+@@ -13,7 +13,10 @@ #include asm/e820.h
+ 
+ #include pci.h
+ 
+-#define MMCONFIG_APER_SIZE (256*1024*1024)
++/* aperture is up to 256MB but BIOS may reserve less */
++#define MMCONFIG_APER_MIN (2 * 1024*1024)
++#define MMCONFIG_APER_MAX (256 * 1024*1024

[kernel] r7092 - dists/trunk/linux-2.6/debian/arch

[Frederik Schüler]

Author: fs
Date: Sun Aug  6 21:02:57 2006
New Revision: 7092

Modified:
   dists/trunk/linux-2.6/debian/arch/defines

Log:
Bump the ABI to 2.


Modified: dists/trunk/linux-2.6/debian/arch/defines
==
--- dists/trunk/linux-2.6/debian/arch/defines   (original)
+++ dists/trunk/linux-2.6/debian/arch/defines   Sun Aug  6 21:02:57 2006
@@ -1,5 +1,5 @@
 [abi]
-abiname: 1
+abiname: 2
 
 [base]
 arches:

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r7093 - in dists/trunk/linux-2.6/debian/patches: series

[Frederik Schüler]

Author: fs
Date: Sun Aug  6 21:03:57 2006
New Revision: 7093

Added:
   dists/trunk/linux-2.6/debian/patches/series/6-extra
   dists/trunk/linux-2.6/debian/patches/x86_64-smp-alternatives.patch

Log:
Add smp-alternatives patch for amd64.


Added: dists/trunk/linux-2.6/debian/patches/series/6-extra
==
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/series/6-extra Sun Aug  6 21:03:57 2006
@@ -0,0 +1 @@
++ x86_64-smp-alternatives.patch amd64

Added: dists/trunk/linux-2.6/debian/patches/x86_64-smp-alternatives.patch
==
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/x86_64-smp-alternatives.patch  Sun Aug 
 6 21:03:57 2006
@@ -0,0 +1,1293 @@
+From: Gerd Hoffmann [EMAIL PROTECTED]
+Date: Mon, 26 Jun 2006 11:56:16 + (+0200)
+Subject: [PATCH] x86_64: x86_64 version of the smp alternative patch.
+X-Git-Tag: v2.6.18-rc1
+X-Git-Url: 
http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=d167a51877e94dda73dd656c51f363502309f713
+
+[PATCH] x86_64: x86_64 version of the smp alternative patch.
+
+Changes are largely identical to the i386 version:
+
+ * alternative #define are moved to the new alternative.h file.
+ * one new elf section with pointers to the lock prefixes which can be
+   nop'ed out for non-smp.
+ * two new elf sections simliar to the classic alternatives to
+   replace SMP code with simpler UP code.
+ * fixup headers to use alternative.h instead of defining their own
+   LOCK / LOCK_PREFIX macros.
+
+The patch reuses the i386 version of the alternatives code to avoid code
+duplication.  The code in alternatives.c was shuffled around a bit to
+reduce the number of #ifdefs needed.  It also got some tweaks needed for
+x86_64 (vsyscall page handling) and new features (noreplacement option
+which was x86_64 only up to now).  Debug printk's are changed from
+compile-time to runtime.
+
+Loosely based on a early version from Bastian Blank [EMAIL PROTECTED]
+
+Signed-off-by: Gerd Hoffmann [EMAIL PROTECTED]
+Signed-off-by: Andi Kleen [EMAIL PROTECTED]
+Signed-off-by: Linus Torvalds [EMAIL PROTECTED]
+---
+
+diff -pruN 2.6.17-a/arch/i386/kernel/alternative.c 
2.6.17-b/arch/i386/kernel/alternative.c
+--- 2.6.17-a/arch/i386/kernel/alternative.c2006-06-18 03:49:35.0 
+0200
 2.6.17-b/arch/i386/kernel/alternative.c2006-07-29 23:11:56.0 
+0200
+@@ -4,27 +4,41 @@
+ #include asm/alternative.h
+ #include asm/sections.h
+ 
+-#define DEBUG 0
+-#if DEBUG
+-# define DPRINTK(fmt, args...) printk(fmt, args)
+-#else
+-# define DPRINTK(fmt, args...)
+-#endif
++static int no_replacement= 0;
++static int smp_alt_once  = 0;
++static int debug_alternative = 0;
++
++static int __init noreplacement_setup(char *s)
++{
++  no_replacement = 1;
++  return 1;
++}
++static int __init bootonly(char *str)
++{
++  smp_alt_once = 1;
++  return 1;
++}
++static int __init debug_alt(char *str)
++{
++  debug_alternative = 1;
++  return 1;
++}
+ 
++__setup(noreplacement, noreplacement_setup);
++__setup(smp-alt-boot, bootonly);
++__setup(debug-alternative, debug_alt);
++
++#define DPRINTK(fmt, args...) if (debug_alternative) \
++  printk(KERN_DEBUG fmt, args)
++
++#ifdef GENERIC_NOP1
+ /* Use inline assembly to define this because the nops are defined
+as inline assembly strings in the include files and we cannot
+get them easily into strings. */
+ asm(\t.data\nintelnops: 
+   GENERIC_NOP1 GENERIC_NOP2 GENERIC_NOP3 GENERIC_NOP4 GENERIC_NOP5 
GENERIC_NOP6
+   GENERIC_NOP7 GENERIC_NOP8);
+-asm(\t.data\nk8nops: 
+-  K8_NOP1 K8_NOP2 K8_NOP3 K8_NOP4 K8_NOP5 K8_NOP6
+-  K8_NOP7 K8_NOP8);
+-asm(\t.data\nk7nops: 
+-  K7_NOP1 K7_NOP2 K7_NOP3 K7_NOP4 K7_NOP5 K7_NOP6
+-  K7_NOP7 K7_NOP8);
+-
+-extern unsigned char intelnops[], k8nops[], k7nops[];
++extern unsigned char intelnops[];
+ static unsigned char *intel_nops[ASM_NOP_MAX+1] = {
+   NULL,
+   intelnops,
+@@ -36,6 +50,13 @@ static unsigned char *intel_nops[ASM_NOP
+   intelnops + 1 + 2 + 3 + 4 + 5 + 6,
+   intelnops + 1 + 2 + 3 + 4 + 5 + 6 + 7,
+ };
++#endif
++
++#ifdef K8_NOP1
++asm(\t.data\nk8nops: 
++  K8_NOP1 K8_NOP2 K8_NOP3 K8_NOP4 K8_NOP5 K8_NOP6
++  K8_NOP7 K8_NOP8);
++extern unsigned char k8nops[];
+ static unsigned char *k8_nops[ASM_NOP_MAX+1] = {
+   NULL,
+   k8nops,
+@@ -47,6 +68,13 @@ static unsigned char *k8_nops[ASM_NOP_MA
+   k8nops + 1 + 2 + 3 + 4 + 5 + 6,
+   k8nops + 1 + 2 + 3 + 4 + 5 + 6 + 7,
+ };
++#endif
++
++#ifdef K7_NOP1
++asm(\t.data\nk7nops: 
++  K7_NOP1 K7_NOP2 K7_NOP3 K7_NOP4 K7_NOP5 K7_NOP6
++  K7_NOP7 K7_NOP8);
++extern unsigned char k7nops[];
+ static unsigned char *k7_nops[ASM_NOP_MAX+1] = {
+   NULL,
+   k7nops,
+@@ -58,6 +86,18 @@ static unsigned char *k7_nops[ASM_NOP_MA
+   k7nops + 1 + 2 + 3 + 4 + 5 + 6,
+   

[kernel] r6803 - dists/trunk/linux-2.6/debian/arch/amd64

[Frederik Schüler]

Author: fs
Date: Wed Jun 14 15:24:37 2006
New Revision: 6803

Modified:
   dists/trunk/linux-2.6/debian/arch/amd64/defines

Log:
Use gcc-4.1 for amd64 too.


Modified: dists/trunk/linux-2.6/debian/arch/amd64/defines
==
--- dists/trunk/linux-2.6/debian/arch/amd64/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/defines Wed Jun 14 15:24:37 2006
@@ -1,4 +1,5 @@
 [base]
+compiler: gcc-4.1
 flavours:
  amd64-generic
  amd64-k8

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r6657 - in dists/sid/linux-2.6/debian: patches patches/series

[Frederik Schüler]

Author: fs
Date: Sun May 21 01:00:12 2006
New Revision: 6657

Added:
   dists/sid/linux-2.6/debian/patches/2.6.16.17
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/14

Log:
Add stable release 2.6.16.17


Modified: dists/sid/linux-2.6/debian/changelog
==
--- dists/sid/linux-2.6/debian/changelog(original)
+++ dists/sid/linux-2.6/debian/changelogSun May 21 01:00:12 2006
@@ -1,5 +1,6 @@
 linux-2.6 (2.6.16-14) UNRELEASED; urgency=low
 
+  [ Bastian Blank ]
   * Add stable release 2.6.16.16:
 - fs/locks.c: Fix lease_init (CVE-2006-1860)
   * Make i386 xen images recommend libc6-xen.
@@ -18,7 +19,35 @@
   * [alpha] Readded patch to support prctl syscall, got lost when upgrading
 to 2.6.16.
 
- -- Norbert Tretkowski [EMAIL PROTECTED]  Thu, 18 May 2006 10:09:30 -0500
+  [ Frederik Schüler ]
+  * Add stable release 2.6.16.17:
+- SCTP: Validate the parameter length in HB-ACK chunk (CVE-2006-1857)
+- SCTP: Respect the real chunk length when walking parameters
+  (CVE-2006-1858)
+- ptrace_attach: fix possible deadlock schenario with irqs
+- Fix ptrace_attach()/ptrace_traceme()/de_thread() race
+- page migration: Fix fallback behavior for dirty pages
+- add migratepage address space op to shmem
+- Remove cond_resched in gather_stats()
+- VIA quirk fixup, additional PCI IDs
+- PCI quirk: VIA IRQ fixup should only run for VIA southbridges
+- Fix udev device creation
+- limit request_fn recursion
+- PCI: correctly allocate return buffers for osc calls
+- selinux: check for failed kmalloc in security_sid_to_context()
+- TG3: ethtool always report port is TP.
+- Netfilter: do_add_counters race, possible oops or info leak
+  (CVE-2006-0039)
+- scx200_acb: Fix resource name use after free
+- smbus unhiding kills thermal management
+- fs/compat.c: fix 'if (a |= b )' typo
+- smbfs: Fix slab corruption in samba error path
+- fs/locks.c: Fix sys_flock() race
+- USB: ub oops in block_uevent
+- via-rhine: zero pad short packets on Rhine I ethernet cards
+- md: Avoid oops when attempting to fix read errors on raid10
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Sun, 21 May 2006 02:49:06 +0200
 
 linux-2.6 (2.6.16-13) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/2.6.16.17
==
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/2.6.16.17Sun May 21 01:00:12 2006
@@ -0,0 +1,804 @@
+diff --git a/block/elevator.c b/block/elevator.c
+index 24b702d..ef1e606 100644
+--- a/block/elevator.c
 b/block/elevator.c
+@@ -314,6 +314,7 @@ void elv_insert(request_queue_t *q, stru
+ {
+   struct list_head *pos;
+   unsigned ordseq;
++  int unplug_it = 1;
+ 
+   rq-q = q;
+ 
+@@ -378,6 +379,11 @@ void elv_insert(request_queue_t *q, stru
+   }
+ 
+   list_add_tail(rq-queuelist, pos);
++  /*
++   * most requeues happen because of a busy condition, don't
++   * force unplug of the queue for that case.
++   */
++  unplug_it = 0;
+   break;
+ 
+   default:
+@@ -386,7 +392,7 @@ void elv_insert(request_queue_t *q, stru
+   BUG();
+   }
+ 
+-  if (blk_queue_plugged(q)) {
++  if (unplug_it  blk_queue_plugged(q)) {
+   int nrq = q-rq.count[READ] + q-rq.count[WRITE]
+   - q-in_flight;
+ 
+diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
+index 0ef2971..cd995c3 100644
+--- a/block/ll_rw_blk.c
 b/block/ll_rw_blk.c
+@@ -1719,8 +1719,21 @@ void blk_run_queue(struct request_queue 
+ 
+   spin_lock_irqsave(q-queue_lock, flags);
+   blk_remove_plug(q);
+-  if (!elv_queue_empty(q))
+-  q-request_fn(q);
++
++  /*
++   * Only recurse once to avoid overrunning the stack, let the unplug
++   * handling reinvoke the handler shortly if we already got there.
++   */
++  if (!elv_queue_empty(q)) {
++  if (!test_and_set_bit(QUEUE_FLAG_REENTER, q-queue_flags)) {
++  q-request_fn(q);
++  clear_bit(QUEUE_FLAG_REENTER, q-queue_flags);
++  } else {
++  blk_plug_device(q);
++  kblockd_schedule_work(q-unplug_work);
++  }
++  }
++
+   spin_unlock_irqrestore(q-queue_lock, flags);
+ }
+ EXPORT_SYMBOL(blk_run_queue);
+diff --git a/drivers/block/ub.c b/drivers/block/ub.c
+index f04d864..a9485e5 100644
+--- a/drivers/block/ub.c
 b/drivers/block/ub.c
+@@ -704,6 +704,9 @@ static void ub_cleanup(struct ub_dev *sc
+   kfree(lun);
+   }
+ 
++  usb_set_intfdata(sc-intf, NULL);
++  usb_put_intf(sc-intf);
++  usb_put_dev(sc-dev);
+   kfree(sc);
+ }
+ 
+@@ -2428,7 +2431,12

[kernel] r6561 - in dists/trunk/linux-2.6/debian: . arch arch/hppa arch/i386 patches patches/series

[Frederik Schüler]

Author: fs
Date: Fri May 12 11:52:43 2006
New Revision: 6561

Removed:
   dists/trunk/linux-2.6/debian/patches/s390-drivers-qeth.patch
Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/hppa/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/0experimental.1

Log:
Update trunk to rc4.
Make CONFIG_SND_PDAUDIOCF and CONFIG_SND_VXPOCKET global options.
delete patches/s390-drivers-qeth.patch: merged upstream.


Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==
--- dists/trunk/linux-2.6/debian/arch/alpha/config  (original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config  Fri May 12 11:52:43 2006
@@ -1282,9 +1282,7 @@
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_VXPOCKET=m
 CONFIG_SND_VXP440=m
-CONFIG_SND_PDAUDIOCF=m
 CONFIG_SOUND_PRIME=m
 CONFIG_SOUND_BT878=m
 CONFIG_SOUND_CMPCI=m

Modified: dists/trunk/linux-2.6/debian/arch/config
==
--- dists/trunk/linux-2.6/debian/arch/config(original)
+++ dists/trunk/linux-2.6/debian/arch/configFri May 12 11:52:43 2006
@@ -915,3 +915,5 @@
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_MUTEXES is not set
 CONFIG_BCM43XX_DEBUG=y
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_VXPOCKET=m

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
==
--- dists/trunk/linux-2.6/debian/arch/hppa/config   (original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config   Fri May 12 11:52:43 2006
@@ -659,9 +659,7 @@
 # CONFIG_SND_VX222 is not set
 # CONFIG_SND_HDA_INTEL is not set
 # CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_VXPOCKET is not set
 # CONFIG_SND_VXP440 is not set
-# CONFIG_SND_PDAUDIOCF is not set
 CONFIG_SND_HARMONY=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_USB_ARCH_HAS_HCD=y

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==
--- dists/trunk/linux-2.6/debian/arch/i386/config   (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config   Fri May 12 11:52:43 2006
@@ -1441,9 +1441,7 @@
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_VXPOCKET=m
 CONFIG_SND_VXP440=m
-CONFIG_SND_PDAUDIOCF=m
 CONFIG_SOUND_PRIME=m
 CONFIG_SOUND_BT878=m
 CONFIG_SOUND_CMPCI=m

Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog  (original)
+++ dists/trunk/linux-2.6/debian/changelog  Fri May 12 11:52:43 2006
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.16+2.6.17-rc4-0experimental.1) experimental; urgency=low
+
+  * New upstream release candidate.
+
+ -- Frederik Schüler [EMAIL PROTECTED]  Fri, 12 May 2006 13:02:25 +0200
+
 linux-2.6 (2.6.16+2.6.17-rc3-0experimental.1) experimental; urgency=low
 
   [ Frederik Schüler ]

Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1
==
--- dists/trunk/linux-2.6/debian/patches/series/0experimental.1 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1 Fri May 12 
11:52:43 2006
@@ -24,4 +24,3 @@
 + s390-drivers-ccw-uevent-cleanup.patch
 + mips-sb1-duart-tts.patch
 #FIXME + powerpc-mkvmlinuz-support-2.patch
-+ s390-drivers-qeth.patch

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r6558 - in people/fs/firmware-0.1/debian: .

[Frederik Schüler]

Author: fs
Date: Thu May 11 15:50:08 2006
New Revision: 6558

Added:
   people/fs/firmware-0.1/debian/templates/firmware.postinst.in
Modified:
   people/fs/firmware-0.1/debian/rules

Log:
Add postinst to rebuild the initramfs on installation and upgrade.


Modified: people/fs/firmware-0.1/debian/rules
==
--- people/fs/firmware-0.1/debian/rules (original)
+++ people/fs/firmware-0.1/debian/rules Thu May 11 15:50:08 2006
@@ -16,16 +16,20 @@
chmod 755 
$(CURDIR)/debian/$$pkg-$$fw/usr/share/initramfs-tools/hooks/firmware-$$fw ; \
install -o root -g root -m 644 
$(CURDIR)/qlogic-fw/$$fw\_fw.bin $(CURDIR)/debian/$$pkg-$$fw/lib/firmware/ ; \
done ; \
-   done
+   done ; \
+   for fw in $(BLOBS) ; do \
+   cp $(CURDIR)/debian/templates/firmware.postinst.in 
$(CURDIR)/debian/$$pkg-$$fw.postinst ; \
+   done 
 
 debian/control:
cat debian/templates/control.source.in  debian/control
-   for fw in $(BLOBS); do cat debian/templates/control.binary.in | sed 
s/@controller@/$$fw/ ; done  debian/control
-   for fw in $(BLOBS); do cat debian/templates/control.binary.udeb.in 
| sed s/@controller@/$$fw/ ; done  debian/control
+   for fw in $(BLOBS); do cat 
$(CURDIR)/debian/templates/control.binary.in | sed s/@controller@/$$fw/ ; 
done  $(CURDIR)/debian/control
+   for fw in $(BLOBS); do cat 
$(CURDIR)/debian/templates/control.binary.udeb.in | sed s/@controller@/$$fw/ 
; done  $(CURDIR)/debian/control
 
 clean: debian/control
dh_testdir
dh_clean
+   -rm $(CURDIR)/debian/*.postinst
 
 install: install-indep
 install-indep:

Added: people/fs/firmware-0.1/debian/templates/firmware.postinst.in
==
--- (empty file)
+++ people/fs/firmware-0.1/debian/templates/firmware.postinst.inThu May 
11 15:50:08 2006
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case $1 in
+   configure)
+   if [ -x /usr/sbin/update-initramfs -a -e 
/etc/mkinitramfs/initramfs.conf ] ; then
+   update-initramfs -u
+   else
+   exit 0
+   fi
+   ;;
+
+   *)
+   echo postinst called with unknown argument \`$1' 12
+   exit 1
+   ;;
+
+esac
+
+#DEBHELPER#
+

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r6554 - people/fs/firmware-0.1/debian

[Frederik Schüler]

Author: fs
Date: Wed May 10 12:39:07 2006
New Revision: 6554

Modified:
   people/fs/firmware-0.1/debian/rules

Log:
Use dh_installdocs to install the changelogs.


Modified: people/fs/firmware-0.1/debian/rules
==
--- people/fs/firmware-0.1/debian/rules (original)
+++ people/fs/firmware-0.1/debian/rules Wed May 10 12:39:07 2006
@@ -16,10 +16,6 @@
chmod 755 
$(CURDIR)/debian/$$pkg-$$fw/usr/share/initramfs-tools/hooks/firmware-$$fw ; \
install -o root -g root -m 644 
$(CURDIR)/qlogic-fw/$$fw\_fw.bin $(CURDIR)/debian/$$pkg-$$fw/lib/firmware/ ; \
done ; \
-   done ; \
-   for fw in $(BLOBS) ; do \
-   mkdir -p $(CURDIR)/debian/$$pkg-$$fw/usr/share/doc/$$pkg-$$fw/ 
; \
-   install -o root -g root -m 644 $(CURDIR)/debian/copyright 
$(CURDIR)/debian/$$pkg-$$fw/usr/share/doc/$$pkg-$$fw/ ; \
done
 
 debian/control:
@@ -40,6 +36,7 @@
dh_testdir
dh_testroot
dh_installchangelogs
+   dh_installdocs
dh_compress
dh_fixperms
dh_installdeb

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

r6554 - svn:log

[Frederik Schüler]

Author: fs
Revision: 6554
Property Name: svn:log
Action: added

Property value:
Use dh_installdocs to install the copyright file.

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

[kernel] r6541 - dists/trunk/linux-2.6/debian

[Frederik Schüler]

Author: fs
Date: Tue May  9 11:43:58 2006
New Revision: 6541

Modified:
   dists/trunk/linux-2.6/debian/changelog

Log:
Prepare to release 2.6.17-rc3 to experimental.


Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog  (original)
+++ dists/trunk/linux-2.6/debian/changelog  Tue May  9 11:43:58 2006
@@ -1,7 +1,7 @@
-linux-2.6 (2.6.16+2.6.17-rc3-0experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.16+2.6.17-rc3-0experimental.1) experimental; urgency=low
 
   [ Frederik Schüler ]
-  * New upstream release.
+  * New upstream release candidate.
   * Switch HZ from 1000 to 250, following upstreams default.
   * Activate CONFIG_BCM43XX_DEBUG.
 

___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes