lp://qastaging/~matttbe/ubuntu/quantal/rss-glx/lp1017780
- Get this branch:
- bzr branch lp://qastaging/~matttbe/ubuntu/quantal/rss-glx/lp1017780
Branch merges
- Daniel Holbach (community): Approve
-
Diff: 26 lines (+8/-1)2 files modifieddebian/changelog (+7/-0)
debian/rules (+1/-1)
Related bugs
Related blueprints
Branch information
- Owner:
- Matthieu Baerts
- Status:
- Development
Recent revisions
- 32. By Fabrice Coutadeur
-
* Merge from Debian unstable. Remaining changes:
- Added an apport package hook
- Changed libgl1-mesa-swx11- dev to libgl1-mesa-dev in Build-Depends - 31. By Fabrice Coutadeur
-
* Merge from Debian unstable (LP: #604945). Remaining changes:
- Added an apport package hook
- Changed libgl1-mesa-swx11- dev to libgl1-mesa-dev in Build-Depends
* Dropped changes:
- Drop dependency on openal. As the package is in universe now, it's not
mandatory anymore
- src/skyrocket.{cpp,xml} : Disable sound by default. Same reason.
- Add --disable-sound configure flag to debian/rules. Same reason. - 30. By Angel Abad
-
debian/control: Changed libgl1-
mesa-swx11- dev to libgl1-mesa-dev in
Build-Depends, fix FTBFS (LP:#538722) - 27. By Steve Langasek
-
* Merge from debian unstable, remaining changes:
- Drop dependency on openal. It is not enabled by default anyway, and
allows openal to migrate to universe.
- src/skyrocket.{cpp,xml} : Disable sound by default.
- Add --disable-sound configure flag to debian/rules, as we don't keep
the dependencies on openal nor freeglut (both universe packages).
* Dropped changes, merged upstream:
- other_src/Makefile. am: fix the upstream build rules to actually use
the ImageMagick CFLAGS returned by pkg-config.
- Move the unconditional ImageMagick check up in configure.in so that
our first PKG_CHECK_MODULES() call isn't hidden behind a shell
conditional. - 26. By Steve Langasek
-
* Merge from debian unstable, remaining changes:
- Drop dependency on openal. It is not enabled by default anyway, and
allows openal to migrate to universe.
- reallyslick/cpp_src/ skyrocket. {cpp,xml} : Disable sound by default.
- other_src/Makefile. am: fix the upstream build rules to actually use
the ImageMagick CFLAGS returned by pkg-config.
- Add --disable-sound configure flag to debian/rules, as we don't keep
the dependencies on openal nor freeglut (both universe packages).
- Call ./autogen.sh and build-depend on automake/autoconf, since we're
modifying other_src/Makefile. am above.
* Dropped changes, superseded in Debian package:
- debian/control: build-depend on libmagickwand-dev instead of
libmagick9-dev.
* Instead of hard-coding a define of PKG_CONFIG, move the unconditional
ImageMagick check up in configure.in so that our first PKG_CHECK_MODULES()
call isn't hidden behind a shell conditional. - 25. By Steve Langasek
-
* debian/control: build-depend on libmagickwand-dev instead of
libmagick9-dev.
* other_src/Makefile. am: fix the upstream build rules to actually use
the ImageMagick CFLAGS returned by pkg-config.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/ubuntu/quantal/rss-glx