Merge lp:~mterry/libunity-misc/inline into lp:libunity-misc

[Michael Terry]

Bring debian/ packaging inline.

Brings the packaging inline.

Bootstrap and modernization will come in a future branch, to make it easier to review such changes.

[Didier Roche-Tolomelli (didrocks)]

Looking good to me, I can't wait for the future modernization branches coming :)

Please change the global status to approve once your lovely jenkins master is in sync.

review: Approve

[Francis Ginther (fginther)]

Jenkins autolanding job is ready. Approving.

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Michael Terry (mterry)]

Ack, whoops. I pushed some modernization to this branch accidentally. Will fix.

=== modified file 'autogen.sh'
--- autogen.sh	2010-01-12 10:58:35 +0000
+++ autogen.sh	2012-12-12 15:36:26 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PKG_NAME="liblauncher"
+PKG_NAME="libunity-misc"
 
 which gnome-autogen.sh || {
 	echo "You need gnome-common from GNOME SVN"

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2012-12-12 15:36:26 +0000
@@ -0,0 +1,82 @@
+libunity-misc (4.0.4-0ubuntu2) oneiric; urgency=low
+
+  * Cherry-pick from upstream:
+    - update-notifier systray icons showed and the wrong place and size
+      (LP: #856125)
+
+ -- Didier Roche <[e-mail]>  Thu, 29 Sep 2011 17:03:57 +0200
+
+libunity-misc (4.0.4-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+  * debian/libunity-misc4.symbols:
+    - add the new symbols
+  * debian/control:
+    - build-dep on libx11-dev
+
+ -- Didier Roche <[e-mail]>  Mon, 01 Aug 2011 17:35:56 +0200
+
+libunity-misc (4.0.2-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - build-dep now on libgtk-3-dev
+  * debian/libunity-misc4.install, debian/libunity-misc4.symbols,
+    debian/control:
+    - bump and adapt new symbols to new soname for gtk3
+
+ -- Didier Roche <[e-mail]>  Tue, 21 Jun 2011 19:43:58 +0200
+
+libunity-misc (0.2.1-0ubuntu2) natty; urgency=low
+
+  * cherry-pick:
+    - the .pc file shouldn't depend on clutter anymore
+
+ -- Didier Roche <[e-mail]>  Thu, 17 Feb 2011 19:55:25 +0100
+
+libunity-misc (0.2.1-0ubuntu1) natty; urgency=low
+
+  * New upstream release:
+    - readd systray support to unity (LP: #596879)
+  * debian/control:
+    - don't build with clutter anymore
+    - remove -dbg package
+    - don't dep on gtk-doc
+    - add libgtk2.0-dev build-dep
+  * debian/rules:
+    - don't build the documentation
+    - remove uneeded DEB_DH_MAKESHLIBS_ARGS
+  * debian/libunity-misc0.symbols:
+    - updated
+
+ -- Didier Roche <[e-mail]>  Thu, 17 Feb 2011 19:04:43 +0100
+
+libunity-misc (0.1.1-0ubuntu3) natty; urgency=low
+
+  * debian/control:
+    - change the description 
+  * debian/libunity-misc0.symbols:
+    - add symbol file (LP: #591158)
+
+ -- Didier Roche <[e-mail]>  Tue, 03 Aug 2010 13:07:44 +0200
+
+libunity-misc (0.1.1-0ubuntu1) maverick; urgency=low
+
+  * New upstream release
+  * Fix debian/copyright
+  * debian/rules:
+    - fix rm *{,l}a files
+    - fix LDFLAGS syntax
+  * debian/control:
+    - bump Standards-Version
+    - fix homepage
+    - remove uneeded build-dep
+  * added debian/watch
+
+ -- Didier Roche <[e-mail]>  Thu, 03 Jun 2010 19:19:11 +0200
+
+libunity-misc (0.1.0-0ubuntu1~ppa1) lucid; urgency=low
+
+  * Initial release  
+
+ -- Didier Roche <[e-mail]>  Thu, 28 Jan 2010 22:04:01 +0100

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2012-12-12 15:36:26 +0000
@@ -0,0 +1,1 @@
+5

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2012-12-12 15:36:26 +0000
@@ -0,0 +1,50 @@
+Source: libunity-misc
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+Build-Depends: debhelper (>= 5.0),
+               cdbs (>= 0.4.41),
+               dh-autoreconf,
+               gnome-common,
+               gtk-doc-tools,
+               libgtk-3-dev (>= 3.0),
+               libglib2.0-dev (>= 2.22.0),
+               libx11-dev,
+Standards-Version: 3.9.2
+Section: libs
+Homepage: https://launchpad.net/libunity-misc
+# If you aren't a member of ~unity-team but need to upload packaging changes,
+# just go ahead.  ~unity-team will notice and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~unity-team/libunity/trunk
+
+Package: libunity-misc-dev
+Section: libdevel
+Architecture: any
+Depends: libunity-misc4 (= ${binary:Version}), ${misc:Depends},
+         libglib2.0-dev (>= 2.22.0),
+Description: Miscellaneous functions for Unity - development files
+ libunity-misc is a shared library that provides miscellaneous functions for
+ Unity.
+ .
+ This package contains files that are needed to build applications.
+
+Package: libunity-misc4
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Miscellaneous functions for Unity - shared library
+ libunity-misc is a shared library that provides miscellaneous functions for
+ Unity.
+ .
+ This package contains shared libraries to be used by application.
+
+Package: libunity-misc-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: devhelp
+Description: Miscellaneous functions for Unity - documentation
+ libunity-misc is a shared library that provides miscellaneous functions for
+ Unity.
+ .
+ This package contains the documentation.
+

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2012-12-12 15:36:26 +0000
@@ -0,0 +1,75 @@
+This work was packaged for Ubuntu by:
+
+    Didier Roche <[e-mail]> on Fri, 15 Jan 2010 17:05:36 +0100
+
+It was downloaded from https://launchpad.net/libunity-misc
+
+Upstream Author(s):
+
+    Neil Jagdish Patel <[e-mail]>
+    Anders Carlsson <[e-mail]>
+    Vincent Untz
+    Neil Jagdish Patel <[e-mail]>
+
+Copyright:
+
+    Copyright (C) 2002 Anders Carlsson
+    Copyright (C) 2003-2006 Vincent Untz
+    Copyright (C) 2008 Red Hat, Inc.
+    Copyright (C) 2009 Gnome Shell
+    Copyright (C) 2010 Canonical, Ltd.
+
+License:
+
+    When not otherwise specified, the following license applies:
+
+      This library is free software; you can redistribute it and/or
+      modify it under the terms of the GNU Lesser General Public
+      License Version as published by the Free Software Foundation; either
+      version 2 of the License, or (at your option) any later version.
+
+      This library 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.
+
+On Debian systems, the complete text of the GNU Lesser General Public License
+can be found in `/usr/share/common-licenses/LGPL-2'
+
+    * unity-misc/unity-misc.h:
+
+      This library is free software; you can redistribute it and/or modify
+      it under the terms of the GNU Lesser General Public License
+      version 3.0 as published by the Free Software Foundation.
+
+      This library 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 version 3.0 for more details.
+
+On Debian systems, the complete text of the GNU Lesser General Public License
+can be found in `/usr/share/common-licenses/LGPL-3'
+
+    * unity-misc/unity-tray-manager.h,shell-embedded-window-private.h,
+      unity-tray-manager.c,shell-embedded-window.c,shell-gtk-embed.h,
+      shell-gtk-embed.c,shell-embedded-window.h:
+
+      This program is free software: you can redistribute it and/or modify it
+      under the terms of the the GNU General Public License version 2, as
+      published by the Free Software Foundation.
+ 
+      This program is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranties of
+      MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+      PURPOSE.  See the applicable version of the GNU Lesser General Public
+      License for more details.
+ 
+On Debian systems, the complete text of the GNU General Public License
+can be found in `/usr/share/common-licenses/GPL-2'
+
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Canonical Ltd.
+
+and is licensed under the GPL version 3, see `/usr/share/common-licenses/GPL-3'.

=== added file 'debian/libunity-misc-dev.install'
--- debian/libunity-misc-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libunity-misc-dev.install	2012-12-12 15:36:26 +0000
@@ -0,0 +1,3 @@
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/lib*.so
+debian/tmp/usr/lib/pkgconfig/*

=== added file 'debian/libunity-misc-doc.install'
--- debian/libunity-misc-doc.install	1970-01-01 00:00:00 +0000
+++ debian/libunity-misc-doc.install	2012-12-12 15:36:26 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/share/gtk-doc/

=== added file 'debian/libunity-misc4.install'
--- debian/libunity-misc4.install	1970-01-01 00:00:00 +0000
+++ debian/libunity-misc4.install	2012-12-12 15:36:26 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/lib*.so.*

=== added file 'debian/libunity-misc4.symbols'
--- debian/libunity-misc4.symbols	1970-01-01 00:00:00 +0000
+++ debian/libunity-misc4.symbols	2012-12-12 15:36:26 +0000
@@ -0,0 +1,40 @@
+libunity-misc.so.4 libunity-misc4 #MINVER#
+ _na_marshal_VOID__OBJECT_LONG@Base 0.1.1
+ _na_marshal_VOID__OBJECT_OBJECT@Base 0.1.1
+ _na_marshal_VOID__OBJECT_STRING_LONG_LONG@Base 0.1.1
+ get_current_slide@Base 4.0.4
+ get_slide_timeout@Base 4.0.4
+ na_fixed_tip_get_type@Base 0.2.1
+ na_fixed_tip_new@Base 0.2.1
+ na_fixed_tip_set_markup@Base 0.2.1
+ na_fixed_tip_set_orientation@Base 0.2.1
+ na_tray_child_force_redraw@Base 0.1.1
+ na_tray_child_get_title@Base 0.1.1
+ na_tray_child_get_type@Base 0.1.1
+ na_tray_child_get_wm_class@Base 0.2.1
+ na_tray_child_has_alpha@Base 0.1.1
+ na_tray_child_new@Base 0.1.1
+ na_tray_child_set_composited@Base 0.1.1
+ na_tray_force_redraw@Base 0.2.1
+ na_tray_get_manager@Base 0.2.1
+ na_tray_get_orientation@Base 0.2.1
+ na_tray_get_type@Base 0.2.1
+ na_tray_manager_check_running@Base 0.1.1
+ na_tray_manager_get_orientation@Base 0.1.1
+ na_tray_manager_get_type@Base 0.1.1
+ na_tray_manager_manage_screen@Base 0.1.1
+ na_tray_manager_new@Base 0.1.1
+ na_tray_manager_set_colors@Base 4.0.2
+ na_tray_manager_set_icon_size@Base 4.0.2
+ na_tray_manager_set_orientation@Base 0.1.1
+ na_tray_manager_set_padding@Base 4.0.2
+ na_tray_new_for_screen@Base 0.2.1
+ na_tray_set_colors@Base 4.0.2
+ na_tray_set_icon_size@Base 4.0.2
+ na_tray_set_orientation@Base 0.2.1
+ na_tray_set_padding@Base 4.0.2
+ ordered_roles@Base 0.2.1
+ read_slideshow_file@Base 4.0.4
+ slideshow_ref@Base 4.0.4
+ slideshow_unref@Base 4.0.4
+ wmclass_roles@Base 0.2.1

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2012-12-12 15:36:26 +0000
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
+
+LDFLAGS += -Wl,-O1 -Wl,--as-needed
+DEB_DH_AUTORECONF_ARGS = env NOCONFIGURE=1 ./autogen.sh
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-gtk-doc
+
+common-binary-post-install-arch::
+	find debian/tmp/usr/lib -name \*.la -exec rm {} \;
+	find debian/tmp/usr/lib -name \*.a -exec rm {} \;
+
+common-binary-predeb-arch:: list-missing

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2012-12-12 15:36:26 +0000
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/libunity-misc/+download .*/libunity-misc-([0-9.]+)\.tar\.gz

=== removed file 'gtk-doc.make'
--- gtk-doc.make	2011-06-16 13:15:05 +0000
+++ gtk-doc.make	1970-01-01 00:00:00 +0000
@@ -1,264 +0,0 @@
-# -*- mode: makefile -*-
-
-####################################
-# Everything below here is generic #
-####################################
-
-if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN = $(LIBTOOL) --mode=execute
-else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN =
-endif
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-SETUP_FILES = \
-	$(content_files)		\
-	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE)-sections.txt	\
-	$(DOC_MODULE)-overrides.txt
-
-EXTRA_DIST = 				\
-	$(SETUP_FILES)
-
-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
-	html-build.stamp pdf-build.stamp \
-	setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp
-
-SCANOBJ_FILES = 		 \
-	$(DOC_MODULE).args 	 \
-	$(DOC_MODULE).hierarchy  \
-	$(DOC_MODULE).interfaces \
-	$(DOC_MODULE).prerequisites \
-	$(DOC_MODULE).signals
-
-REPORT_FILES = \
-	$(DOC_MODULE)-undocumented.txt \
-	$(DOC_MODULE)-undeclared.txt \
-	$(DOC_MODULE)-unused.txt
-
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-
-if ENABLE_GTK_DOC
-if GTK_DOC_BUILD_HTML
-HTML_BUILD_STAMP=html-build.stamp
-else
-HTML_BUILD_STAMP=
-endif
-if GTK_DOC_BUILD_PDF
-PDF_BUILD_STAMP=pdf-build.stamp
-else
-PDF_BUILD_STAMP=
-endif
-
-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-else
-all-local:
-endif
-
-docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-
-$(REPORT_FILES): sgml-build.stamp
-
-#### setup ####
-
-setup-build.stamp:
-	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	   echo 'gtk-doc: Preparing build'; \
-	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
-	   if test "x$$files" != "x" ; then \
-	       for file in $$files ; do \
-	           test -f $(abs_srcdir)/$$file && \
-	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
-	       done \
-	   fi; \
-	   test -f $(abs_srcdir)/tmpl && \
-	       cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
-	fi
-	@touch setup-build.stamp
-
-
-setup.stamp: setup-build.stamp
-	@true
-
-
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo 'gtk-doc: Scanning header files'
-	@_source_dir='' ; \
-	for i in $(DOC_SOURCE_DIR) ; do \
-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	done ; \
-	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
-	else \
-	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
-	    done \
-	fi
-	@touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
-	@true
-
-#### templates ####
-
-tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo 'gtk-doc: Rebuilding template files'
-	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	  if test -w $(abs_srcdir) ; then \
-	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
-	  fi \
-	fi
-	@touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-$(srcdir)/tmpl/*.sgml:
-	@true
-
-#### xml ####
-
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo 'gtk-doc: Building XML'
-	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; \
-	for i in $(DOC_SOURCE_DIR) ; do \
-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	done ; \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
-	@touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
-	@true
-
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building HTML'
-	@rm -rf html
-	@mkdir html
-	@mkhtml_options=""; \
-	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
-	if test "$(?)" = "0"; then \
-	  mkhtml_options=--path="$(abs_srcdir)"; \
-	fi; \
-	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	-@test "x$(HTML_IMAGES)" = "x" || \
-	for file in $(HTML_IMAGES) ; do \
-	  if test -f $(abs_srcdir)/$$file ; then \
-	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
-	  fi; \
-	  if test -f $(abs_builddir)/$$file ; then \
-	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
-	  fi; \
-	done;
-	@echo 'gtk-doc: Fixing cross-references'
-	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	@touch html-build.stamp
-
-#### pdf ####
-
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building PDF'
-	@rm -rf $(DOC_MODULE).pdf
-	@mkpdf_imgdirs=""; \
-	if test "x$(HTML_IMAGES)" != "x"; then \
-	  for img in $(HTML_IMAGES); do \
-	    part=`dirname $$img`; \
-	    echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
-	    if test $$? != 0; then \
-	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
-	    fi; \
-	  done; \
-	fi; \
-	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-	@touch pdf-build.stamp
-
-##############
-
-clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
-
-distclean-local:
-	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
-	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
-	    rm -rf tmpl; \
-	fi
-
-maintainer-clean-local: clean
-	rm -rf xml html
-
-install-data-local:
-	@installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  if test -n "$(DOC_MODULE_VERSION)"; then \
-	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
-	  else \
-	    installdir="$(DESTDIR)$(TARGET_DIR)"; \
-	  fi; \
-	  $(mkinstalldirs) $${installdir} ; \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $${installdir}; \
-	  done; \
-	  if test -n "$(DOC_MODULE_VERSION)"; then \
-	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
-	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
-	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
-	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
-	  fi; \
-	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
-	fi
-
-uninstall-local:
-	@if test -n "$(DOC_MODULE_VERSION)"; then \
-	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
-	else \
-	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
-	fi; \
-	rm -rf $${installdir}
-
-#
-# Require gtk-doc when making dist
-#
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
-else
-dist-check-gtkdoc:
-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-	@false
-endif
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/html
-	-cp $(build)/tmpl/*.sgml $(distdir)/tmpl
-	cp $(builddir)/html/* $(distdir)/html
-	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
-	-cp $(build)/$(DOC_MODULE).types $(distdir)/
-	-cp $(build)/$(DOC_MODULE)-sections.txt $(distdir)/
-	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
-
-.PHONY : dist-hook-local docs