lp:~ubuntu-branches/ubuntu/maverick/cuyo/maverick-201007212128
- Get this branch:
- bzr branch lp:~ubuntu-branches/ubuntu/maverick/cuyo/maverick-201007212128
Branch merges
- No reviews requested
-
Diff: 24 lines (+12/-2) (has conflicts)1 file modifiedicons/cuyo.desktop (+12/-2)
Branch information
- Owner:
- Ubuntu branches
- Status:
- Development
Recent revisions
- 11. By Daniel Holbach
-
* Merge from debian unstable (LP: #607106). Remaining changes:
- Don't register MimeType=application/ x-executable in
the .desktop file.
- Remove UTF-8 in the .desktop file
-
* forked uptream version without povray images
* fix build-errors with gcc-4.4 (Closes: 504947)
* switch to source format 3.0 - 9. By Andrew Starr-Bochicchio
-
* Don't regester MimeType=
application/ x-executable in
the .desktop file. (LP: #386438)
* debian/patchs: Move all Ubuntu inline changes into quilt patches.
- gcc4.4.patch, makefile-fixes.patch, and desktop- file-fixes. patch
* debian/control: Build depend on quilt.
* debian/rules: Add quilt magic. Drop deprecated dh_desktop call. - 7. By Cesare Tirabassi
-
* Merge from Debian unstable. Remaining changes:
- Add installation of upstream icons and .desktop file
- Correct upstream .desktop file to be compliant with latest
freedesktop.org specification and Gnome HIG
- Correct upstream Makefile(s) so that icons and desktop files are installed
in the right directory (/usr/share instead of /usr/share/games).
- Modify Maintainer value to match Debian-Maintainer- Field Spec
* Bump debhelper version to 5.0.51, required by dh_icons. - 6. By Cesare Tirabassi
-
* Sync from debian unstable:
- drop ubuntu .desktop file
* Add installation of upstream icons and .desktop file
* Correct upstream .desktop file to be compliant with latest
freedesktop.org specification and Gnome HIG
* Correct upstream Makefile(s) so that icons and desktop files are installed
in the right directory (/usr/share instead of /usr/share/games).
* Modify Maintainer value to match Debian-Maintainer- Field Spec - 4. By Bernhard R. Link <email address hidden>
-
* new version (mostly new levels and code needed for that)
* general clean-up:
- update debian/copyrights
- move icon to /usr/share/pixmaps
- quote all values in debian/menu
- bump standards version
* add versioned build-depend to new qt to catch the right ABI. - 2. By Bernhard Link <email address hidden>
-
* new upstream version with many cleanups (Closes: #132348)
* Added absolute path to icon in menu (Closes: #141624)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/maverick/cuyo