lp:~vibhavp/ubuntu/saucy/urg/merge-from-debian
Created by
Vibhav Pant
and last modified
- Get this branch:
- bzr branch lp:~vibhavp/ubuntu/saucy/urg/merge-from-debian
Only
Vibhav Pant
can upload to this branch. If you are
Vibhav Pant
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Logan Rosen (community): Disapprove
- Ubuntu branches: Pending requested
-
Diff: 52035 lines (+18644/-16574)76 files modified.pc/applied-patches (+0/-3)
.pc/fix-as-needed-build.patch/src/c/urg/Makefile.in (+0/-509)
.pc/fix-ftbfs-with-gcc-4.7/src/cpp/connection/SerialDevice_lin.cpp (+0/-205)
.pc/fix-preprocessor-fdset.patch/src/c/connection/serial_ctrl_lin.c (+0/-277)
ChangeLog (+26/-1)
Makefile.in (+272/-102)
README (+8/-9)
README.txt (+8/-9)
aclocal.m4 (+1720/-970)
config.h.in (+11/-0)
configure (+6789/-8064)
configure.in (+5/-1)
debian/changelog (+15/-1)
debian/control (+1/-1)
debian/patches/0001-add-missing-include-sys-select.h.patch (+20/-0)
debian/patches/fix-ftbfs-with-gcc-4.7 (+0/-14)
debian/patches/series (+1/-1)
include/Makefile.in (+144/-51)
include/c/Makefile.in (+126/-45)
include/c/urg_ctrl.h (+10/-2)
include/c/urg_delay.h (+9/-1)
include/c/urg_ticks.h (+9/-1)
include/cpp/Connection.h (+139/-139)
include/cpp/Lock.h (+1/-1)
include/cpp/LockGuard.h (+1/-1)
include/cpp/Makefile.am (+1/-1)
include/cpp/Makefile.in (+127/-46)
include/cpp/Point.h (+22/-1)
include/cpp/findUrgPorts.h (+34/-0)
include/cpp/isUsingComDriver.h (+30/-30)
ltmain.sh (+2657/-1409)
samples/Makefile.in (+144/-51)
samples/c/Makefile.am (+1/-1)
samples/c/Makefile.in (+113/-53)
samples/c/gd_scan.c (+5/-4)
samples/c/md_scan.c (+4/-5)
samples/cpp/Makefile.in (+112/-52)
samples/cpp_ethernet/Makefile.in (+103/-43)
samples/cpp_ethernet/captureIntensitySample.cpp (+2/-2)
samples/scip_samples/Makefile.in (+111/-51)
src/Makefile.in (+144/-51)
src/c/Makefile.in (+144/-51)
src/c/connection/Makefile.in (+147/-61)
src/c/connection/serial_ctrl_lin.c (+0/-1)
src/c/system/Makefile.in (+147/-61)
src/c/system/urg_delay.h (+9/-1)
src/c/system/urg_ticks.h (+9/-1)
src/c/urg/Makefile.in (+148/-62)
src/c/urg/urg_ctrl.h (+10/-2)
src/cpp/Makefile.in (+144/-51)
src/cpp/common/Makefile.in (+147/-61)
src/cpp/connection/Connection.h (+139/-139)
src/cpp/connection/FindComPorts.cpp (+287/-287)
src/cpp/connection/Makefile.in (+201/-79)
src/cpp/connection/SerialDevice.cpp (+214/-214)
src/cpp/connection/SerialDevice_lin.cpp (+206/-206)
src/cpp/connection/isUsingComDriver.cpp (+102/-102)
src/cpp/connection/isUsingComDriver.h (+30/-30)
src/cpp/connection/sdl/Makefile.in (+147/-61)
src/cpp/coordinate/Coordinate.cpp (+210/-210)
src/cpp/coordinate/Makefile.in (+147/-61)
src/cpp/geometry/Angle.cpp (+1/-2)
src/cpp/geometry/Makefile.in (+147/-61)
src/cpp/geometry/Point.h (+22/-1)
src/cpp/monitor/Makefile.in (+147/-61)
src/cpp/system/Lock.h (+1/-1)
src/cpp/system/LockGuard.h (+1/-1)
src/cpp/system/Makefile.in (+147/-61)
src/cpp/urg/Makefile.am (+1/-1)
src/cpp/urg/Makefile.in (+148/-62)
src/cpp/urg/ScipHandler.cpp (+842/-842)
src/cpp/urg/UrgCtrl.h (+100/-0)
src/cpp/urg/UrgDevice.cpp (+1021/-1020)
src/cpp/urg/UrgDevice.h (+257/-0)
vc8/c/c_urg.vcproj (+134/-202)
vc8/cpp/urg.vcproj (+162/-310)
Related source package recipes
Branch information
- Owner:
- Vibhav Pant
- Status:
- Development
Recent revisions
- 7. By Vibhav Pant
-
* Merge from Debian Unstable. Remaining changes:
- Added missing preprocessor directive for FD_SET(3), fixing FTBFS.
- debian/patches/ fix-as- needed- build.patch:
fix build with ld --as-needed (LP: #803212)
* New upstream release (closes: #701437) - 5. By Julian Taylor
-
* Merge from Debian testing. Remaining changes:
- debian/patches/ fix-as- needed- build.patch:
fix build with ld --as-needed (LP: #803212) - 4. By Julian Taylor
-
* debian/
patches/ fix-as- needed- build.patch:
- fix build with ld --as-needed (LP: #803212) - 3. By Albert Huang
-
* New upstream release (closes: #624987)
* Add debian/watch file
* Bump standards-version to 3.9.2
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/saucy/urg
