Update for new version

diff --git a/debian/changelog b/debian/changelog
index 5f3676fb289244d472f2c795856ce57ddbcac11f..526d9cd1f129e3aced28ef92890ccefd07014f94 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openafs (1.2.3final2-5) unstable; urgency=medium
+
+  * Fix subarch handling, closes: #139662
+  * Update module control files to use  net not non-us
+
+ -- Sam Hartman <hartmans@debian.org>  Thu, 18 Apr 2002 13:13:16 -0400
+
 openafs (1.2.3final2-4) unstable; urgency=low
 
   * Move from non-us to main.

diff --git a/debian/control.module b/debian/control.module
index 94db7690ff1354f20e4484b8bd4b2685d202e364..7ceb277b4fbe7e52c2fed886fef4e1a251067b84 100644 (file)
--- a/debian/control.module
+++ b/debian/control.module
@@ -1,5 +1,5 @@
 Source: openafs
-Section: non-us/main
+Section: net
 Priority: optional
 Maintainer: Sam Hartman <hartmans@debian.org>
 Standards-Version: 3.1.1

diff --git a/debian/control.module-image b/debian/control.module-image
index b43b5f007fbaa3054bdab1ce964f7396bf55f864..7d38b409b4f600251fbaa0da389e71592016ed34 100644 (file)
--- a/debian/control.module-image
+++ b/debian/control.module-image
@@ -1,5 +1,5 @@
 Source: openafs
-Section: non-us/main
+Section: net
 Priority: optional
 Maintainer: Sam Hartman <hartmans@debian.org>
 Standards-Version: 3.1.1

diff --git a/debian/genchanges.sh b/debian/genchanges.sh
index d5e6dc573706b21dcdb6ef4209c628c7805f3217..5d50cd542fc9455a6b149f314e75747819151c61 100644 (file)
--- a/debian/genchanges.sh
+++ b/debian/genchanges.sh
@@ -14,9 +14,9 @@ ARCH=`dpkg --print-architecture`
 mprefix=`grep Package: debian/control.module | cut -d' ' -f 2 | cut -d= -f 1`
 
 # the changes file's name
-chfile="$KSRC/../$mprefix${KVERS}_${MODVERS}_${ARCH}.changes"
+chfile="$KSRC/../$mprefix${KVERS}${INT_SUBARCH}_${MODVERS}_${ARCH}.changes"
 
 dpkg-genchanges -b ${KMAINT:+-m"$KMAINT <$KEMAIL>"} -u"$KSRC/.." \
-       -cdebian/control > "$chfile.pt"
-pgp -fast ${KMAINT:+-u"$KMAINT"} < "$chfile.pt" > "$chfile"
+       -cdebian/control > "$chfile"
+#pgp -fast ${KMAINT:+-u"$KMAINT"} < "$chfile.pt" > "$chfile"
 rm "$chfile.pt"

diff --git a/debian/prep-modules b/debian/prep-modules
index 939976d7a27e7dcb8b7fd271f55051b62e2d2d15..ed0570304d8f02552e3a6b9c0040b81530273a6e 100644 (file)
--- a/debian/prep-modules
+++ b/debian/prep-modules
@@ -10,7 +10,7 @@ fi
 
 changelog="$1/debian/changelog"
 if [ -n "$KVERS" ] && [ -n "$KDREV" ]; then
-  linuxversion=$KVERS
+  linuxversion=$KVERS${INT_SUBARCH}
   kernversion=$KDREV
 
 elif [ ! -f $changelog ]; then
@@ -21,6 +21,7 @@ elif [ ! -f $changelog ]; then
         if [ -z "$KDREV" ]; then
           kernversion=$linuxversion-0
         else
+           linuxversion=${linuxversion}${INT_SUBARCH}
           kernversion=$KDREV
         fi