From bb7273665583fda5d0ddb30e969718984ea4c205 Mon Sep 17 00:00:00 2001 From: Luca Falavigna Date: Sat, 2 Jan 2010 20:52:34 +0100 Subject: Switch to format 3.0 (quilt) --- debian/README.source | 48 ------------------------------------------------ debian/changelog | 6 ++++++ debian/control | 2 +- debian/rules | 4 ++-- debian/source/format | 1 + 5 files changed, 10 insertions(+), 51 deletions(-) delete mode 100644 debian/README.source create mode 100644 debian/source/format diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index ca55125..0000000 --- a/debian/README.source +++ /dev/null @@ -1,48 +0,0 @@ -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 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 - -where 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 - -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 /path/to/patch - quilt push -a - -(add -p 0 to quilt import if needed). 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 - -You may need to run quilt pop -a to unapply patches first before running -this command. - diff --git a/debian/changelog b/debian/changelog index 31650df..aeb1102 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +scons (1.2.0.d20091224-2) UNRELEASED; urgency=low + + * Switch to format 3.0 (quilt). + + -- Luca Falavigna Sat, 02 Jan 2010 20:49:42 +0100 + scons (1.2.0.d20091224-1) unstable; urgency=low * New upstream checkpoint release. diff --git a/debian/control b/debian/control index 09fa8a1..23752cb 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Luca Falavigna Uploaders: Mark Brown -Build-Depends: debhelper (>= 7.2.18), python (>= 2.5.4-1~), quilt (>= 0.46-7) +Build-Depends: debhelper (>= 7.2.18), python (>= 2.5.4-1~) Build-Depends-Indep: python-support (>= 0.5.3) Standards-Version: 3.8.3 XS-Python-Version: >= 2.4 diff --git a/debian/rules b/debian/rules index 919f8c0..a34b022 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,11 @@ #!/usr/bin/make -f %: - dh --with quilt $@ + dh $@ clean: rm -fr build - dh --with quilt $@ + dh $@ override_dh_auto_install: dh_auto_install -- --no-version-script --standalone-lib --no-install-man diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- cgit v1.2.3