lp:~marcelstimberg/ubuntu/precise/scribus/merge-1.4-from-debian
- Get this branch:
- bzr branch lp:~marcelstimberg/ubuntu/precise/scribus/merge-1.4-from-debian
Branch merges
- Felix Geyer (community): Disapprove
- Ubuntu branches: Pending requested
- Diff: 525900 lines
Related bugs
Related blueprints
Branch information
- Owner:
- Marcel Stimberg
- Status:
- Development
Recent revisions
- 31. By Marcel Stimberg
-
* Merge with Debian (LP: #930639); remaining changes:
- Drop build-dep on libpodofo-dev (in universe).
- Version build-dep for python-all-dev and remove hard coded python
dependency.
- Recommend icc-profiles-free.
* New upstream stable release upload into Debian (Closes: #654703).
* Applied the Ubuntu armel patch.
* Removed non-free color swatches from resources.
* debian/control:
- Moved icc-profiles from Recommends to Suggests (Closes: #655885).
- Updated Standards-Version to 3.9.2.
- Updated extended description per lintian warning.
* debian/rules:
- Update mailcap (Closes: #630751). A request for mime.types update has
been sent to the mime-support maintainer.
- Added build-arch and build-indep targets per lintian warning.
* debian/patches:
- top_cmakelists.patch - don't copy extra docs and changelogs.
- scribus_cmakelists. patch - don't copy extra docs and changelogs.
- scribus_cmakelists. patch - don't install the non-free "doc" dir.
- profiles_cmakelists. patch - don't install non-free sRGB profile.
* debian/copyright:
- Converted to the DEP5 machine readable foramt.
- Added licenses for free color swatches.
* New Stable Release - Happy New Year! - 29. By Matthias Klose
-
* Merge with Debian; remaining changes:
- Drop build-dep on libpodofo-dev (in universe).
- Add call to dh_python2 in debian/rules, version build-dep for
python-all-dev, and remove hard coded python dependency.
- Move icc-profiles from Recommends to Suggests since it's in multiverse.
* Recommend icc-profiles-free. - 27. By Scott Kitterman
-
* Update from Debian Unstable
* Add debian/patches/ cups_1_ 5_header. patch to build with cups 1.5
* Add call to dh_python2 in debian/rules, version build-dep for
python-all-dev, and remove hard coded python dependency
* Move icc-profiles from Recommends to Suggests since it's in Multiverse - 26. By Scott Kitterman
-
* Add debian/
patches/ kubuntu_ 06_DSO_ linking. dpatch to fix FTBFS due to
indirect linking
- Explicitly link to libX11 and libDL
- Add CMake module to file DL
- Add explicit build-depens on libx11-dev - 24. By Alexander Sack
-
rebuild rest of main for armel armv7/thumb2 optimization;
UbuntuSpec:mobile- lucid-arm- gcc-v7- thumb2 - 23. By Nathan Handler
-
* Merge from debian unstable, remaining changes (LP: #373494):
- Add patch kubuntu_05_helpbrowser_ ext_urls. dpatch, launch external web
browser - 22. By Nathan Handler
-
* debian/
scribus. desktop:
* Add "Categories" field to make it appear properly in menu (LP: #261615)
* Replace Comment[XX] fields with GenericName[XX] and Name[XX] fields
* Modify to validate with desktop-file-validate
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/precise/scribus