lp:~noskcaj/ubuntu/utopic/gentle/wxwidgets-3.0

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/utopic/gentle at revision 8

Ubuntu branches: Pending requested 2014-08-02

Diff: 5026 lines (+569/-4210)

24 files modified

.pc/applied-patches (+0/-4)
.pc/forward_slashes.patch/MyFrame.cpp (+0/-2790)
.pc/remove-sqlite-dep.patch/Makefile.am (+0/-220)
.pc/remove_clustalw.patch/Makefile.am (+0/-244)
.pc/remove_tinyxml.patch/Makefile.am (+0/-250)
.pc/remove_tinyxml.patch/TXMLfile.cpp (+0/-256)
.pc/remove_tinyxml.patch/TXMLfile.h (+0/-40)
.pc/remove_tinyxml.patch/main.h (+0/-354)
Makefile.am (+31/-1)
MyFrame.cpp (+1/-1)
TXMLfile.cpp (+1/-1)
TXMLfile.h (+1/-1)
debian/changelog (+22/-0)
debian/control (+3/-3)
debian/patches/fix-format-codes.patch (+160/-0)
debian/patches/forward_slashes.patch (+5/-5)
debian/patches/remove_clustalw.patch (+7/-6)
debian/patches/remove_tinyxml.patch (+17/-22)
debian/patches/series (+2/-0)
debian/patches/wx3.0-compat.patch (+311/-0)
debian/rules (+1/-1)
debian/upstream (+0/-7)
debian/upstream/metadata (+7/-0)
main.h (+0/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9. By Jackson Doak on 2014-07-01

Fix typo in d/control

8. By Jackson Doak on 2014-07-01

* Merge from debian. Remaining changes:
  - Drop sqlite0-dev build-dep.
  - Do not pointlessly link with sqlite.

7. By Jackson Doak on 2014-06-05

* Merge from debian. (LP: #1263152) Remaining changes:
  - Drop sqlite0-dev build-dep.
  - Do not pointlessly link with sqlite.

6. By Dimitri John Ledkov on 2013-03-16

* Drop sqlite0-dev build-dep.
* Do not pointlessly link with sqlite.

5. By Andreas Tille on 2012-08-17

* debian/rules:
   - Make sure that binary dlls will be deleted when unpacking
     Closes: #685149
   - Use xz compression for upstream source
   - Drop *.a files from upstream source in get-orig-source target
* Versioned depends from DFSG free clustalw -> package can go to main
* debian/control:
   - fix broken VCS fields
   - Standards-Version: 3.9.4 (no changes needed)
* debian/upstream: Add citation information

4. By Steffen Möller on 2011-06-03

* Updated policy to 3.9.2
* Rebuilt against later versions of mysql and tinyxml libraries

3. By Steffen Möller on 2010-06-15

* Adding build-dependency to libmysqlclient-dev (Closes: #585891)
  and to libsqlite3-dev, libsqlite0-dev
* Changed format to 3.0 (quilt), removed dependency to cdbs and quilt,
  simplified debian/rules accordingly.
* improved get-orig-source to remove directory checked out

2. By Steffen Möller on 2010-06-02

* Reupload in reaction to ftp-masters comments (Closes: #582959)
* removed tinyurl and clustalw from source tree for DFSG compatibility
  - which introduced dependency to quilt
  - and provoked +dfsg suffix to version (not fully correct, yet)
* invoking automake, autoconf during build
  - added those to build-dependencies
  - removed upstream Makefile and Makefile.in from source
* declared 1.0 source format
* removed doc-base lintian warning
* explicitly listing man page as such, now correctly named GENtle.1
* prepared for eventually adding gentle-dbg
* compilation successfullly tested against gcc-4.5
* added help/* to package
* reupload to unstable

1. By Steffen Möller on 2010-06-02

Import upstream version 1.9+cvs20100605+dfsg