diff options
| author | Ted Gould <ted@gould.cx> | 2010-07-15 12:10:59 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-07-15 12:10:59 -0500 |
| commit | 706261ee20819eca725498dd8894d845808ca74f (patch) | |
| tree | b03109c67ad1be99ab8d9c46d142a4538027db54 | |
| parent | e64fccb7a2a74a310ccc1a11490e0a8a0a871b2a (diff) | |
| parent | a9299d5bfc2f1bc251d7e0e7949eeea6d0543c7b (diff) | |
| download | libdbusmenu-706261ee20819eca725498dd8894d845808ca74f.tar.gz libdbusmenu-706261ee20819eca725498dd8894d845808ca74f.tar.bz2 libdbusmenu-706261ee20819eca725498dd8894d845808ca74f.zip | |
Merging from Ubuntu Desktop
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index a5a18c7..142040d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libdbusmenu (0.3.6-0ubuntu1~ppa1) lucid; urgency=low +libdbusmenu (0.3.6-0ubuntu1) maverick; urgency=low * New upstream release. ∘ Protect against NULL values as event -- Ted Gould <ted@ubuntu.com> Thu, 15 Jul 2010 09:42:07 -0500 -libdbusmenu (0.3.5-0ubuntu1~ppa1) lucid; urgency=low +libdbusmenu (0.3.5-0ubuntu1) maverick; urgency=low * New upstream release. ∘ Protect against NULL nodes (LP: #602444) diff --git a/debian/control b/debian/control index 66dbaff..fea73b2 100644 --- a/debian/control +++ b/debian/control @@ -175,6 +175,5 @@ Description: library for passing menus over DBus - Test lib create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package contains files that are needed to build test suites in applications - or libraries using dbusmenu. - + This package contains files that are needed to build test suites in + applications or libraries using dbusmenu. |