diff options
| -rw-r--r-- | config.log.features | 9 | ||||
| -rw-r--r-- | debian/README.source | 57 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | debian/rules | 7 | ||||
| -rw-r--r-- | debian/source/format | 1 |
6 files changed, 4 insertions, 72 deletions
diff --git a/config.log.features b/config.log.features deleted file mode 100644 index ee83760e..00000000 --- a/config.log.features +++ /dev/null @@ -1,9 +0,0 @@ -A summary of the build configuration is below. Box Backup will function -without these features, but will work better where they are present. Refer -to the documentation for more information on each feature. - -Regular expressions: yes -Large files: yes -Berkeley DB: yes -Readline: yes -Extended attributes: yes diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 86460789..00000000 --- a/debian/README.source +++ /dev/null @@ -1,57 +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 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. diff --git a/debian/changelog b/debian/changelog index 6e318e74..2f5e0e38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ boxbackup (0.11.1~r2837-4) UNRELEASED; urgency=medium * Add Dutch (nl) debconf translations by Frans Spiesschaert. (Closes: #766532) * Build with dh_autotools-dev_*. + * Switch to source format 3.0 (quilt). -- Andreas Beckmann <anbe@debian.org> Sun, 22 Jan 2017 01:58:04 +0100 diff --git a/debian/control b/debian/control index 6eda57bc..5cbdba67 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,6 @@ Build-Depends: libedit-dev, libssl1.0-dev, libtest-lwp-useragent-perl, - quilt, xsltproc, zlib1g-dev Standards-Version: 3.9.8 diff --git a/debian/rules b/debian/rules index 4377d557..666ba0ea 100755 --- a/debian/rules +++ b/debian/rules @@ -10,8 +10,6 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) TMP:=$(CURDIR)/debian/tmp -include /usr/share/quilt/quilt.make - ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) CFLAGS += -g endif @@ -20,7 +18,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) endif configure: configure-stamp -configure-stamp: $(QUILT_STAMPFN) +configure-stamp: dh_testdir dh_autotools-dev_updateconfig echo "0.11rc8+`cat .svnrevision`" > VERSION.txt @@ -53,8 +51,7 @@ build-indep: docs build: build-arch build-indep -clean: clean-real unpatch -clean-real: +clean: dh_testdir dh_testroot dh_clean build-stamp configure-stamp diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) |