From 020d8bb3d154e182be7650405719ab2ac2e3ce9e Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 11 Dec 2009 09:22:32 -0500 Subject: * debian/control: - removed Build-Depend for scrollkeeper --- debian/changelog | 2 ++ debian/control | 1 - debian/patches/clean_up_docs.patch | 55 -------------------------------------- 3 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 debian/patches/clean_up_docs.patch diff --git a/debian/changelog b/debian/changelog index 8114617..c60bea9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ indicator-application (0.0.4-0ubuntu1) lucid; urgency=low - set DOC_SERVER used for docs * debian/patches/clean_up_docs.patch - removed, merged upstream + * debian/control: + - removed Build-Depend for scrollkeeper -- Ken VanDine Fri, 11 Dec 2009 09:18:58 -0500 diff --git a/debian/control b/debian/control index 5fd3db4..746e569 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, gnome-doc-utils, - scrollkeeper, gtk-doc-tools, intltool, libindicate-dev (>= 0.2.0), diff --git a/debian/patches/clean_up_docs.patch b/debian/patches/clean_up_docs.patch deleted file mode 100644 index 39ff62c..0000000 --- a/debian/patches/clean_up_docs.patch +++ /dev/null @@ -1,55 +0,0 @@ -=== modified file 'configure.ac' ---- configure.ac 2009-12-10 19:18:44 +0000 -+++ configure.ac 2009-12-11 14:17:10 +0000 -@@ -16,6 +16,7 @@ - AC_PROG_LIBTOOL - - AC_SUBST(VERSION) -+AC_SUBST(DOC_SERVER) - AC_CONFIG_MACRO_DIR([m4]) - - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) -@@ -93,6 +94,7 @@ - docs/Makefile - docs/reference/Makefile - docs/reference/version.xml -+docs/reference/libappindicator-docs.sgml - ]) - - ########################### - -=== modified file 'docs/reference/Makefile.am' ---- docs/reference/Makefile.am 2009-12-08 22:02:28 +0000 -+++ docs/reference/Makefile.am 2009-12-11 14:09:14 +0000 -@@ -83,7 +83,7 @@ - - # Other files to distribute - # e.g. EXTRA_DIST += version.xml.in --EXTRA_DIST += version.xml.in -+EXTRA_DIST += version.xml.in libappindicator-docs.sgml.in - - # Files not to distribute - # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types - -=== renamed file 'docs/reference/libappindicator-docs.sgml' => 'docs/reference/libappindicator-docs.sgml.in' ---- docs/reference/libappindicator-docs.sgml 2009-12-08 19:22:45 +0000 -+++ docs/reference/libappindicator-docs.sgml.in 2009-12-11 14:16:59 +0000 -@@ -8,14 +8,14 @@ - - libappindicator Reference Manual - -- for libappindicator [VERSION] -+ for libappindicator @VERSION@ - The latest version of this documentation can be found on-line at -- http://[SERVER]/libappindicator/. -+ http://@DOC_SERVER@/libappindicator/current/. - - - - -- [Insert title here] -+ Base Classes for Applications - - - - -- cgit v1.2.3