lp:~kamalmostafa/ubuntu/lucid/libtifiles/merge-507741-3
- Get this branch:
- bzr branch lp:~kamalmostafa/ubuntu/lucid/libtifiles/merge-507741-3
Branch merges
- Emmet Hikory: Pending requested
- Ubuntu branches: Pending requested
-
Diff: 16507 lines (+2878/-9162)27 files modifiedChangeLog (+5/-2)
Makefile.in (+21/-38)
README (+1/-1)
aclocal.m4 (+806/-1599)
build/fedora/libtifiles2.spec (+0/-156)
build/mingw/Makefile (+38/-59)
build/mingw/Makefile.in (+7/-28)
build/mingw/tifiles2.rc (+5/-5)
build/msvc/test_tifiles2.dsp (+4/-4)
build/msvc/tifiles2.dsp (+12/-12)
config.h.in (+27/-99)
configure (+1772/-6896)
configure.ac (+5/-5)
debian/changelog (+24/-0)
debian/control (+15/-15)
debian/copyright (+48/-95)
debian/libtifiles-dev.doc-base (+9/-0)
debian/libtifiles-dev.install (+1/-2)
debian/libtifiles2-5.install (+1/-1)
debian/rules (+33/-36)
docs/Makefile.in (+7/-28)
po/fr.po (+1/-1)
po/libtifiles2.pot (+1/-1)
src/Makefile.in (+18/-40)
src/comments.c (+1/-1)
src/tifiles.h (+2/-2)
tests/Makefile.in (+14/-36)
Related bugs
Bug #507741: libtifiles failed to upload: conflicts with libtifiles2 | Medium | Fix Released |
Related blueprints
Branch information
- Owner:
- Kamal Mostafa
- Status:
- Merged
Recent revisions
- 3. By Kamal Mostafa
-
* Merge from Ubuntu libtifiles2 1.1.2-0ubuntu1 (LP: #507741):
- bzr merge-upstream --package libtifiles --version 1.1.2 ../libtifiles2
libtifiles2 (1.1.2-0ubuntu1)
* New upstream version (LP: #181358).
* debian/control:
- Bump libticonv-dev build-dep to 1.1.0.
- Add build-deps on zlib1g-dev, tfdocgen and doc-base.
- Use ${binary:Version} in place of ${Source-Version}.
- Add Homepage field.
- Bump Standards-Version.
* debian/rules:
- Make lintian happy.
* debian/libtifiles2- dev.docs:
- Correctly install the documentation.
* debian/libtifiles2- dev.doc- base:
- Register the documentation with doc-base.
* SO version bump 3 -> 5.
[Chris Coulson <email address hidden>]
- restore binary package name libtifiles2-dev to libtifiles-dev
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/lucid/libtifiles