diff options
| author | Ted Gould <ted@canonical.com> | 2009-03-27 23:58:38 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-03-27 23:58:38 -0500 |
| commit | 3fa7733ef1e760696a48f9671053e4e3f730bf2f (patch) | |
| tree | 3fe2786139329697cc16cd9deb137778d699576f | |
| parent | 606d1032410f3cb734eddc7b43dfef279b90f789 (diff) | |
| parent | ffe2a99cbd82655cfb0958f0886926d5efb16196 (diff) | |
| download | ayatana-indicator-messages-3fa7733ef1e760696a48f9671053e4e3f730bf2f.tar.gz ayatana-indicator-messages-3fa7733ef1e760696a48f9671053e4e3f730bf2f.tar.bz2 ayatana-indicator-messages-3fa7733ef1e760696a48f9671053e4e3f730bf2f.zip | |
Merging in core-dev changes
| -rw-r--r-- | .bzr-builddeb/default.conf | 2 | ||||
| -rw-r--r-- | debian/changelog | 18 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rw-r--r-- | debian/watch | 2 |
4 files changed, 17 insertions, 7 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf new file mode 100644 index 0000000..3165e05 --- /dev/null +++ b/.bzr-builddeb/default.conf @@ -0,0 +1,2 @@ +[BUILDDEB] +merge = True diff --git a/debian/changelog b/debian/changelog index f4a57fa..c81bdb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,23 @@ indicator-messages (0.1.3-0ubuntu1) jaunty; urgency=low + [ Ted Gould ] * New upstream version. - * Now changes the icon based on non-IM indicators so that Evolution + - Now changes the icon based on non-IM indicators so that Evolution works much better. (LP: #342480) - * Now the menu items are in a predictable order, alphabetical. - * The Messages for a particular client (i.e. Pidgin) are grouped with + - Now the menu items are in a predictable order, alphabetical. + - The Messages for a particular client (i.e. Pidgin) are grouped with the client they're associated with. - * Adjusting the icon size to match the new one in the Human theme. - * Adjusting the build so that all the different libraries are not + - Adjusting the icon size to match the new one in the Human theme. + - Adjusting the build so that all the different libraries are not built in a versioned manner. Now it's just one .so, which is what it should have been originally. - -- Ted Gould <ted@ubuntu.com> Wed, 18 Mar 2009 16:31:28 -0500 + [ Martin Pitt ] + * Add debian/watch. + * Add bzr-builddeb configuration. + * debian/copyright: Fix download location. + + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 19 Mar 2009 12:23:17 +0100 indicator-messages (0.1-0ubuntu1) jaunty; urgency=low diff --git a/debian/copyright b/debian/copyright index aa4fb6f..ca1ebdd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ This package was debianized by Ted Gould <ted@canonical.com> on Wed, 11 Feb 2009 15:41:06 -0600. -It was downloaded from <http://launchpad.net/indicate-applet/> +It was downloaded from <http://launchpad.net/indicator-applet/> Upstream Author: diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..1ee1f10 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://launchpad.net/indicator-applet/+download .*/indicator-messages-([0-9.]+)\.tar\.gz |