[23425] in Source-Commits
/svn/athena r23078 - in trunk/debathena/third: common lprng
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Mon Jul 14 11:16:57 2008
Date: Mon, 14 Jul 2008 11:16:43 -0400 (EDT)
From: ghudson@MIT.EDU
Message-Id: <200807141516.LAA23224@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-07-14 11:16:42 -0400 (Mon, 14 Jul 2008)
New Revision: 23078
Modified:
trunk/debathena/third/common/debathenificator.sh
trunk/debathena/third/lprng/debathenify-lprng
Log:
In debathenificator, look for an existing package in the same section
we plan to install the package in when we're done. The interface for
setting a non-default section has changed; debathenify-lprng is
adjusted accordingly.
Modified: trunk/debathena/third/common/debathenificator.sh
===================================================================
--- trunk/debathena/third/common/debathenificator.sh 2008-07-14 15:10:48 UTC (rev 23077)
+++ trunk/debathena/third/common/debathenificator.sh 2008-07-14 15:16:42 UTC (rev 23078)
@@ -18,6 +18,7 @@
dist=$(echo "$dist_arch" | sed 's/^\(.*\)-\([^-]*\)$/\1/')
arch=$(echo "$dist_arch" | sed 's/^\(.*\)-\([^-]*\)$/\2/')
+: ${section=debathena-system}
# Create a chroot and define functions for using it.
sid=$(schroot -b -c "$chroot")
@@ -28,7 +29,6 @@
schr apt-get -qq -y update
munge_sections () {
- section=${1:-debathena-system}
perl -0pe "s/^Section: /Section: $section\\//gm or die" -i debian/control
}
@@ -140,7 +140,7 @@
# if we weren't run with the -A flag). We need to look for either a
# Source: or a Package: header matching $name since there is no
# Source: header for a package whose name matches its source.
-pkgfile=$DEBATHENA_APT/dists/$dist/debathena-system/binary-$arch/Packages.gz
+pkgfile=$DEBATHENA_APT/dists/$dist/$section/binary-$arch/Packages.gz
if { zcat "$pkgfile" | \
dpkg-awk -f - "Package:^$name\$" "Version:^$daversion~" -- Architecture;
zcat "$pkgfile" | \
Modified: trunk/debathena/third/lprng/debathenify-lprng
===================================================================
--- trunk/debathena/third/lprng/debathenify-lprng 2008-07-14 15:10:48 UTC (rev 23077)
+++ trunk/debathena/third/lprng/debathenify-lprng 2008-07-14 15:16:42 UTC (rev 23078)
@@ -3,6 +3,7 @@
name=lprng
daversionappend=debathena4
+section=debathena
hack_package () {
# Rename the package and make it not conflict with lpr or cupsys-bsd.
@@ -82,7 +83,7 @@
package and commands so that it no longer conflicts with cupsys-bsd.
EOF
add_changelog 'Rename commands.'
- munge_sections debathena
+ munge_sections
}
. ../common/debathenificator.sh
