From bd32dd0a4a2938d3b5e46b9345bdfa28e9423554 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 10 Dec 2009 16:49:18 -0500 Subject: set release to lucid --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b924e8d..2a0564c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-application (0.0.3-0ubuntu1) karmic; urgency=low +indicator-application (0.0.3-0ubuntu1) lucid; urgency=low * Upstream release 0.0.3 * Adding in documentation -- cgit v1.2.3 From 767f3d45ef7365d9e4cbbe06432ab2067c13e182 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 10 Dec 2009 17:02:36 -0500 Subject: set to UNRELEASED --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2a0564c..7d06522 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-application (0.0.3-0ubuntu1) lucid; urgency=low +indicator-application (0.0.3-0ubuntu1) UNRELEASED; urgency=low * Upstream release 0.0.3 * Adding in documentation -- cgit v1.2.3 From af738898f8690ca60dc6e689cd24d2b525cde906 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 10 Dec 2009 17:12:55 -0500 Subject: - set libappindicator-doc arch all - make libappindicator-dev depend on libappindicator0 --- debian/changelog | 2 ++ debian/control | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7d06522..350d880 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ indicator-application (0.0.3-0ubuntu1) UNRELEASED; urgency=low [Ken VanDine] * debian/control - set Vcs-Bzr to ~ubuntu-desktop + - set libappindicator-doc arch all + - make libappindicator-dev depend on libappindicator0 * debian/libappindicator-doc.install - install the developer docs * debian/rules diff --git a/debian/control b/debian/control index 039c721..5fd3db4 100644 --- a/debian/control +++ b/debian/control @@ -42,7 +42,8 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbus-glib-1-dev (>= 0.76) + libdbus-glib-1-dev (>= 0.76), + libappindicator0 (= ${binary:Version}) Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. @@ -51,7 +52,7 @@ Description: Application Indicators Package: libappindicator-doc Section: doc -Architecture: any +Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, libappindicator0 (= ${binary:Version}) -- cgit v1.2.3 From 43588841542cbcda079ef586063b715d78bacf6c Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 10 Dec 2009 17:31:13 -0500 Subject: * debian/copyright - Include the proper licenses (LGPL-2.1 and LGPL-3) --- debian/changelog | 2 ++ debian/copyright | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 48 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 350d880..6b53530 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ indicator-application (0.0.3-0ubuntu1) UNRELEASED; urgency=low - added simple-patchsys.mk * debian/patches/clean_up_docs.patch - Remove template values and set a proper title + * debian/copyright + - Include the proper licenses (LGPL-2.1 and LGPL-3) -- Ted Gould Thu, 10 Dec 2009 13:34:40 -0600 diff --git a/debian/copyright b/debian/copyright index fa3df0d..ba92c05 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ This package was debianized by Robert Collins on Thu, 29 Oct 2009 15:44:14 +1100 -It was downloaded from +It was downloaded from Upstream Author: @@ -13,4 +13,48 @@ Copyright: License: - This program has not been released, it may not be used. + 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, version 3 of the License. + + 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Two files (app-indicator.c and app-indicator.h) are under: + + 1) the GNU Lesser General Public License version 3, as published by the + Free Software Foundation; and/or + 2) the GNU Lesser General Public License version 2.1, 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. + + This library 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.1 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. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA + +On Debian/Ubuntu systems, the full text of the LGPL v2.1 can be found in +`/usr/share/common-licenses/LGPL-2.1', the full text of the LGPL v3 can be found in +`/usr/share/common-licenses/LGPL-3, and the full text of the GPL v3 can be +found in `/usr/share/common-licenses/GPL-3' -- cgit v1.2.3 From c5ceaf1d34d09e5249590be452b7ee4c348d8898 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 10 Dec 2009 23:48:32 +0100 Subject: releasing version 0.0.3-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6b53530..f3f118e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-application (0.0.3-0ubuntu1) UNRELEASED; urgency=low +indicator-application (0.0.3-0ubuntu1) lucid; urgency=low * Upstream release 0.0.3 * Adding in documentation -- cgit v1.2.3 From 7263623ea488e23ec6316a82bd966158e0e39fcd Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 11 Dec 2009 09:21:42 -0500 Subject: * Upstream release 0.0.4 * debian/rules: - removed disable-scrollkeeper - set DOC_SERVER used for docs * debian/patches/clean_up_docs.patch - removed, merged upstream --- debian/changelog | 11 ++++++++- debian/patches/clean_up_docs.patch | 48 ++++++++++++++++++++++++++++++++------ debian/rules | 3 ++- 3 files changed, 53 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f3f118e..8114617 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,13 @@ -indicator-application (0.0.3-0ubuntu1) lucid; urgency=low +indicator-application (0.0.4-0ubuntu1) lucid; urgency=low + + * Upstream release 0.0.4 + * debian/rules: + - removed disable-scrollkeeper + - set DOC_SERVER used for docs + * debian/patches/clean_up_docs.patch + - removed, merged upstream + + -- Ken VanDine Fri, 11 Dec 2009 09:18:58 -0500 * Upstream release 0.0.3 * Adding in documentation diff --git a/debian/patches/clean_up_docs.patch b/debian/patches/clean_up_docs.patch index 0b054fe..39ff62c 100644 --- a/debian/patches/clean_up_docs.patch +++ b/debian/patches/clean_up_docs.patch @@ -1,15 +1,49 @@ -=== modified file 'docs/reference/libappindicator-docs.sgml' +=== 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 2009-12-10 20:40:50 +0000 -@@ -7,15 +7,10 @@ - ++++ docs/reference/libappindicator-docs.sgml.in 2009-12-11 14:16:59 +0000 +@@ -8,14 +8,14 @@ libappindicator Reference Manual -- + - for libappindicator [VERSION] -- The latest version of this documentation can be found on-line at ++ for libappindicator @VERSION@ + The latest version of this documentation can be found on-line at - http://[SERVER]/libappindicator/. -- ++ http://@DOC_SERVER@/libappindicator/current/. + diff --git a/debian/rules b/debian/rules index c42359e..3a44cbe 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc +DOC_SERVER = people.canonical.com/~ted +DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc LDFLAGS += -Wl,-z,defs -Wl,--as-needed -- cgit v1.2.3 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 (limited to 'debian') 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 From d032af1ceeecbac0bde2b73ae48d50c22e432ede Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 11 Dec 2009 09:24:12 -0500 Subject: fixed parse error in changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c60bea9..2e5b94c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ indicator-application (0.0.4-0ubuntu1) lucid; urgency=low -- Ken VanDine Fri, 11 Dec 2009 09:18:58 -0500 +indicator-application (0.0.3-0ubuntu1) lucid; urgency=low + * Upstream release 0.0.3 * Adding in documentation * Adding a pkg-config .pc file for libappindicator -- cgit v1.2.3 From f9d90d24d572fd58e96e4f3543a2e8a1046bccef Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 11 Dec 2009 11:31:58 -0500 Subject: removed the disable-scrollkeeper configure arg --- debian/changelog | 3 +-- debian/rules | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2e5b94c..e3cc52f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,7 @@ indicator-application (0.0.4-0ubuntu1) lucid; urgency=low * Upstream release 0.0.4 * debian/rules: - - removed disable-scrollkeeper - - set DOC_SERVER used for docs + - removed the disable-scrollkeeper configure arg * debian/patches/clean_up_docs.patch - removed, merged upstream * debian/control: diff --git a/debian/rules b/debian/rules index 3a44cbe..30ee9cc 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DOC_SERVER = people.canonical.com/~ted DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc LDFLAGS += -Wl,-z,defs -Wl,--as-needed -- cgit v1.2.3