From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 6 May 2013 17:18:03 +0000 (-0700)
Subject: merge debian experimental into debian branch
X-Git-Tag: debian/2.16.2-2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f5a18c364cf7688d9ac6e09996a489a93a821b3c;p=lilypond.git
merge debian experimental into debian branch
---
f5a18c364cf7688d9ac6e09996a489a93a821b3c
diff --cc debian/changelog
index 117a83d888,6cf360a94f..d9d5da1ccc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,29 +1,40 @@@
- lilypond (2.14.2-4) unstable; urgency=low
++lilypond (2.16.2-1) unstable; urgency=low
+
++ * Release 2.16.2-1 to unstable
++
++ -- Don Armstrong <don@debian.org> Mon, 06 May 2013 10:15:36 -0700
++
+ lilypond (2.16.2-1~exp+1) experimental; urgency=low
+
+ * New upstream release (closes: #705895)
+ * Put languages in their own subdocument to work around doc-base not
+ having a language specifier (closes: #698435)
+
+ -- Don Armstrong <don@debian.org> Wed, 24 Apr 2013 21:53:13 -0700
+
+ lilypond (2.16.1-1~exp+2) experimental; urgency=low
+
+ * New upstream release
+ * netpbm and fonts are required to run the tests during the binary
+ build; migrate the Build-Depends-Indep to Build-Depends.
+ * Switch to dh style rules
+
+ -- Don Armstrong <don@debian.org> Tue, 02 Oct 2012 17:33:29 -0700
+
+ lilypond (2.16.0-1~exp+1) experimental; urgency=low
+
+ * New upstream release (Closes: #686788)
* Fix "warnings from install-info" by splitting the direntry sections
across the texinfo files (Closes: #648689). Thanks to Julian Gilbey
for the patch.
+ * Fix noopt support to use --disable-optimising as ./configure does
+ crazy things.
+ * Apply patch from 13fc2437e2aaa9 to fix segfault in font-mark where a
+ garbage collection can trigger a null pointer dereference (closes:
+ #684817)
+ * Split out lilypond-doc packages (Closes: #443915)
- -- Don Armstrong <don@donarmstrong.com> Sun, 23 Dec 2012 13:25:44 -0800
+ -- Don Armstrong <don@debian.org> Tue, 04 Sep 2012 11:16:50 -0700
lilypond (2.14.2-3) unstable; urgency=low
diff --cc debian/rules
index 0d23ea49dc,c8b3684da1..2eeb8bbd7c
--- a/debian/rules
+++ b/debian/rules
@@@ -61,125 -21,80 +24,81 @@@ ifneq (,$(filter $(DEB_BUILD_OPTIONS),n
else
config_opt = --enable-optimising
endif
+endif
+ DOC_OPTIONS := WEB_TARGETS="offline"
+ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ DOC_OPTIONS := $(DOC_OPTIONS) CPU_COUNT=$(firstword $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))))
+ endif
- build: build-stamp
- build-stamp:
- dh_testdir
-
- cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./stepmake/bin/
- ./configure --disable-checking --enable-debugging \
- --prefix=/usr $(config_opt) \
- --infodir='$${prefix}/share/info' \
- --mandir='$${prefix}/share/man'
- ulimit -c unlimited && $(MAKE)
- ulimit -c unlimited && $(MAKE) test;
-
- touch build-stamp
-
- build-doc: build build-doc-stamp
- build-doc-stamp:
- dh_testdir
-
- # make html
- # unfortunatly, this does not work well with multiple processors
- ulimit -c unlimited && $(MAKE) -j1 doc WEB_TARGETS="offline"
- # make info
- ulimit -c unlimited && $(MAKE) info
-
- touch build-doc-stamp
-
- clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp build-doc-stamp
- [ ! -f Makefile ] || $(MAKE) web-clean
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f lib/python
-
- rm -f buildscripts/*.pyc
- rm -f lib/lilypond/python examples.html
- rm -f debian/emacsen-startup
- rm -f debian/lilypond1.7*.dirs debian/lilypond.dirs
- rm -f debian/postinst debian/prerm debian/postrm
- rm -f debian/lilypond-data.doc-base debian/lilypond.doc-base
- rm -f GNUmakefile config.log config.make config.status config.hh
-
- dh_clean
-
- install: DH_OPTIONS=
- install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp.
- $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
-
- dh_install --sourcedir=debian/tmp --list-missing
-
- # Build architecture-independent files here.
- binary-indep: DH_OPTIONS=-i
- binary-indep: build-doc install
- dh_testdir
- dh_testroot
- # Install LilyPond web documentation...
- $(MAKE) install-doc prefix=$(CURDIR)/debian/lilypond-doc/usr/
- # it installs a random dir-dep file for no reason
- rm -f $(CURDIR)/debian/lilypond-doc/usr/share/info/*-dir-dep*
-
- dh_installinfo
+ %:
+ dh $@ --parallel --with autotools-dev --with python2
+
+
+ override_dh_auto_configure:
+ dh_auto_configure -- --disable-checking --enable-debugging $(config_opt)
+
+ override_dh_auto_build-indep:
+ dh_auto_build
+ $(MAKE) doc $(DOC_OPTIONS)
+
+ override_dh_auto_install-indep:
+ $(MAKE) install-doc $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr/
+ $(MAKE) install-info $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr
+ rm -rf $(CURDIR)/debian/tmp/usr/share/omf
+ rm -rf $(CURDIR)/debian/tmp/usr/share/doc/lilypond/html/input
+
+ ## Unfortunately, lilypond is kind of broken, and installs the wrong
+ ## info documentation (missing images) if we call their makefile
+ ## directly. They also don't provide an install rule which doesn't
+ ## install the documentation, which we don't care about for the
+ ## architecture dependent build
+ override_dh_auto_install-arch:
+ for dir in `echo */*makefile|xargs -n 1 dirname|grep -v Documentation`; do \
+ $(MAKE) --no-builtin-rules PACKAGE=LILYPOND package=lilypond -C $$dir install $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr/; \
+ done;
+
+
+ ## we need to install only the png, jpg, css, ly and english html
+ ## files into the doc-html package, and only the english pdfs into the
+ ## doc-pdf package. Because dh_install doesn't support regexes, we'll
+ ## use find to replace the contents of the .install file before we
+ ## call dh_install
+ override_dh_install:
+ /bin/echo -e 'usr/share/doc/lilypond/html/*/*/*.ly\nusr/share/doc/lilypond/html/*/*/*.png' \
+ > $(CURDIR)/debian/lilypond-doc-html.install
+ /bin/echo -e 'usr/share/doc/lilypond/html/*/*/*.jpg\nusr/share/doc/lilypond/html/*/*/*.css' \
+ >> $(CURDIR)/debian/lilypond-doc-html.install
+ find $(CURDIR)/debian/tmp/ -type f \
+ -regex '.*usr/share/doc/lilypond/.*/[^\.]+.html' \
+ -printf '%P\n' >> $(CURDIR)/debian/lilypond-doc-html.install
+ /bin/echo -e ''> $(CURDIR)/debian/lilypond-doc-pdf.install
+ find $(CURDIR)/debian/tmp/ -type f \
+ -regex '.*usr/share/doc/lilypond/.*/[^\.]+.pdf' \
+ -printf '%P\n' >> $(CURDIR)/debian/lilypond-doc-pdf.install
+ find $(CURDIR)/debian/tmp/ -type f \
+ -regex '.*usr/share/doc/lilypond/.*/[^\.]+.preview.pdf' \
+ -printf '%P\n' >> $(CURDIR)/debian/lilypond-doc-pdf.install
+ dh_install --list-missing
+
+ override_dh_python2:
+ dh_python2
+ dh_python2 usr/share/lilypond/*/python/
+
+ override_dh_compress:
+ dh_compress -X.ly
+
+ override_dh_installdocs:
dh_installdocs
- # remove the useless offline-root directory
- mv $(CURDIR)/debian/lilypond-doc/usr/share/doc/lilypond/html/offline-root/* \
- $(CURDIR)/debian/lilypond-doc/usr/share/doc/lilypond/html/.;
- rmdir $(CURDIR)/debian/lilypond-doc/usr/share/doc/lilypond/html/offline-root;
- find $(CURDIR)/debian/lilypond-doc/usr/share/doc/lilypond/html \
- -type d -empty -delete
- dh_installemacsen
-
- install -m 644 debian/xiao-haizi-guai-guai.ly debian/sakura-sakura.ly \
- $(r_data)/$(d)/examples
- dh_installchangelogs
-
- dh_link usr/share/lilypond/$(VERSION)/tex \
- usr/share/texmf/tex/lilypond \
- usr/share/lilypond/$(VERSION)/fonts/source \
- usr/share/texmf/fonts/source/public/lilypond \
- usr/share/lilypond/$(VERSION)/fonts/type1 \
- usr/share/texmf/fonts/type1/public/lilypond \
-
- dh_pysupport /usr/share/lilypond/${VERSION}/python
-
- dh_compress -X$(d)/html/
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
- binary-arch: DH_OPTIONS=-s
- binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs AUTHORS.txt NEWS.txt README.txt \
- DEDICATION THANKS
-
-
- dh_installemacsen
- dh_installchangelogs Documentation/misc/CHANGES* Documentation/misc/ChangeLog*
-
- dh_strip
- dh_pysupport /usr/share/lilypond/${VERSION}/python
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
- binary: binary-indep binary-arch
- .PHONY: build clean install binary-indep binary-arch binary
+ for a in $(wildcard $(CURDIR)/debian/*.doc-base-special); do \
+ package=`basename $$a .doc-base-special`; \
+ install -d debian/$$package/usr/share/doc-base; \
+ install -m0644 $$a debian/$$package/usr/share/doc-base/$$package; \
+ done;
+
+ ## this rule will update debian/control and the per-language install
+ ## files; all of the files it generates/modifies should be included in
+ ## the Debian package and should not need to be regenerated or
+ ## modified.
+ update-doc-packages:
+ perl debian/update_doc_packages