--- brasero-0.8.0.orig/debian/watch +++ brasero-0.8.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/brasero/([\d\.]+)/brasero-([\d\.]+)\.tar\.gz debian uupdate --- brasero-0.8.0.orig/debian/brasero.install +++ brasero-0.8.0/debian/brasero.install @@ -0,0 +1,9 @@ +debian/tmp/etc/gconf +debian/tmp/usr/bin/ +debian/tmp/usr/share/brasero/ +debian/tmp/usr/share/applications/brasero.desktop +debian/tmp/usr/share/icons/hicolor/ +debian/tmp/usr/share/mime/packages/ +debian/tmp/usr/share/locale/ +debian/tmp/usr/share/man/man1/ +debian/tmp/usr/lib/brasero/plugins/ --- brasero-0.8.0.orig/debian/control +++ brasero-0.8.0/debian/control @@ -0,0 +1,51 @@ +Source: brasero +Section: gnome +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Ondřej Surý +Build-Depends: debhelper (>= 5.0.0), + autotools-dev, + cdbs, + libgnome2-dev (>= 2.10.0), + libgtk2.0-dev (>= 2.12.0), + libgnomeui-dev (>= 2.10.0), + gnome-pkg-tools, + pkg-config, + libgstreamer0.10-dev (>= 0.10.15), + libgstreamer-plugins-base0.10-dev (>= 0.10.0), + libtotem-plparser-dev (>= 2.22.0), + libxml2-dev (>= 2.6.0), + libhal-dev (>= 0.5), + libdbus-glib-1-dev (>= 0.7.2), + libxml-parser-perl, + libglib2.0-dev (>= 2.15.6), + quilt, + libbeagle-dev (>= 0.3.0), + libc0.1-dev (>= 2.5) | libc0.3-dev (>= 2.5) | libc6-dev (>= 2.5) | libc6.1-dev (>= 2.5), + gnome-doc-utils (>= 0.3.2), + liblaunchpad-integration-dev +Uploaders: Debian GNOME Maintainers , Loic Minier , Sebastian Dröge +Standards-Version: 3.8.0 + +Package: brasero +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + wodim, + genisoimage, + gstreamer0.10-plugins-base (>= 0.10.0) +Recommends: hal (>= 0.5), + gstreamer0.10-plugins-good, + gnome-mount +Suggests: gnome-icon-theme, + gstreamer0.10-fluendo-mp3, + gstreamer0.10-plugins-bad +Replaces: bonfire (<= 0.4.4-1) +Conflicts: bonfire (<= 0.4.4-1) +Description: CD/DVD burning application for GNOME + Easy to use CD/DVD burning application where you can: + * Burn, Copy and Erase CD/DVD + * On-the-fly burning of CD/DVD + * Append data to multisession CD/DVD + * Burn Audio CD + * CD-Text writing for Audio CD --- brasero-0.8.0.orig/debian/rules +++ brasero-0.8.0/debian/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +DEB_DESTDIR := $(CURDIR)/debian/tmp/ + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --disable-libburnia \ + --disable-scrollkeeper --- brasero-0.8.0.orig/debian/changelog +++ brasero-0.8.0/debian/changelog @@ -0,0 +1,260 @@ +brasero (0.8.0-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #247609) + - Make brasero.desktop follow freedesktop + - Brasero can't find a proper cd/dvd drive on Solaris + - Build failure againts gtk+ trunk + - Brasero crashes with libburn backend + - Speed is not displayed + - Can't add files from FAT32 partitions + - Not displaying drive speed + - toc image type not autodetected correctly + * debian/patches/010_lpi.patch: + - Refresh for new release + * 013_disable_deprecated.patch: + - Disable DGTK_DISABLE_DEPRECATED to fix FTBFS + * debian/control: + - Suggests gstreamer0.10-plugins-bad for normalize plugin + + -- Pedro Fragoso Tue, 15 Jul 2008 00:51:52 +0100 + +brasero (0.7.91-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #239524) + - Fixed odd burning speeds (LP: #178482) (LP: #177124) + - Cancel dialog buttons' wording is confusing (LP: #195083) + - Support for DL DVDs (LP: #202206) + - Brasero does not recognize .bin in the same directory + when .cue is selected (LP: #202546) + - Brasero does not save user settings (LP: #220352) + - Can't set tmp dir and can't burn image if size > available + on /tmp (LP: #226209) + - Migrate from GnomeVFS to GIO (LP: #198771) + - Preview disabled calls a video window (LP: #198497) + - Brasero crashes in strlen () when debug mode is on (LP: #225405) + * debian/control.in: + - Remove Build depend on libgnomevfs2-dev (>= 2.14.2), + libnautilus-burn-dev (>= 2.16.0), libnotify-dev + - Bump Build depend libglib2.0-dev to (>= 2.15.6) + - Bump Build depend libgstreamer0.10-dev to (>= 0.10.15) + - Bump Build depend libtotem-plparser-dev to (>= 2.22.0) + - Add Build depend on gnome-doc-utils (>= 0.3.2) and + liblaunchpad-integration-dev + - Bump Standards-Version to 3.8.0 + * debian/patches/007-fix-desktop-file-mime-typo.patch: + - Dropped, merged upstream + * debian/patches/010_lpi.patch: + - Add launchpad-integration + * debian/patches/012_gnome-doc-utils.make.patch + - Add missing gnome-doc-utils.make to fix FTBFS + * debian/rules: + - Add --disable-scrollkeeper + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Pedro Fragoso Thu, 03 Jul 2008 23:03:40 +0100 + +brasero (0.7.1-3ubuntu1) hardy; urgency=low + + * Add 008-add-gettext-domain-to-desktop-file.patch (LP: #200532) + + -- Timo Jyrinki Tue, 01 Apr 2008 11:06:04 +0300 + +brasero (0.7.1-3) unstable; urgency=low + + * DEB_DESTDIR := instead of =. + * New patch, 007-fix-desktop-file-mime-typo, fixes typo in desktop file (":" + instead of ";"); Launchpad #200024; closes: #464772. + + -- Loic Minier Wed, 05 Mar 2008 13:09:24 +0100 + +brasero (0.7.1-2) unstable; urgency=low + + [ Josselin Mouette ] + * Remove the bonfire transitional package. Closes: #463313. + + [ Sebastian Dröge ] + * debian/control.in: + + Build depend conditionally on all possible libc development packages to + fix build failure on ia64 and friends. + * debian/rules: + + Set DEB_DESTDIR to debian/tmp to work around cdbs weirdness. + + -- Sebastian Dröge Thu, 28 Feb 2008 18:13:05 +0100 + +brasero (0.7.1-1) unstable; urgency=low + + [ Alan Baghumian ] + * New upstream stable releases (Closes: #456901). + * Refreshed 004_fix-windows-size patch + * Dropped 001_use-sys-inotify.h patch, merged upstream + * Updated debian/brasero.install to include plugins + + [ Loic Minier ] + * Pass --disable-libburnia explicitely to avoid the support to be built in + by surprize if the bdep is installed in a sufficiently high version in the + future. + * Bump libgtk2.0-dev build-dep to >= 2.12.0 to match upstream README. + * Add a gstreamer0.10-plugins-base >= 0.10.0 dep to follow the upstream + configure check. + * Drop gdl build-dep. + * Bump hal Recommends to >= 0.5. + * Bump libtotem-plparser-dev build-dep to >= 2.14. + * Build with inotify support. + - Drop --disable-inotify configure flag. + - Add an explicit libc6-dev (>= 2.5-1) build-dep. + * Bump up libtotem-plparser-dev build-dep to >= 2.20.0. + * Bump up Standards-Version to 3.7.3. + * Conflict with bonfire <= 0.4.4-1 -- not <<. + * Recommend gstreamer0.10-plugins-good and gnome-mount. + * Downgrade gstreamer0.10-fluendo-mp3 recommends to a suggest. + * New patch, 006-fix-libdvdcss, load libdvdcss lib with SONAME version as to + not require the -dev package; Launchpad #134828; from Ubuntu. + * Drop patch 004_fix-windows-size, upstream fixed the initial window size + differently. + * Build with beagle support; drop --disable-search and add a libbeagle-dev + (>= 0.3.0) build-dep. + + -- Loic Minier Tue, 29 Jan 2008 21:05:22 +0100 + +brasero (0.6.1-1) unstable; urgency=low + + * New upstream stable release (Closes: #441451). + - Added support for libisofs 0.2.8 + - Added complete support for cdrkit, dropped + 000_cdrtools2cdrkit.patch + - Fixed several crash and a memory leak problem + - Fixed window size problem and few other minor bugs + * Dropped 003_dont-run-update-desktop-database.patch, + not needed anymore + + -- Alan Baghumian Fri, 14 Sep 2007 08:18:47 +0330 + +brasero (0.6.0-2) unstable; urgency=low + + [ Otavio Salvador ] + * Converted to use quilt to manage its patches. + * Fix code to not use mkisofs and use genisoimage instead (Closes: #433053). + * Fix gconf schemas installation. + * Use single line menu file so lintian is happy again. + + [ Loic Minier ] + * Update URL in copyright; cleanups. + * Install gconf schemas in the default location -- /etc/gconf -- and let + dh_gconf move them; more cleanups. + * Build-depend on quilt. + * Mention missing copyrights in copyright file; fix licensing of a couple of + files in copyright file; thanks Lionel Le Folgoc; closes: #432894. + + -- Loic Minier Sat, 14 Jul 2007 21:18:18 +0200 + +brasero (0.6.0-1) unstable; urgency=low + + * New upstream version. + - Drop syntax error fix patch since it was fixed upstream. + + -- Otavio Salvador Wed, 11 Jul 2007 11:41:21 -0300 + +brasero (0.5.90-3) unstable; urgency=low + + * Another syntax error fix. + + -- Otavio Salvador Wed, 11 Jul 2007 11:01:01 -0300 + +brasero (0.5.90-2) unstable; urgency=low + + * Fix menu file adding the need header on it (Closes: #431961). + * Downgrade hal dependency to a recommendation (Closes: #432628). + * Hopefully fix a FTBFS due a syntax error (Closes: #432399). + + -- Otavio Salvador Wed, 11 Jul 2007 10:25:05 -0300 + +brasero (0.5.90-1) unstable; urgency=low + + [ Loic Minier ] + * Wrap build-deps and deps. + * Bump up Debhelper compatibility level to 5. + - Drop bogus usr/share/pixmaps, usr/share/icons/gnome/48x48/mimetypes from + install file. + + [ Otavio Salvador ] + * New upstream version. + * Add dependency on hal (Closes: #431854, #427644). + * Add a menu file based on the patch provided by Nelson A. de Oliveira + but already using the new menu layout (Closes: #405146). + * Updated patches: + - 000_cdrtools2cdrkit.patch: redone; + - 001_use-sys-inotify.h.patch: cleaned and rediff; + + -- Otavio Salvador Thu, 05 Jul 2007 21:21:57 -0300 + +brasero (0.5.2-1) unstable; urgency=low + + [ Loic Minier ] + * Recommend gstreamer0.10-fluendo-mp3 for mp3 to CD audio conversion. + * Add a get-orig-source target to retrieve the upstream tarball. + + [ Otavio Salvador ] + * Add a watch file. + * Change get-orig-source target to retrieve from GNOME project instead + of SourceForge. + * New upstream version (Closes: #405143). + * Replace 000_cdrecord2wodim-0.4.4.patch with 000_cdrtools2cdrkit.patch + and try to be as simple as possible to new releases merge easier + (Closes: #411274) + * Drop 002_update_german_po.patch. + * Remove TODO.tasks from brasero.docs. + * Depends on genisoimage instead of mkisofs (Closes: #406152). + * Add a suggestions to gnome-icon-theme (Closes: #405144). + * Add 004_fix-windows-size.patch to fix startup window size (Closes: #425406). + * Use upstream manpage. + * Remove brasero.dirs and brasero.docs since they has good defaults on CDBS. + + [ Loic Minier ] + * Track all versions in watch file; track .tar.gz instead of .tar.bz2. + * Add missing build-dep on libglib2.0-dev (>= 2.6.0). + * Bump up build-deps to libgtk2.0-dev >= 2.10.0, libgnomevfs2-dev >= 2.14.2, + libnautilus-burn-dev >= 2.16.0. + + -- Otavio Salvador Mon, 04 Jun 2007 17:17:22 -0300 + +brasero (0.4.4-4) unstable; urgency=low + + * Don't update desktop-database at build time (Closes: #396357) + + -- Ondřej Surý Wed, 1 Nov 2006 13:50:05 +0100 + +brasero (0.4.4-3) unstable; urgency=low + + * Disable inotify.h support until is available (Closes: #394851) + * Fix german translation (Closes: #394168) + + -- Ondřej Surý Mon, 23 Oct 2006 18:18:12 +0200 + +brasero (0.4.4-2) unstable; urgency=low + + * Use and depends on wodim in place of cdrecord (Closes: #394713) + * Enable inotify support. + + -- Ondřej Surý Mon, 23 Oct 2006 10:45:26 +0200 + +brasero (0.4.4-1) unstable; urgency=low + + * New upstream version. + * Package name change to brasero due to trademark concerns. + * Use wodim binary instead of cdrecord (Closes: #386696) + * Add manpage (courtesy of Andrew Burton) (Closes: #379556) + + -- Ondřej Surý Thu, 21 Sep 2006 11:04:07 +0200 + +bonfire (0.4.1-1) unstable; urgency=low + + * New upstream release. + + -- Ondřej Surý Fri, 4 Aug 2006 13:04:04 +0200 + +bonfire (0.3.90-1) unstable; urgency=low + + * Initial release (Closes: #366978) + + -- Ondřej Surý Fri, 12 May 2006 15:46:36 +0200 --- brasero-0.8.0.orig/debian/control.in +++ brasero-0.8.0/debian/control.in @@ -0,0 +1,51 @@ +Source: brasero +Section: gnome +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Ondřej Surý +Build-Depends: debhelper (>= 5.0.0), + autotools-dev, + cdbs, + libgnome2-dev (>= 2.10.0), + libgtk2.0-dev (>= 2.12.0), + libgnomeui-dev (>= 2.10.0), + gnome-pkg-tools, + pkg-config, + libgstreamer0.10-dev (>= 0.10.15), + libgstreamer-plugins-base0.10-dev (>= 0.10.0), + libtotem-plparser-dev (>= 2.22.0), + libxml2-dev (>= 2.6.0), + libhal-dev (>= 0.5), + libdbus-glib-1-dev (>= 0.7.2), + libxml-parser-perl, + libglib2.0-dev (>= 2.15.6), + quilt, + libbeagle-dev (>= 0.3.0), + libc0.1-dev (>= 2.5) | libc0.3-dev (>= 2.5) | libc6-dev (>= 2.5) | libc6.1-dev (>= 2.5), + gnome-doc-utils (>= 0.3.2), + liblaunchpad-integration-dev +Uploaders: @GNOME_TEAM@ +Standards-Version: 3.8.0 + +Package: brasero +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + wodim, + genisoimage, + gstreamer0.10-plugins-base (>= 0.10.0) +Recommends: hal (>= 0.5), + gstreamer0.10-plugins-good, + gnome-mount +Suggests: gnome-icon-theme, + gstreamer0.10-fluendo-mp3, + gstreamer0.10-plugins-bad +Replaces: bonfire (<= 0.4.4-1) +Conflicts: bonfire (<= 0.4.4-1) +Description: CD/DVD burning application for GNOME + Easy to use CD/DVD burning application where you can: + * Burn, Copy and Erase CD/DVD + * On-the-fly burning of CD/DVD + * Append data to multisession CD/DVD + * Burn Audio CD + * CD-Text writing for Audio CD --- brasero-0.8.0.orig/debian/copyright +++ brasero-0.8.0/debian/copyright @@ -0,0 +1,61 @@ +This package was debianized by Ondřej Surý on +Fri, 12 May 2006 15:46:36 +0200. + +It was downloaded from: + http://ftp.gnome.org/pub/GNOME/sources/brasero/ + +Copyright: + + Copyright (C) 2005-2007 Philippe Rouquier + Copyright (C) 2006 Ilkka Tuohela + Copyright (C) 2001-2004 Red Hat, Inc. + Copyright (C) 2005 John McCutchan + + + When not otherwise specified, files are under the GNU General Public License + version 2 or any later version. + + The following files are under the GNU Library General Public License version 2 + or any later version: + src/eggtreemultidnd.h + src/eggtreemultidnd.c + + +GNU General Public License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +GNU Library General Public License: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + --- brasero-0.8.0.orig/debian/compat +++ brasero-0.8.0/debian/compat @@ -0,0 +1 @@ +5 --- brasero-0.8.0.orig/debian/menu +++ brasero-0.8.0/debian/menu @@ -0,0 +1 @@ +?package(brasero): needs="X11" section="Applications/File Management" title="Brasero" longtitle="Brasero - CD/DVD burning application for GNOME" command="/usr/bin/brasero" --- brasero-0.8.0.orig/debian/patches/013_disable_deprecated.patch +++ brasero-0.8.0/debian/patches/013_disable_deprecated.patch @@ -0,0 +1,22 @@ +diff -Nur -x '*.orig' -x '*~' brasero-0.8.0/src/Makefile.am brasero-0.8.0.new/src/Makefile.am +--- brasero-0.8.0/src/Makefile.am 2008-07-13 16:55:15.000000000 +0100 ++++ brasero-0.8.0.new/src/Makefile.am 2008-07-17 12:38:04.000000000 +0100 +@@ -2,7 +2,6 @@ + DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED \ + -DGNOME_DISABLE_DEPRECATED + + INCLUDES = \ +diff -Nur -x '*.orig' -x '*~' brasero-0.8.0/src/Makefile.in brasero-0.8.0.new/src/Makefile.in +--- brasero-0.8.0/src/Makefile.in 2008-07-13 16:55:33.000000000 +0100 ++++ brasero-0.8.0.new/src/Makefile.in 2008-07-17 12:38:30.000000000 +0100 +@@ -434,7 +434,6 @@ + DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED \ + -DGNOME_DISABLE_DEPRECATED + + INCLUDES = \ --- brasero-0.8.0.orig/debian/patches/012_gnome-doc-utils.make.patch +++ brasero-0.8.0/debian/patches/012_gnome-doc-utils.make.patch @@ -0,0 +1,578 @@ +diff -Nur -x '*.orig' -x '*~' brasero-0.7.91/gnome-doc-utils.make brasero-0.7.91.new/gnome-doc-utils.make +--- brasero-0.7.91/gnome-doc-utils.make 1970-01-01 01:00:00.000000000 +0100 ++++ brasero-0.7.91.new/gnome-doc-utils.make 2008-07-04 01:19:28.000000000 +0100 +@@ -0,0 +1,574 @@ ++# gnome-doc-utils.make - make magic for building documentation ++# Copyright (C) 2004-2005 Shaun McCance ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software Foundation, ++# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++################################################################################ ++## @@ Generating Header Files ++ ++## @ DOC_H_FILE ++## The name of the header file to generate ++DOC_H_FILE ?= ++ ++## @ DOC_H_DOCS ++## The input DocBook files for generating the header file ++DOC_H_DOCS ?= ++ ++$(DOC_H_FILE): $(DOC_H_DOCS); ++ @rm -f $@.tmp; touch $@.tmp; ++ echo 'const gchar* documentation_credits[] = {' >> $@.tmp ++ list='$(DOC_H_DOCS)'; for doc in $$list; do \ ++ xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ ++ if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ ++ xsltproc --path "$$xmlpath" $(_credits) $$doc; \ ++ done | sort | uniq \ ++ | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \ ++ | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp ++ echo ' NULL' >> $@.tmp ++ echo '};' >> $@.tmp ++ echo >> $@.tmp ++ list='$(DOC_H_DOCS)'; for doc in $$list; do \ ++ xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ ++ if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ ++ docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ ++ | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ ++ echo $$xmlpath; \ ++ ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ ++ for id in $$ids; do \ ++ echo '#define HELP_'`echo $$docid`'_'`echo $$id \ ++ | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \ ++ done; \ ++ echo >> $@.tmp; \ ++ done; ++ cp $@.tmp $@ && rm -f $@.tmp ++ ++dist-check-gdu: ++if !HAVE_GNOME_DOC_UTILS ++ @echo "*** GNOME Doc Utils must be installed in order to make dist" ++ @false ++endif ++ ++.PHONY: dist-doc-header ++dist-doc-header: $(DOC_H_FILE) ++ @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \ ++ $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)"; ++ ++doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header) ++ ++.PHONY: clean-doc-header ++_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) ++clean-local: $(_clean_doc_header) ++distclean-local: $(_clean_doc_header) ++mostlyclean-local: $(_clean_doc_header) ++maintainer-clean-local: $(_clean_doc_header) ++clean-doc-header: ++ rm -f $(DOC_H_FILE) ++ ++all: $(DOC_H_FILE) ++ ++ ++################################################################################ ++## @@ Generating Documentation Files ++ ++## @ DOC_MODULE ++## The name of the document being built ++DOC_MODULE ?= ++ ++## @ DOC_ENTITIES ++## Files included with a SYSTEM entity ++DOC_ENTITIES ?= ++ ++## @ DOC_INCLUDES ++## Files included with XInclude ++DOC_INCLUDES ?= ++ ++## @ DOC_FIGURES ++## Figures and other external data ++DOC_FIGURES ?= ++ ++## @ DOC_FORMATS ++## The default formats to be built and installed ++DOC_FORMATS ?= docbook ++_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS)) ++ ++## @ DOC_LINGUAS ++## The languages this document is translated into ++DOC_LINGUAS ?= ++_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \ ++ $(filter $(LINGUAS),$(DOC_LINGUAS)), \ ++ $(DOC_LINGUAS)) ++ ++_DOC_ABS_SRCDIR = @abs_srcdir@ ++ ++ ++################################################################################ ++## Variables for Bootstrapping ++ ++_xml2po ?= `which xml2po` ++ ++_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` ++_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` ++_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl ++_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl ++_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl ++ ++if ENABLE_SK ++_ENABLE_SK = true ++_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` ++_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` ++_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml ++endif ++ ++ ++################################################################################ ++## @@ Rules for OMF Files ++ ++db2omf_args = \ ++ --stringparam db2omf.basename $(DOC_MODULE) \ ++ --stringparam db2omf.format $(3) \ ++ --stringparam db2omf.dtd \ ++ $(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 \ ++ | sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/') \ ++ --stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \ ++ --stringparam db2omf.omf_dir "$(OMF_DIR)" \ ++ --stringparam db2omf.help_dir "$(HELP_DIR)" \ ++ --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \ ++ $(if $(_ENABLE_SK), \ ++ --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \ ++ $(_db2omf) $(2) ++ ++## @ _DOC_OMF_IN ++## The OMF input file ++_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in)) ++ ++## @ _DOC_OMF_DB ++## The OMF files for DocBook output ++_DOC_OMF_DB = $(if $(_DOC_OMF_IN), \ ++ $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf)) ++ ++$(_DOC_OMF_DB) : $(_DOC_OMF_IN) ++$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml ++ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ ++ echo "The file '$(_skcontentslist)' does not exist." >&2; \ ++ echo "Please check your ScrollKeeper installation." >&2; \ ++ exit 1; } ++ xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } ++ ++## @ _DOC_OMF_HTML ++## The OMF files for HTML output ++_DOC_OMF_HTML = $(if $(_DOC_OMF_IN), \ ++ $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf)) ++ ++$(_DOC_OMF_HTML) : $(_DOC_OMF_IN) ++$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml ++if ENABLE_SK ++ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ ++ echo "The file '$(_skcontentslist)' does not exist" >&2; \ ++ echo "Please check your ScrollKeeper installation." >&2; \ ++ exit 1; } ++endif ++ xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } ++ ++## @ _DOC_OMF_ALL ++## All OMF output files to be built ++# FIXME ++_DOC_OMF_ALL = \ ++ $(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB)) \ ++ $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML)) ++ ++.PHONY: omf ++omf: $(_DOC_OMF_ALL) ++ ++ ++################################################################################ ++## @@ C Locale Documents ++ ++## @ _DOC_C_MODULE ++## The top-level documentation file in the C locale ++_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml) ++ ++## @ _DOC_C_ENTITIES ++## Files included with a SYSTEM entity in the C locale ++_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent)) ++ ++## @ _DOC_C_XINCLUDES ++## Files included with XInclude in the C locale ++_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc)) ++ ++## @ _DOC_C_DOCS ++## All documentation files in the C locale ++_DOC_C_DOCS = \ ++ $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \ ++ $(_DOC_C_MODULE) ++ ++## @ _DOC_C_DOCS_NOENT ++## All documentation files in the C locale, ++## except files included with a SYSTEM entity ++_DOC_C_DOCS_NOENT = \ ++ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) ++ ++## @ _DOC_C_FIGURES ++## All figures and other external data in the C locale ++_DOC_C_FIGURES = $(if $(DOC_FIGURES), \ ++ $(foreach fig,$(DOC_FIGURES),C/$(fig)), \ ++ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png))) ++ ++## @ _DOC_C_HTML ++## All HTML documentation in the C locale ++# FIXME: probably have to shell escape to determine the file names ++_DOC_C_HTML = $(foreach f, \ ++ $(shell xsltproc --xinclude \ ++ --stringparam db.chunk.basename "$(DOC_MODULE)" \ ++ $(_chunks) "C/$(DOC_MODULE).xml"), \ ++ C/$(f).xhtml) ++ ++############################################################################### ++## @@ Other Locale Documentation ++ ++## @ _DOC_POFILES ++## The .po files used for translating the document ++_DOC_POFILES = $(if $(DOC_MODULE), \ ++ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) ++ ++.PHONY: po ++po: $(_DOC_POFILES) ++ ++## @ _DOC_LC_MODULES ++## The top-level documentation files in all other locales ++_DOC_LC_MODULES = $(if $(DOC_MODULE), \ ++ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml)) ++ ++## @ _DOC_LC_XINCLUDES ++## Files included with XInclude in all other locales ++_DOC_LC_INCLUDES = \ ++ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \ ++ $(lc)/$(notdir $(inc)) )) ++ ++## @ _DOC_LC_HTML ++## All HTML documentation in all other locales ++# FIXME: probably have to shell escape to determine the file names ++_DOC_LC_HTML = \ ++ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML), \ ++ $(lc)/$(notdir $(doc)) )) ++ ++## @ _DOC_LC_DOCS ++## All documentation files in all other locales ++_DOC_LC_DOCS = \ ++ $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \ ++ $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML)) ++ ++## @ _DOC_LC_FIGURES ++## All figures and other external data in all other locales ++_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \ ++ $(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) ) ++ ++_DOC_SRC_FIGURES = \ ++ $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \ ++ $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) )) ++ ++$(_DOC_POFILES): ++ @if ! test -d $(dir $@); then \ ++ echo "mkdir $(dir $@)"; \ ++ mkdir "$(dir $@)"; \ ++ fi ++ @if test ! -f $@ -a -f $(srcdir)/$@; then \ ++ echo "cp $(srcdir)/$@ $@"; \ ++ cp "$(srcdir)/$@" "$@"; \ ++ fi; ++ @docs=; \ ++ list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \ ++ docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \ ++ done; \ ++ if ! test -f $@; then \ ++ echo "(cd $(dir $@) && \ ++ $(_xml2po) -e $$docs > $(notdir $@).tmp && \ ++ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \ ++ (cd $(dir $@) && \ ++ $(_xml2po) -e $$docs > $(notdir $@).tmp && \ ++ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \ ++ else \ ++ echo "(cd $(dir $@) && \ ++ $(_xml2po) -e -u $(notdir $@) $$docs)"; \ ++ (cd $(dir $@) && \ ++ $(_xml2po) -e -u $(notdir $@) $$docs); \ ++ fi ++ ++# FIXME: fix the dependancy ++# FIXME: hook xml2po up ++$(_DOC_LC_DOCS) : $(_DOC_POFILES) ++$(_DOC_LC_DOCS) : $(_DOC_C_DOCS) ++ if ! test -d $(dir $@); then mkdir $(dir $@); fi ++ if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ ++ (cd $(dir $@) && \ ++ $(_xml2po) -e -p \ ++ "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \ ++ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ ++ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) ++ ++## @ _DOC_POT ++## A pot file ++_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot) ++.PHONY: pot ++pot: $(_DOC_POT) ++$(_DOC_POT): $(_DOC_C_DOCS_NOENT) ++ $(_xml2po) -e -o $@ $^ ++ ++ ++################################################################################ ++## @@ All Documentation ++ ++## @ _DOC_HTML_ALL ++## All HTML documentation, only if it's built ++_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \ ++ $(_DOC_C_HTML) $(_DOC_LC_HTML)) ++ ++_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) ++ ++$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) ++ xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ++ ++ ++################################################################################ ++ ++all: \ ++ $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \ ++ $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \ ++ $(_DOC_HTML_ALL) $(_DOC_POFILES) ++ ++ ++.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir ++ ++clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML) ++clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) ++clean-doc-lc: ++ rm -f $(_DOC_LC_DOCS) ++ @list='$(_DOC_POFILES)'; for po in $$list; do \ ++ if ! test "$$po" -ef "$(srcdir)/$$po"; then \ ++ echo "rm -f $$po"; \ ++ rm -f "$$po"; \ ++ fi; \ ++ done ++ @for lc in C $(_DOC_REAL_LINGUAS); do \ ++ if test -f "$$lc/.xml2po.mo"; then \ ++ echo "rm -f $$lc/.xml2po.mo"; \ ++ rm -f "$$lc/.xml2po.mo"; \ ++ fi; \ ++ done ++clean-doc-dir: ++ @for lc in C $(_DOC_REAL_LINGUAS); do \ ++ for dir in `find $$lc -depth -type d`; do \ ++ if ! test $$dir -ef $(srcdir)/$$dir; then \ ++ echo "rmdir $$dir"; \ ++ rmdir "$$dir"; \ ++ fi; \ ++ done; \ ++ done ++ ++_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf) ++_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk) ++_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc) ++_clean_dir = $(if $(DOC_MODULE),clean-doc-dir) ++ ++clean-local: \ ++ $(_clean_omf) $(_clean_dsk) \ ++ $(_clean_lc) $(_clean_dir) ++distclean-local: \ ++ $(_clean_omf) $(_clean_dsk) \ ++ $(_clean_lc) $(_clean_dir) ++mostlyclean-local: \ ++ $(_clean_omf) $(_clean_dsk) \ ++ $(_clean_lc) $(_clean_dir) ++maintainer-clean-local: \ ++ $(_clean_omf) $(_clean_dsk) \ ++ $(_clean_lc) $(_clean_dir) ++ ++ ++.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk ++doc-dist-hook: \ ++ $(if $(DOC_MODULE),dist-doc-docs) \ ++ $(if $(_DOC_C_FIGURES),dist-doc-figs) \ ++ $(if $(_DOC_OMF_IN),dist-doc-omf) ++# $(if $(_DOC_DSK_IN),dist-doc-dsk) ++ ++dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES) ++ @for lc in C $(_DOC_REAL_LINGUAS); do \ ++ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ ++ $(mkinstalldirs) "$(distdir)/$$lc"; \ ++ done ++ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ ++ for doc in $$list; do \ ++ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ if ! test -d "$(distdir)/$$docdir"; then \ ++ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ ++ $(mkinstalldirs) "$(distdir)/$$docdir"; \ ++ fi; \ ++ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ ++ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ ++ done ++ ++dist-doc-figs: $(_DOC_SRC_FIGURES) ++ @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \ ++ for fig in $$list; do \ ++ if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$fig"; then \ ++ figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ if ! test -d "$(distdir)/$$figdir"; then \ ++ echo "$(mkinstalldirs) $(distdir)/$$figdir"; \ ++ $(mkinstalldirs) "$(distdir)/$$figdir"; \ ++ fi; \ ++ echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \ ++ $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \ ++ fi; \ ++ done; ++ ++dist-doc-omf: ++ @if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \ ++ $(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))" ++ ++dist-doc-dsk: ++ @if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \ ++ $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))" ++ ++ ++.PHONY: check-doc-docs check-doc-omf ++check: \ ++ $(if $(DOC_MODULE),check-doc-docs) \ ++ $(if $(_DOC_OMF_IN),check-doc-omf) ++ ++check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) ++ @for lc in C $(_DOC_REAL_LINGUAS); do \ ++ if test -f "$$lc"; \ ++ then d=; \ ++ xmlpath="$$lc"; \ ++ else \ ++ d="$(srcdir)/"; \ ++ xmlpath="$$lc:$(srcdir)/$$lc"; \ ++ fi; \ ++ echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \ ++ xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \ ++ done ++ ++check-doc-omf: $(_DOC_OMF_ALL) ++ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ ++ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \ ++ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \ ++ done ++ ++ ++.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk ++install-data-local: \ ++ $(if $(DOC_MODULE),install-doc-docs) \ ++ $(if $(_DOC_HTML_ALL),install-doc-html) \ ++ $(if $(_DOC_C_FIGURES),install-doc-figs) \ ++ $(if $(_DOC_OMF_IN),install-doc-omf) ++# $(if $(_DOC_DSK_IN),install-doc-dsk) ++ ++install-doc-docs: ++ @for lc in C $(_DOC_REAL_LINGUAS); do \ ++ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \ ++ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \ ++ done ++ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ ++ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \ ++ if ! test -d "$$docdir"; then \ ++ echo "$(mkinstalldirs) $$docdir"; \ ++ $(mkinstalldirs) "$$docdir"; \ ++ fi; \ ++ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ ++ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \ ++ done ++ ++install-doc-figs: ++ @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \ ++ for lc in C $(_DOC_REAL_LINGUAS); do \ ++ if test -f "$$lc/$$fig"; then \ ++ figfile="$$lc/$$fig"; \ ++ elif test -f "$(srcdir)/$$lc/$$fig"; then \ ++ figfile="$(srcdir)/$$lc/$$fig"; \ ++ elif test -f "C/$$fig"; then \ ++ figfile="C/$$fig"; \ ++ else \ ++ figfile="$(srcdir)/C/$$fig"; \ ++ fi; \ ++ figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \ ++ if ! test -d "$$figdir"; then \ ++ echo "$(mkinstalldirs) $$figdir"; \ ++ $(mkinstalldirs) "$$figdir"; \ ++ fi; \ ++ figbase=`echo $$fig | sed -e 's/^.*\///'`; \ ++ echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ ++ $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ ++ done; \ ++ done ++ ++install-doc-html: ++ echo install-html ++ ++install-doc-omf: ++ $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE) ++ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ ++ echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ ++ $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \ ++ done ++ @if test "x$(_ENABLE_SK)" = "xtrue"; then \ ++ echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \ ++ scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \ ++ fi; ++ ++install-doc-dsk: ++ echo install-dsk ++ ++ ++.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk ++uninstall-local: \ ++ $(if $(DOC_MODULE),uninstall-doc-docs) \ ++ $(if $(_DOC_HTML_ALL),uninstall-doc-html) \ ++ $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \ ++ $(if $(_DOC_OMF_IN),uninstall-doc-omf) ++# $(if $(_DOC_DSK_IN),uninstall-doc-dsk) ++ ++uninstall-doc-docs: ++ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ ++ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ ++ rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ ++ done ++ ++uninstall-doc-figs: ++ @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \ ++ echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \ ++ rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \ ++ done; ++ ++uninstall-doc-omf: ++ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ ++ if test "x$(_ENABLE_SK)" = "xtrue"; then \ ++ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ ++ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ ++ fi; \ ++ echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ ++ rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ ++ done --- brasero-0.8.0.orig/debian/patches/010_lpi.patch +++ brasero-0.8.0/debian/patches/010_lpi.patch @@ -0,0 +1,131 @@ +# 1) First attempt to create, +diff -Nur -x '*.orig' -x '*~' brasero-0.8.0/configure brasero-0.8.0.new/configure +--- brasero-0.8.0/configure 2008-07-13 16:55:30.000000000 +0100 ++++ brasero-0.8.0.new/configure 2008-07-15 01:05:16.000000000 +0100 +@@ -21942,6 +21942,7 @@ + libgnome-2.0 >= \$LIBGNOME_REQUIRED \\ + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED \\ + libxml-2.0 >= \$LIBXML2_REQUIRED \\ ++ launchpad-integration \\ + dbus-glib-1 >= \$DBUS_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "\ + hal >= $HAL_REQUIRED \ +@@ -21951,6 +21952,7 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED \ + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ + libxml-2.0 >= $LIBXML2_REQUIRED \ ++ launchpad-integration \ + dbus-glib-1 >= $DBUS_REQUIRED") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +@@ -21963,6 +21965,7 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED \ + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ + libxml-2.0 >= $LIBXML2_REQUIRED \ ++ launchpad-integration \ + dbus-glib-1 >= $DBUS_REQUIRED" 2>/dev/null` + else + pkg_failed=yes +@@ -21982,6 +21985,7 @@ + libgnome-2.0 >= \$LIBGNOME_REQUIRED \\ + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED \\ + libxml-2.0 >= \$LIBXML2_REQUIRED \\ ++ launchpad-integration \\ + dbus-glib-1 >= \$DBUS_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "\ + hal >= $HAL_REQUIRED \ +@@ -21991,6 +21995,7 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED \ + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ + libxml-2.0 >= $LIBXML2_REQUIRED \ ++ launchpad-integration \ + dbus-glib-1 >= $DBUS_REQUIRED") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +@@ -22003,6 +22008,7 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED \ + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ + libxml-2.0 >= $LIBXML2_REQUIRED \ ++ launchpad-integration \ + dbus-glib-1 >= $DBUS_REQUIRED" 2>/dev/null` + else + pkg_failed=yes +@@ -22029,6 +22035,7 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED \ + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ + libxml-2.0 >= $LIBXML2_REQUIRED \ ++ launchpad-integration \ + dbus-glib-1 >= $DBUS_REQUIRED" 2>&1` + else + BRASERO_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ +@@ -22039,6 +22046,7 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED \ + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ + libxml-2.0 >= $LIBXML2_REQUIRED \ ++ launchpad-integration \ + dbus-glib-1 >= $DBUS_REQUIRED" 2>&1` + fi + # Put the nasty error message in config.log where it belongs +@@ -22052,6 +22060,7 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED \ + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ + libxml-2.0 >= $LIBXML2_REQUIRED \ ++ launchpad-integration \ + dbus-glib-1 >= $DBUS_REQUIRED) were not met: + + $BRASERO_PKG_ERRORS +@@ -22071,6 +22080,7 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED \ + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ + libxml-2.0 >= $LIBXML2_REQUIRED \ ++ launchpad-integration \ + dbus-glib-1 >= $DBUS_REQUIRED) were not met: + + $BRASERO_PKG_ERRORS +diff -Nur -x '*.orig' -x '*~' brasero-0.8.0/configure.in brasero-0.8.0.new/configure.in +--- brasero-0.8.0/configure.in 2008-07-13 16:55:19.000000000 +0100 ++++ brasero-0.8.0.new/configure.in 2008-07-15 01:04:49.000000000 +0100 +@@ -152,8 +152,9 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED \ + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ + libxml-2.0 >= $LIBXML2_REQUIRED \ +- dbus-glib-1 >= $DBUS_REQUIRED) +- ++ launchpad-integration \ ++ dbus-glib-1 >= $DBUS_REQUIRED) ++ + AC_SUBST(BRASERO_CFLAGS) + AC_SUBST(BRASERO_LIBS) + BRASERO_CFLAGS="$BRASERO_BASE_CFLAGS $BRASERO_GSTREAMER_CFLAGS $BRASERO_GIO_CFLAGS $BRASERO_CFLAGS $CFLAGS" +diff -Nur -x '*.orig' -x '*~' brasero-0.8.0/src/brasero-menu.h brasero-0.8.0.new/src/brasero-menu.h +--- brasero-0.8.0/src/brasero-menu.h 2008-07-13 16:55:15.000000000 +0100 ++++ brasero-0.8.0.new/src/brasero-menu.h 2008-07-15 01:04:49.000000000 +0100 +@@ -112,6 +112,7 @@ + "" + "" + "" ++ "" + "" + "" + "" +diff -Nur -x '*.orig' -x '*~' brasero-0.8.0/src/main.c brasero-0.8.0.new/src/main.c +--- brasero-0.8.0/src/main.c 2008-07-13 16:55:15.000000000 +0100 ++++ brasero-0.8.0.new/src/main.c 2008-07-15 01:04:49.000000000 +0100 +@@ -44,6 +44,8 @@ + + #include + ++#include ++ + #include "brasero-app.h" + #include "brasero-menu.h" + #include "brasero-jacket-edit.h" +@@ -602,6 +604,8 @@ + menubar = gtk_ui_manager_get_widget (app->manager, "/menubar"); + gnome_app_set_menus (GNOME_APP (app->mainwin), GTK_MENU_BAR (menubar)); + ++ launchpad_integration_add_ui (app->manager, "/menubar/HelpMenu/LaunchpadItems"); ++ + /* check if we can use checksums (we need plugins enabled) */ + caps = brasero_burn_caps_get_default (); + if (!brasero_burn_caps_can_checksum (caps)) { --- brasero-0.8.0.orig/debian/patches/006-fix-libdvdcss.patch +++ brasero-0.8.0/debian/patches/006-fix-libdvdcss.patch @@ -0,0 +1,14 @@ +Launchpad #134828; New patch, 006-fix-libdvdcss, load libdvdcss lib with SONAME +version as to not require the -dev package. + +--- brasero-0.6.90.orig/src/plugins/dvdcss/burn-dvdcss.c 2007-11-25 14:48:23.000000000 +0000 ++++ brasero-0.6.90/src/plugins/dvdcss/burn-dvdcss.c 2007-12-17 20:14:02.639203793 +0000 +@@ -76,7 +76,7 @@ brasero_dvdcss_library_init (GError **er + return TRUE; + + /* load libdvdcss library and see the version (min is 1.2.0) */ +- module = g_module_open ("libdvdcss.so", G_MODULE_BIND_LOCAL); ++ module = g_module_open ("libdvdcss.so.2", G_MODULE_BIND_LOCAL); + if (!module) + goto error_doesnt_exist; + --- brasero-0.8.0.orig/debian/patches/series +++ brasero-0.8.0/debian/patches/series @@ -0,0 +1,5 @@ +006-fix-libdvdcss.patch +008-add-gettext-domain-to-desktop-file.patch +010_lpi.patch +012_gnome-doc-utils.make.patch +013_disable_deprecated.patch --- brasero-0.8.0.orig/debian/patches/008-add-gettext-domain-to-desktop-file.patch +++ brasero-0.8.0/debian/patches/008-add-gettext-domain-to-desktop-file.patch @@ -0,0 +1,12 @@ +diff -urN brasero-0.7.1.orig/data/brasero.desktop.in.in brasero-0.7.1/data/brasero.desktop.in.in +--- brasero-0.7.1.orig/data/brasero.desktop.in.in 2008-01-27 17:25:17.000000000 +0200 ++++ brasero-0.7.1/data/brasero.desktop.in.in 2008-03-19 11:01:01.000000000 +0200 +@@ -14,6 +14,7 @@ + X-GNOME-Bugzilla-Product=brasero + X-GNOME-Bugzilla-Component=general + X-GNOME-Bugzilla-Version=@VERSION@ ++X-Ubuntu-Gettext-Domain=brasero + + Actions=BurnImage;OpenProject; + +