r3056 - in glibc-package/branches/glibc-2.8: . debian debian/control.in
Author: aurel32
Date: 2008-08-09 03:45:11 +0000 (Sat, 09 Aug 2008)
New Revision: 3056
Added:
glibc-package/branches/glibc-2.8/debian/README.source
Removed:
glibc-package/branches/glibc-2.8/shlibs-add-udebs
Modified:
glibc-package/branches/glibc-2.8/debian/changelog
glibc-package/branches/glibc-2.8/debian/control
glibc-package/branches/glibc-2.8/debian/control.in/main
Log:
* debian/control.in/main: update Standards-Version to 3.8.0:
- Add debian/README.source.
Added: glibc-package/branches/glibc-2.8/debian/README.source
===================================================================
--- glibc-package/branches/glibc-2.8/debian/README.source (rev 0)
+++ glibc-package/branches/glibc-2.8/debian/README.source 2008-08-09 03:45:11 UTC (rev 3056)
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ fi
+ done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+ quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches. Then, for every file that will be modified by this patch,
+run:
+
+ quilt add <file>
+
+before editing those files. You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly. After editing the files, run:
+
+ quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+ quilt import -P <patch> /path/to/patch
+ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches. The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
Modified: glibc-package/branches/glibc-2.8/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.8/debian/changelog 2008-08-09 03:37:46 UTC (rev 3055)
+++ glibc-package/branches/glibc-2.8/debian/changelog 2008-08-09 03:45:11 UTC (rev 3056)
@@ -67,6 +67,8 @@
* debian/rules.d/quilt.mk: add a refresh target.
* local/manpages/*: fix comments to make lintian happy.
* locale/check-unknown-symbols.diff: changes errors to warnings.
+ * debian/control.in/main: update Standards-Version to 3.8.0:
+ - Add debian/README.source.
-- Aurelien Jarno <aurel32@debian.org> Fri, 08 Aug 2008 05:48:15 +0200
Modified: glibc-package/branches/glibc-2.8/debian/control
===================================================================
--- glibc-package/branches/glibc-2.8/debian/control 2008-08-09 03:37:46 UTC (rev 3055)
+++ glibc-package/branches/glibc-2.8/debian/control 2008-08-09 03:45:11 UTC (rev 3056)
@@ -12,7 +12,7 @@
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Package: glibc-doc
Architecture: all
Modified: glibc-package/branches/glibc-2.8/debian/control.in/main
===================================================================
--- glibc-package/branches/glibc-2.8/debian/control.in/main 2008-08-09 03:37:46 UTC (rev 3055)
+++ glibc-package/branches/glibc-2.8/debian/control.in/main 2008-08-09 03:45:11 UTC (rev 3056)
@@ -12,7 +12,7 @@
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Package: @glibc@-doc
Architecture: all
Deleted: glibc-package/branches/glibc-2.8/shlibs-add-udebs
===================================================================
--- glibc-package/branches/glibc-2.8/shlibs-add-udebs 2008-08-09 03:37:46 UTC (rev 3055)
+++ glibc-package/branches/glibc-2.8/shlibs-add-udebs 2008-08-09 03:45:11 UTC (rev 3056)
@@ -1,51 +0,0 @@
-#! /bin/sh
-set -e
-
-# This script adds "udeb lines" to shlibs files which allows other udebs
-# to get correct dependencies when built against glibc libraries.
-# The script was written by Frans Pop <fjp@debian.org>.
-
-package="$1"
-shlibs_file="debian/$package/DEBIAN/shlibs"
-
-# Skip packages that don't have an shlibs file.
-# The "cross-subarch" library packages have an shlibs file, but should
-# not have udeb lines, so skip those as well.
-if [ ! -r "$shlibs_file" ] || \
- echo "$package" | grep -Eq "^libc[0-9.]+-"; then
- exit 0
-fi
-
-# $1: regexp to select libraries for which lines should be duplicated
-# $2: name of the udeb the new line should point to
-add_udeb_line() {
- local regexp udeb line lib soname package rest
- regexp="$1"
- udeb="$2"
-
- if line="$(grep "^$regexp[[:space:]]" $shlibs_file)"; then
- echo "$line" | while read lib soname package rest; do
- echo "udeb: $lib $soname $udeb $rest" >>$shlibs_file
- done
- fi
-}
-
-
-W="[^[:space:]]*"
-
-# The following lists should match the ones in the *-udeb.install files
-# in debian/debhelper.in; $W replaces any "*" wildcards there.
-expr_libc1="ld$W libm-$W libm libdl$W libresolv$W libc-$W libc"
-expr_libc2="libutil$W libcrypt$W librt$W libpthread$W"
-expr_nss_dns="libnss_dns$W"
-expr_nss_files="libnss_files$W"
-
-for expr in $expr_libc1 $expr_libc2; do
- add_udeb_line "$expr" $package-udeb
-done
-for expr in $expr_nss_dns; do
- add_udeb_line "$expr" libnss-dns-udeb
-done
-for expr in $expr_nss_files; do
- add_udeb_line "$expr" libnss-files-udeb
-done
Reply to: