lp:ubuntu/utopic/cdbs
- Get this branch:
- bzr branch lp:ubuntu/utopic/cdbs
Branch merges
Branch information
Recent revisions
- 132. By Martin Pitt
-
* Merge from Debian unstable. Remaining changes:
- 1/rules/utils.mk. in: add some text before listing missing file to make
it easier to see from the build log. (Debian #565771)
- 1/class/gnome.mk. in: Call dh_translations.
- test/testsuite_functions: Set NO_PKG_MANGLE so that tests do not fail
with pkgstriptranslations installed. (Ubuntu-specific)
- 1/rules/debhelper. mk.in: Call dh_scour.
- debian/control.in: Add scour build and binary dependency (build dep for
test suite). - 131. By Martin Pitt
-
Adjust distutils-{9,10}.sh to not expect files in /usr/shared/
pyshared/
any more. That should be considered an internal implementation detail of
dh_python2, and recently changed in trusty. Instead, check for the path
that python actually looks into: /usr/lib/python* /dist-packages. - 130. By Martin Pitt
-
* Merge from Debian unstable. Remaining Ubuntu changes:
- 1/rules/utils.mk. in: add some text before listing missing file to make
it easier to see from the build log. (Debian #565771)
- 1/class/gnome.mk. in: Call dh_translations.
- test/testsuite_functions: Set NO_PKG_MANGLE so that tests do not fail
with pkgstriptranslations installed. (Ubuntu-specific)
- 1/rules/debhelper. mk.in: Call dh_scour.
- debian/control.in: Add scour build and binary dependency (build dep for
test suite). - 129. By Felix Geyer
-
* Merge from Debian unstable (LP: #1176096). Remaining changes:
- 1/rules/utils.mk. in: add some text before listing missing file to make
it easier to see from the build log.
- 1/class/gnome.mk. in: Call dh_translations.
- test/testsuite_functions: Set NO_PKG_MANGLE so that tests do not fail
with pkgstriptranslations installed. (Ubuntu-specific)
- 1/rules/debhelper. mk.in: Call dh_scour.
- debian/control.in: Add scour build and binary dependency (build dep for
test suite).
- Makefile.in, configure, configure.ac, debian/control.in,
test/Makefile. am, test/Makefile.in: Drop build dependency on
python-support and python-central. Disable distutils pycentral and
pysupport tests if the tools are not present. - 128. By Logan Rosen
-
* Merge from Debian unstable. Remaining changes:
- 1/rules/utils.mk. in: add some text before listing missing file to make
it easier to see from the build log.
- 1/class/gnome.mk. in: Call dh_translations.
- test/testsuite_functions: Set NO_PKG_MANGLE so that tests do not fail
with pkgstriptranslations installed. (Ubuntu-specific)
- 1/rules/debhelper. mk.in: Call dh_scour.
- debian/control.in: Add scour build and binary dependency (build dep for
test suite).
- Makefile.in, configure, configure.ac, debian/control.in,
test/Makefile. am, test/Makefile.in: Drop build dependency on
python-support and python-central. Disable distutils pycentral and
pysupport tests if the tools are not present. - 127. By Logan Rosen
-
* Merge from Debian unstable. Remaining changes:
- 1/rules/utils.mk. in: add some text before listing missing file to make
it easier to see from the build log.
- 1/class/gnome.mk. in: Call dh_translations.
- test/testsuite_functions: Set NO_PKG_MANGLE so that tests do not fail
with pkgstriptranslations installed. (Ubuntu-specific)
- 1/rules/debhelper. mk.in: Call dh_scour. debian/control.in: Add scour
build and binary dependency (build dep for test suite).
- Makefile.in, configure, configure.ac, debian/control.in,
test/Makefile. am, test/Makefile.in: Drop build dependency on
python-support and python-central. Disable distutils pycentral and
pysupport tests if the tools are not present. - 126. By Martin Pitt
-
* Merge from Debian unstable. Remaining Ubuntu changes:
- 1/rules/utils.mk. in: add some text before listing missing file to make
it easier to see from the build log (LP #509249, Debian #565771)
- 1/class/gnome.mk. in: Call dh_translations.
- test/testsuite_functions: Set NO_PKG_MANGLE so that tests do not fail
with pkgstriptranslations installed. (Ubuntu specific)
- 1/rules/debhelper. mk.in: Call dh_scour. debian/control.in: Add scour
build and binary dependency (build dep for test suite).
- Makefile.in, configure, configure.ac, debian/control.in,
test/Makefile. am, test/Makefile.in: Drop build dependency on
python-support and python-central. Disable distutils pycentral and
pysupport tests if the tools are not present (LP #904248). - 125. By Martin Pitt
-
* Merge from Debian testing (LP: #906759). Remaining changes:
- 1/rules/utils.mk. in: add some text before listing missing file to make
it easier to see from the build log (LP #509249, Debian #565771)
- 1/class/gnome.mk. in: Call dh_translations.
- test/testsuite_functions: Set NO_PKG_MANGLE so that tests do not fail
with pkgstriptranslations installed. (Ubuntu specific)
- 1/rules/debhelper. mk.in: Call dh_scour. debian/control.in: Add scour
build and binary dependency (build dep for test suite).
- Makefile.in, configure, configure.ac, debian/control.in,
test/Makefile. am, test/Makefile.in: Drop build dependency on
python-support and python-central. Disable distutils pycentral and
pysupport tests if the tools are not present (LP #904248).
* Drop --prefix support for pysupport, that feature was dropped from
pysupport recently.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/vivid/cdbs