lp://staging/ubuntu/vivid-proposed/isdnutils
- Get this branch:
- bzr branch lp://staging/ubuntu/vivid-proposed/isdnutils
Branch merges
Branch information
Recent revisions
- 34. By Artur Rona
-
* Merge from Debian unstable. Remaining changes:
- debian/capi.conf:
+ Fix typo for fcdsl2 firmware.
- debian/capiutils. maintscript:
+ Handle migrating the blacklist file from
/etc/modprobe. d/blacklist- capiutils. conf to the path used
in Debian, /etc/modprobe.d/capiutils. conf.
- debian/control:
+ Switch Build-Depends libreadline5-dev to libreadline-gplv2-dev
since this package appears to be GPLv2.
- debian/event.d- ttyI0, debian/ event.d- ttyI1,
debian/isdnutils- base.examples, debian/ isdnvboxserver. examples:
+ Add examples scripts, which need to be installed in /etc/*.
+ The two upstart scripts need to be edited.
+ Further improvements and documentation welcome.
- debian/ipppd.maintscri pt:
+ Handle rename of /etc/ppp/ip-down. d/99-ipppd and
/etc/ppp/ ip-up.d/ 00-ipppd to /etc/ppp/ ip-down. d/ipppd
and /etc/ppp/ip-up.d/ ipppd.
- debian/isdnutils- base.cron. d:
+ Drop, it isn't a cronjob example at all
but an inittab example gone astray.
- debian/isdnvboxserver. postinst:
+ Remove dependencies on /etc/inittab.
+ Disable the installation code to modify /etc/inittab.
- debian/patches/ capifax* .patch:
+ Apply patches that were preserved in the 3.0 (quilt)
migration, but were inadvertently not applied.
- debian/patches/ no-imake. patch:
+ Don't build xisdnload/xmonisdn using xmkmf/imake. This patch
was dropped in Debian without explanation. It still applies
and seems to still be a good idea for eventual upstreaming,
since imake is quite obsolete.
* Drop following changes:
- debian/isdnutils- base.maintscrip t:
+ Debian removes already that script instead of renaming,
see Debian Bug 696829. - 33. By Colin Watson
-
[ Sergei Golovan ]
Fixed FTBFS after upgrading tcl/tk-dev packages to 8.6 (patch from
Debian #725000). - 32. By Steve Langasek
-
* Merge from Debian unstable:
- resolves licensing issues with package contents. LP: #511988.
- includes proper upstream fix for ipppd on ARM. LP: #453159.
- resolves isdnutils-base removal failures. LP: #813771.
- fixes capiutils init script to not try to mount obsolete capifs.
LP: #1064347.
* Remaining changes:
- Switch libreadline5-dev to libreadline-gplv2-dev since this package
appears to be GPLv2
- debian/patches/ no-imake. patch: Don't build xisdnload/xmonisdn using
xmkmf/imake. This patch was dropped in Debian without explanation;
it still applies and seems to still be a good idea for eventual
upstreaming, since imake is quite obsolete.
- capi.conf: Fix typo for fcdsl2 firmware. LP: #189132.
- Remove dependencies on /etc/inittab.
- Disable the installation code to modify /etc/inittab.
- isdnutils-base: Add ttyI0 example script, which needs to be installed
in /etc/event.d/ttyI0.
- isdnvboxserver: Add ttyI1 example script, which needs to be installed
in /etc/event.d/ttyI1.
- The two upstart scripts need to be edited.
- Further improvements and documentation welcome.
* Changes included in Debian:
- replace calls to ./MAKEDEV with /sbin/MAKEDEV
- Build-depend on ppp-dev.
- Switch to newer tcl -dev.
- update to newer automake
- debian/rules: use autoreconf to update the autotools in the capi20
directory
- debian/{compat, rules,* .files, .dirs}: Convert to Multi-arch.
- debian/libcapi20- dev.install: Remove .la files (no builds use them).
* Changes included upstream:
- fix for ARM FTBFS.
- fix bashisms in vboxplay.
- debian/patches/ {config_ libdir, toplevel- make}.patch: add CONFIG_LIBDIR
override to upstream build system to support Multi-arch.
* Dropped changes:
- kick dpatch to the curb.
* Handle migrating the blacklist file from
/etc/modprobe. d/blacklist- capiutils. conf to the path used in Debian,
/etc/modprobe. d/capiutils. conf.
* Handle rename of /etc/ppp/ip-down. d/99-ipppd and /etc/ppp/ ip-up.d/ 00-ipppd
to /etc/ppp/ip-down. d/ipppd and /etc/ppp/ ip-up.d/ ipppd
* Handle rename of /etc/init.d/isdnutils to /etc/init. d/isdnutils- base
* Restore standard.tcl to /usr/share/isdnvboxserver/ default; maintainer
scripts must not depend on contents of /usr/share/doc.
* Apply patches that were preserved in the 3.0 (quilt) migration, but
were inadvertently not applied:
- debian/patches/ capifax. additional_ error_codes. patch
- debian/patches/ capifax. 3_1kHz_ audio.patch
* Drop debian/isdnutils- base.cron. d, which isn't a cronjob example at all
but an inittab example gone astray.
* debian/dotconfig*: don't use embedded quotes for paths; this confuses
vbox's Makefiles something fierce, and causes files to be missed from
debian/tmp'/usr/ share/man/ ' at install time.
* Fix isdnlog and ipppd to not ship files used in the postinst under
/usr/share/doc.
* Modernize the upstart examples. - 31. By Steve Langasek
-
* Backport multiarch patch from Debian bug #651475 to the version of
packaging in Ubuntu:[ Kees Cook ]
* debian/{compat, rules,* .files, .dirs}: Convert to Multi-arch.
* debian/patches/ {config_ libdir, toplevel- make}.patch: add CONFIG_LIBDIR
override to upstream build system to support Multi-arch.
* debian/libcapi20- dev.install: Remove .la files (no builds use them). - 29. By Micah Gersten
-
* Switch tcl8.3-dev to tcl8.4-dev since oneiric no longer has tcl8.3-dev
(LP: #836799)
* Switch libreadline5-dev to libreadline-gplv2-dev since this package appears
to be GPLv2
- update debian/control - 26. By Rolf Leggewie
-
replace calls to ./MAKEDEV with /sbin/MAKEDEV (LP: #414537)
That was the easiest fix ever to close 18 bugs ;-) - 25. By Steve Langasek
-
debian/rules: use autoreconf to update the autotools in the capi20
directory, instead of fragile (and wrong) direct calls to
aclocal/automake.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/vivid/isdnutils