Commit 219f2d77 authored by Axel Beckert's avatar Axel Beckert

Switch to source format "3.0 (quilt)"

* Drop build-dependency on quilt
* Drop debian/README.source
* Remove quilt traces from debian/rules
parent 23d11e5a
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
break
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.
......@@ -6,6 +6,10 @@ mp4h (1.3.1-7) UNRELEASED; urgency=low
* Remove manual DEB_BUILD_OPTIONS check around dh_strip as dh_strip does
that itself.
* Bump debhelper compatibility to 9
* Switch to source format "3.0 (quilt)"
+ Drop build-dependency on quilt
+ Drop debian/README.source
+ Remove quilt traces from debian/rules
* Revamp debian/rules:
+ Use dh_auto_{configure,build,install}
+ Support multiarch lib directories
......
......@@ -11,7 +11,6 @@ Build-Depends: autoconf (>= 2.57~),
gettext,
libltdl-dev,
libtool,
quilt,
tidy
Build-Conflicts: autoconf2.13, automake1.4
Vcs-Browser: http://git.debian.org/?p=pkg-wml/mp4h.git
......
......@@ -3,8 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
include /usr/share/quilt/quilt.make
build: build-arch build-indep
build-arch: build-stamp
build-indep: build-stamp
......@@ -20,7 +18,7 @@ GETTEXT_PO_FILES= Makefile.in.in Rules-quot boldquot.sed \
en@boldquot.header en@quot.header insert-header.sin \
quot.sed remove-potcdate.sin
configure-stamp: $(QUILT_STAMPFN)
configure-stamp:
# Move everything we don't need away
tar cvf debian/not-needed-for-build.tar \
intl ABOUT-NLS po/Makefile.in.in aclocal.m4 config.guess config.sub \
......@@ -65,7 +63,6 @@ clean:
-o -name Makefile ')' \
-delete
dh_clean
$(MAKE) -f debian/rules unpatch
install: build-stamp
dh_testdir
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment