lp:~logan/ubuntu/quantal/tilp2/new-upstream
- Get this branch:
- bzr branch lp:~logan/ubuntu/quantal/tilp2/new-upstream
Branch merges
- Daniel Holbach (community): Approve
- Ubuntu branches: Pending requested
-
Diff: 105836 lines (+45804/-41162)214 files modifiedABOUT-NLS (+568/-601)
AUTHORS (+18/-15)
COPYING (+20/-21)
ChangeLog (+61/-6)
INSTALL (+184/-48)
Makefile.am (+4/-2)
Makefile.in (+204/-88)
README (+11/-6)
README.freebsd (+6/-4)
README.linux (+22/-12)
README.win32 (+37/-29)
RELEASE (+28/-19)
acinclude.m4 (+2/-2)
aclocal.m4 (+294/-8998)
build/InnoSetup/0001-WIP-Saving-first-semi-working-version-of-downloading.patch (+454/-0)
build/InnoSetup/Output/README (+153/-0)
build/InnoSetup/Output/README.win32 (+112/-0)
build/InnoSetup/Output/RELEASE (+78/-0)
build/InnoSetup/TiLP-SDK/Release.txt (+1/-1)
build/InnoSetup/it_download_.iss (+318/-0)
build/InnoSetup/tilp2.iss (+16/-16)
build/InnoSetup/tilp2_cross.iss (+861/-0)
build/InnoSetup/wget/d_and_i.bat (+0/-5)
build/InnoSetup/wget/source.txt (+0/-2)
build/Makefile.in (+126/-43)
build/mingw/Makefile (+98/-59)
build/mingw/Makefile.in (+57/-18)
build/mingw/tilp.rc (+18/-16)
build/mingw/tilp.rc~ (+58/-0)
build/msvc/TiLP2.sln (+81/-0)
build/msvc/dirent.h (+2/-2)
build/msvc/tilp2.vcproj (+73/-0)
build/msvc/tilp2_console.vcproj (+1272/-0)
build/msvc/tilp2_win32.sln (+32/-0)
build/msvc/tilp2_win32.vcproj (+1280/-0)
build/msvc/unistd.h (+2/-2)
builder/Makefile.am (+3/-0)
builder/Makefile.in (+534/-0)
builder/README (+1/-0)
compile (+11/-10)
config.guess (+250/-249)
config.h.in (+11/-283)
config.rpath (+77/-25)
config.sub (+204/-66)
configure (+14092/-21817)
configure.ac (+11/-5)
debian/changelog (+8/-0)
debian/control (+1/-1)
debian/rules (+3/-1)
depcomp (+136/-36)
desktop/Makefile.am (+14/-0)
desktop/Makefile.in (+564/-0)
desktop/README.txt (+5/-0)
desktop/kde/README (+0/-12)
desktop/kde/tilp.desktop (+0/-15)
desktop/kde/x-tilp-app_var.desktop (+0/-8)
desktop/kde/x-tilp-application.desktop (+0/-8)
desktop/kde/x-tilp-asm_program.desktop (+0/-8)
desktop/kde/x-tilp-backup.desktop (+0/-8)
desktop/kde/x-tilp-certificate.desktop (+0/-8)
desktop/kde/x-tilp-complex.desktop (+0/-8)
desktop/kde/x-tilp-constant.desktop (+0/-8)
desktop/kde/x-tilp-data.desktop (+0/-8)
desktop/kde/x-tilp-equation.desktop (+0/-8)
desktop/kde/x-tilp-expression.desktop (+0/-8)
desktop/kde/x-tilp-figure.desktop (+0/-8)
desktop/kde/x-tilp-function.desktop (+0/-8)
desktop/kde/x-tilp-gdb.desktop (+0/-8)
desktop/kde/x-tilp-group.desktop (+0/-8)
desktop/kde/x-tilp-list.desktop (+0/-8)
desktop/kde/x-tilp-macro.desktop (+0/-8)
desktop/kde/x-tilp-matrix.desktop (+0/-8)
desktop/kde/x-tilp-os_upgrade.desktop (+0/-8)
desktop/kde/x-tilp-picture.desktop (+0/-8)
desktop/kde/x-tilp-program.desktop (+0/-8)
desktop/kde/x-tilp-range.desktop (+0/-8)
desktop/kde/x-tilp-real.desktop (+0/-8)
desktop/kde/x-tilp-string.desktop (+0/-8)
desktop/kde/x-tilp-table_setup.desktop (+0/-8)
desktop/kde/x-tilp-text.desktop (+0/-8)
desktop/kde/x-tilp-tigroup.desktop (+0/-8)
desktop/kde/x-tilp-vector.desktop (+0/-8)
desktop/kde/x-tilp-window_setup.desktop (+0/-8)
desktop/kde/x-tilp-y_var.desktop (+0/-8)
desktop/kde/x-tilp-zip.desktop (+0/-8)
desktop/kde/x-tilp-zoom.desktop (+0/-8)
desktop/tilp.desktop.in (+15/-0)
desktop/tilp.xml (+246/-0)
glade/Makefile.am (+1/-1)
glade/Makefile.in (+87/-31)
glade/README (+1/-0)
glade/action-2.glade (+1/-1)
glade/action-2.str (+1/-1)
glade/clist_rbm-2.glade (+142/-285)
glade/ctree_rbm-2.glade (+94/-112)
glade/device-2.glade (+1/-1)
glade/device-2.str (+1/-1)
glade/screenopts-2.glade (+1/-1)
glade/screenopts-2.str (+1/-1)
glade/screenshot-2.glade (+200/-318)
glade/tilp-2.glade (+861/-964)
glade/tilp-2.str (+1/-1)
help/FAQ.html (+51/-55)
help/Makefile.in (+85/-29)
help/chapter07.html (+2/-2)
icons/Makefile.in (+85/-29)
install-sh (+369/-172)
ltmain.sh (+6682/-3591)
m4/gettext.m4 (+381/-0)
m4/iconv.m4 (+180/-0)
m4/intlmacosx.m4 (+51/-0)
m4/lib-ld.m4 (+110/-0)
m4/lib-link.m4 (+709/-0)
m4/lib-prefix.m4 (+185/-0)
m4/libtool.m4 (+8001/-0)
m4/ltoptions.m4 (+384/-0)
m4/ltsugar.m4 (+123/-0)
m4/ltversion.m4 (+23/-0)
m4/lt~obsolete.m4 (+98/-0)
m4/nls.m4 (+31/-0)
m4/po.m4 (+449/-0)
m4/progtest.m4 (+92/-0)
man/Makefile.am (+5/-5)
man/Makefile.in (+140/-78)
man/Manpage.txt (+29/-23)
man/cleaner.c (+56/-69)
man/dos2unix.c (+0/-136)
man/tilp.1 (+1/-1)
missing (+60/-44)
mkinstalldirs (+162/-0)
pixmaps/Makefile.in (+85/-29)
pixmaps/icon.xpm (+0/-978)
pixmaps/tilp.xpm (+978/-0)
po/ChangeLog (+0/-11)
po/Makefile.in.in (+34/-8)
po/POTFILES.in (+1/-0)
po/fr.po (+226/-217)
po/tilp2.pot (+209/-193)
src/Makefile.in (+202/-143)
src/about.c (+6/-5)
src/action.c (+11/-11)
src/bookmark.c (+5/-5)
src/clist.c (+21/-21)
src/clist.h (+3/-3)
src/clist_rbm.c (+10/-12)
src/clist_rbm.h (+3/-3)
src/clock.c (+4/-4)
src/ctree.c (+21/-9)
src/ctree.h (+3/-3)
src/ctree_rbm.c (+15/-15)
src/ctree_rbm.h (+2/-2)
src/dboxes.c (+8/-8)
src/device.c (+17/-17)
src/dnd.c (+54/-52)
src/fileprop.c (+2/-2)
src/filesel.c (+9/-11)
src/filesel.h (+3/-3)
src/gstruct.h (+18/-3)
src/gtk_gif.c (+2/-2)
src/gtk_update.c (+12/-12)
src/gtk_update.h (+3/-3)
src/intl.h (+3/-3)
src/labels.c (+6/-6)
src/labels.h (+3/-3)
src/main.c (+16/-5)
src/manpage.c (+3/-3)
src/options.c (+3/-3)
src/pbars.c (+3/-3)
src/pbars.h (+3/-3)
src/release.c (+3/-3)
src/screenshot.c (+32/-8)
src/screenshot.h (+0/-1)
src/scroptions.c (+3/-3)
src/splash.c (+3/-3)
src/tilibs.h (+3/-3)
src/tilp.c (+124/-69)
src/tilp.h (+17/-46)
src/tilp_calcs.c (+70/-55)
src/tilp_calcs.h (+3/-3)
src/tilp_cmdline.c (+51/-53)
src/tilp_cmdline.h (+2/-2)
src/tilp_config.c (+111/-40)
src/tilp_config.h (+2/-2)
src/tilp_core.h (+3/-3)
src/tilp_defs.h (+3/-3)
src/tilp_device.c (+13/-3)
src/tilp_device.h (+2/-2)
src/tilp_error.c (+3/-4)
src/tilp_files.c (+6/-8)
src/tilp_files.h (+2/-2)
src/tilp_gif.c (+3/-3)
src/tilp_gif.h (+3/-3)
src/tilp_log.c (+2/-2)
src/tilp_log.h (+2/-2)
src/tilp_main.c (+4/-4)
src/tilp_main.h (+2/-2)
src/tilp_misc.c (+3/-215)
src/tilp_misc.h (+2/-8)
src/tilp_paths.c (+11/-4)
src/tilp_paths.h (+3/-3)
src/tilp_screen.c (+33/-3)
src/tilp_screen.h (+6/-5)
src/tilp_slct.c (+9/-13)
src/tilp_slct.h (+2/-2)
src/tilp_struct.h (+3/-3)
src/tilp_update.c (+3/-3)
src/tilp_vars.c (+5/-5)
src/tilp_vars.h (+2/-2)
src/tilp_version.h (+4/-4)
src/toolbar.c (+16/-8)
src/toolbar.h (+3/-3)
wicons/Makefile.am (+7/-0)
wicons/Makefile.in (+536/-0)
wicons/README (+3/-0)
Branch information
- Owner:
- Logan Rosen
- Status:
- Merged
Recent revisions
- 6. By Scott Kitterman
-
* Switch build-depends names back to Debian names now that we are in sync
* Temporarily bump libticalcs-dev build-dep version to 1.1.3+dfsg1-1ubuntu2
to avoid misbuilds during library transition (can go back to 1.1.0 in the
next upload) - 5. By Chris Coulson
-
* Sync with Debian unstable, remaining changes:
- debian/control:
+ Don't create tilp transitional package - we still ship the old
tilp in Ubuntu, in a separate package.
+ Update build-dependencies to match Ubuntu package names.
+ Depend on www-browser for the help.
- debian/rules: Don't call dh_gencontrol for non-existant tilp
package.
* Update to 1.13 (LP: #181358):
- debian/control: Bump libticables2-dev build-dep to 1.3.0. - 4. By Fabrice Coutadeur
-
* debian/control:
- Dropped build dependency on tidev-modules-source and sysutils
(LP: #360337)
- Dropped non used dpatch build dependency
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/quantal/tilp2