diff -Nru muse-el-3.12/debian/changelog muse-el-3.12/debian/changelog --- muse-el-3.12/debian/changelog 2008-06-14 15:59:32.000000000 +0200 +++ muse-el-3.12/debian/changelog 2008-06-14 15:59:32.000000000 +0200 @@ -1,3 +1,13 @@ +muse-el (3.12-1ubuntu1) intrepid; urgency=low + + * Merge with Debian unstable (LP: #239998), remaining changes: + - Modified Maintainer field as per spec + - Keep the GFDL manual: + - Modified debian/rules to build the manual + - Added copyright info about the manual in debian/copyright + + -- Nicolai Spohrer Sat, 14 Jun 2008 15:53:54 +0200 + muse-el (3.12-1) unstable; urgency=low * New upstream release. @@ -6,6 +16,14 @@ -- Michael W. Olson (GNU address) Tue, 29 Jan 2008 18:05:58 -0500 +muse-el (3.11-3ubuntu1) hardy; urgency=low + + * Merge with with Debian unstable (LP: #137284). Remaining Ubuntu changes: + - Keep manual. + - Set Ubuntu MOTU to be Maintainer + + -- Michael W. Olson (GNU address) Wed, 09 Jan 2008 15:51:46 -0500 + muse-el (3.11-3) unstable; urgency=low * debian/control: @@ -56,6 +74,20 @@ -- Michael W. Olson (GNU address) Fri, 24 Aug 2007 23:32:22 -0400 +muse-el (3.03-1ubuntu1) gutsy; urgency=low + + * Closes LP: #123907 + * Sync with Debian. Remaining changes: + - Keep (add) manual. + * debian/control: + - Set Ubuntu MOTU to be Maintainer and myself as + XSBC-Original-Maintainer to silence warning. + * debian/rules; + - Manual is now in texi/ directory. + - Clean generated html files and info file for the manual. + + -- Michael W. Olson (GNU address) Mon, 25 Jun 2007 08:17:44 -0400 + muse-el (3.03-1) unstable; urgency=low * New upstream release. diff -Nru muse-el-3.12/debian/copyright muse-el-3.12/debian/copyright --- muse-el-3.12/debian/copyright 2008-06-14 15:59:32.000000000 +0200 +++ muse-el-3.12/debian/copyright 2008-06-14 15:59:32.000000000 +0200 @@ -44,5 +44,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301, USA. +The manual found under texi/muse.texi is licensed under the +GNU Free Documentation License 1.2 or any later version. + On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-3'. diff -Nru muse-el-3.12/debian/README.Debian muse-el-3.12/debian/README.Debian --- muse-el-3.12/debian/README.Debian 2008-06-14 15:59:32.000000000 +0200 +++ muse-el-3.12/debian/README.Debian 2008-06-14 15:59:32.000000000 +0200 @@ -1,19 +1,16 @@ README for muse-el ================== -There is a full manual for Muse. It is available online in several -forms. +A full manual for Muse is included with this package at +/usr/share/doc/muse-el/html/index.html. It is also available online +in several forms. - HTML (single file): http://mwolson.org/static/doc/muse.html - HTML (multiple files): http://mwolson.org/static/doc/muse/ - Info: http://mwolson.org/static/doc/muse.info - PDF: http://mwolson.org/static/doc/muse.pdf -Unfortunately, it is not possible to distribute this manual with the -muse-el Debian package because the Debian project has chosen to remove -most GFDL'd documentation. - -There is a QuickStart guide, however, which is installed on your +Additionally, there is a QuickStart guide, which is installed on your system at /usr/share/doc/muse-el/QuickStart.html. The Muse source for this guide is at /usr/share/doc/muse-el/examples/QuickStart.muse. @@ -23,4 +20,4 @@ A RelaxNG XML schema for Muse is available at /usr/share/doc/muse-el/examples/muse.rnc. - -- Michael W. Olson (GNU address) , Fri, 22 Jun 2007 21:14:44 -0400 + -- Michael W. Olson (GNU address) , Fri, 22 Jun 2007 21:15:23 -0400 diff -Nru muse-el-3.12/debian/rules muse-el-3.12/debian/rules --- muse-el-3.12/debian/rules 2008-06-14 15:59:32.000000000 +0200 +++ muse-el-3.12/debian/rules 2008-06-14 15:59:32.000000000 +0200 @@ -22,9 +22,8 @@ build: configure-stamp build-stamp build-stamp: dh_testdir - # Comply with Debian vote 2006-1 - # makeinfo muse.texi - # makeinfo --html --output=html muse.texi + makeinfo texi/muse.texi + makeinfo --html --output=html texi/muse.texi # Add here commands to compile the package. $(MAKE) examples #/usr/bin/docbook-to-man debian/muse.sgml > muse.1 @@ -36,6 +35,8 @@ dh_testroot rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. + rm -f muse.info + rm -fr html [ ! -f Makefile ] || $(MAKE) distclean dh_clean