aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merging in Debian fixesTed Gould2010-07-073-9/+20
|\
| * Source-Format: 1.0 for nowEvgeni Golov2010-07-012-1/+3
| |
| * Standards-Version: 3.9.0Evgeni Golov2010-07-012-2/+3
| |
| * Merge Ubuntu.Evgeni Golov2010-07-0132-207/+1269
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preserve Maintainer and Vcs-* fields. From Ubuntu: * New upstream release. * Adding support for menu shortcuts (LP: #591293) * Fixing distcheck of documentation builds * Autogen.sh fix for adding custom prefix (LP: #595565) * Fixing children property name to match spec (LP: #597321) * Merging in Debian branch * debian/control: Switching branch on this branch to be the dbusmenu-team. * debian/rules: Updating shlibs to 0.3.3 for shortcut API additions
| | * Merging lp:~ubuntu-desktop/dbusmenu/ubuntuEvgeni Golov2010-07-0134-283/+1373
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * New upstream release. * Adding support for menu shortcuts (LP: #591293) * Fixing distcheck of documentation builds * Autogen.sh fix for adding custom prefix (LP: #595565) * Fixing children property name to match spec (LP: #597321) * Merging in Debian branch * debian/control: Switching branch on this branch to be the dbusmenu-team. * debian/rules: Updating shlibs to 0.3.3 for shortcut API additions * Merge from Ubuntu. Closes: #586069 * debian/control: - Set Maintainer to pkg-ayatana. - Add myself as Uploader. - Update package descriptions. - Standards-Version: 3.8.4 - Fix Homepage URL. - Update Vcs-* fields. * debian/copyright: - Convert to DEP5 format. - Add Ken and Sebastien, according to changelog. - Add Aurélien Gâteau, according to headers.
| * | | s/GTK/GTK+/Evgeni Golov2010-06-201-5/+5
| | | |
| * | | -doc packages are Arch:allEvgeni Golov2010-06-202-3/+4
| | | |
* | | | Merging with Ubuntu DesktopTed Gould2010-07-061-1/+1
|\ \ \ \
| * \ \ \ releasing version 0.3.4-0ubuntu1Sebastien Bacher2010-07-0137-211/+5074
| |\ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
* | | | releasing version 0.3.4-0ubuntu1~ppa1Ted Gould2010-07-011-2/+2
| | | |
* | | | * New upstream release.Ted Gould2010-07-0124-83/+58
|\ \ \ \ | | | | | | | | | | | | | | | * Fixing up value handling in dbusmenu-dumper
| * \ \ \ Import upstream version 0.3.4Ted Gould2010-07-0133-211/+5029
| |\ \ \ \
| | * | | | 0.3.4Ted Gould2010-07-011-3/+3
| | | | | |
* | | | | | releasing version 0.3.3-0ubuntu2~ppa3Ted Gould2010-06-301-2/+2
| | | | | |
* | | | | | * Upstream mergeTed Gould2010-06-302-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | * Block building submenus on separators (LP: #598620)
| * \ \ \ \ \ Sync to trunkTed Gould2010-06-301-3/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Ensuring that separators can't have submenusTed Gould2010-06-301-0/+1
| | |\ \ \ \ \
| * | | | | | | releasing version 0.3.3-0ubuntu2~ppa2~json3~subs1Ted Gould2010-06-291-2/+2
| | | | | | | |
| * | | | | | | * Upstream mergeTed Gould2010-06-292-0/+8
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | * Block building submenus on separators
| | * | | | | | Block separators from getting new submenusTed Gould2010-06-291-0/+1
| | | | | | | |
* | | | | | | | releasing version 0.3.3-0ubuntu2~ppa2Ted Gould2010-06-301-2/+2
| | | | | | | |
* | | | | | | | * Upstream MergeTed Gould2010-06-3016-141/+4919
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding more through JSON support for testing * Autogen * debian/control, debian/libdbusmenu-jsonloader*install: Adding two binary packages for the jsonloader test library.
| * \ \ \ \ \ \ \ Sync to trunkTed Gould2010-06-301-3/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merging in the added JSON functionality branchTed Gould2010-06-3011-74/+4551
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Flipping argv/c from reviewTed Gould2010-06-301-3/+3
| | | | | | | |
| * | | | | | | releasing version 0.3.3-0ubuntu2~ppa2~json2Ted Gould2010-06-291-2/+2
| | | | | | | |
| * | | | | | | debian/libdbusmenu-jsonloader0 moving to 1 to matchTed Gould2010-06-293-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | library version.
| * | | | | | | releasing version 0.3.3-0ubuntu2~ppa2~json1Ted Gould2010-06-281-2/+2
| | | | | | | |
| * | | | | | | Glib library too.Ted Gould2010-06-282-0/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Adding in the glib lib too.Ted Gould2010-06-281-0/+1
| | | | | | | |
| * | | | | | | TypoTed Gould2010-06-282-2/+2
| |\| | | | | |
| | * | | | | | TypoTed Gould2010-06-281-1/+1
| | | | | | | |
| * | | | | | | Adding in the additional libraries.Ted Gould2010-06-282-2/+4
| |\| | | | | |
| | * | | | | | Adding the need libraries for making the library.Ted Gould2010-06-281-1/+2
| | | | | | | |
| * | | | | | | debian/control, debian/libdbusmenu-jsonloader*install: AddingTed Gould2010-06-284-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | two binary packages for the jsonloader test library.
| * | | | | | | AutogenTed Gould2010-06-283-68/+330
| | | | | | | |
| * | | | | | | * Upstream MergeTed Gould2010-06-2811-74/+4550
|/| | | | | | | | |/ / / / / / | | | | | | | | | | | | | | * Adding more through JSON support for testing
| * | | | | | Getting the depends in order.Ted Gould2010-06-281-1/+1
| | | | | | |
| * | | | | | Forgot copyright headersTed Gould2010-06-284-0/+82
| | | | | | |
| * | | | | | Not sure why this flipped, but whatever.Ted Gould2010-06-281-1/+1
| | | | | | |
| * | | | | | Look at all the values instead of just the first.Ted Gould2010-06-281-1/+1
| | | | | | |
| * | | | | | Better name, distcheck fix, cleanup. Good stuff.Ted Gould2010-06-281-3/+7
| | | | | | |
| * | | | | | Comparing at the end and running under XvfbTed Gould2010-06-281-0/+2
| | | | | | |
| * | | | | | Setting timeout longerTed Gould2010-06-281-1/+1
| | | | | | |
| * | | | | | Redirecting output to a file.Ted Gould2010-06-283-3/+13
| | | | | | |
| * | | | | | Starting to link things together... still not working.Ted Gould2010-06-283-4/+7
| | | | | | |
| * | | | | | Adding a test-client binTed Gould2010-06-283-0/+47
| | | | | | |
| * | | | | | Have the proper case for booleansTed Gould2010-06-281-0/+6
| | | | | | |
| * | | | | | Hmm, bug in dbusmenu-dumper there.Ted Gould2010-06-281-1148/+1148
| | | | | | |
| * | | | | | Adding in a test json file.Ted Gould2010-06-282-1/+4025
| | | | | | |