Bug#819977: jessie-pu: package roger-router/1.8.9-2jessie1
On 04.04.2016 16:58, Adam D. Barratt wrote:
>> I'd like to request to upload a bug-fix for the roger-router package
>> to Jessie. This would fix bugs #798471 and #774116.
>>
>> Roger Router is a tool to interact with Fritzbox hardware from AVM.
>> One of the things it can do is to send a fax. This was broken until
>> version 1.8.9-3 because compilation happened as --with-cups-yes
>> assuming this would include cups-support when in fact this disabled
>> a known-good code base for cups-support and replaced it with a
>> known-broken, experimental one. The patches are cherry-picked from
>> 1.8.9-3 and 1.8.9-4.
>
> Please provide a source debdiff of the proposed package as built and
> tested on Jessie, rather than indvidual patches; that's what we'll be
> acking (or otherwise).
Sure.
I thought the individual patches would be easier to inspect and
approve/reject as necessary. Attached is a single debdiff.
diff --git a/debian/README.Debian b/debian/README.Debian
index 13996bd..7a06d73 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,3 +1,5 @@
+= Configuration =
+
configuration help is available from
http://wiki.ubuntuusers.de/FritzBox/Roger_Router
@@ -6,10 +8,17 @@ http://forum.ubuntuusers.de/topic/roger-router-roger/
http://en.tabos.org/installation-prequel
If you want to use the incoming call notification you will have to enable
-it on your fritzbox with: #96*5*
-
-If you want to use the capifax plugin you will have to enable capi-over-tcp
-on your fritzbox with: #96*3*
+it on your fritzbox with: #96*5* If you want to use the capifax plugin
+you will have to enable capi-over-tcp on your fritzbox with: #96*3* Both
+of these settings will be reset to their default value of "off" whenever
+you update the router firmware. Please reenable them as necessary.
Please note, quick reconnect & display external ip in tooltip for Fritz!Box
needs active UPnP support!
+
+= Fax support =
+
+Roger installs a Cups printer. To be able to fax, you either need to use
+roger_cli where you specify all necessary information including the number
+to send to on the command line or you should have Roger GUI running and it
+will prompt you for the receiving Fax number.
diff --git a/debian/changelog b/debian/changelog
index f02d242..fa2aca8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+roger-router (1.8.9-2jessie1) stable; urgency=medium
+
+ backport fixes to fax support from 1.8.9-3 and 1.8.9-4
+
+ * do not build the experimental (!) cups backend.
+ Closes: #774116, closes: #798471.
+
+ Upstream uses a very funny (NOT!) semantics to their make-switches.
+ Who would expect that "--with-cups=yes" actually DISABLES a working
+ cups support?
+
+ * README.Debian:
+ - add some information on how to send a fax
+ - add information what needs to be done after firmware updates
+ certain functions, such as fax support, will be reset to being
+ disabled every time a new firmware is installed
+
+ -- Rolf Leggewie <foss@rolf.leggewie.biz> Mon, 04 Apr 2016 15:14:08 +0200
+
roger-router (1.8.9-2) unstable; urgency=low
* copyright: add copyright information for win32/printer/ghostpdf.ppd
diff --git a/debian/control b/debian/control
index a1df6d4..b660a8f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,7 @@ Uploaders: Jan-Michael Brummer <jan.brummer@tabos.org>
Build-Depends: debhelper (>= 9), dh-autoreconf,
libappindicator3-dev,
libcapi20-dev (>= 1:3.24),
- libcups2-dev,
libebook1.2-dev,
- libgconf2-dev,
libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev,
libgtk-3-dev,
libnotify-dev,
diff --git a/debian/libroutermanager0.symbols b/debian/libroutermanager0.symbols
index 1d29ec1..7e302d9 100644
--- a/debian/libroutermanager0.symbols
+++ b/debian/libroutermanager0.symbols
@@ -81,7 +81,7 @@ libroutermanager.so.0 libroutermanager0 #MINVER#
fax_send@Base 1.8.4
fax_set_log_level@Base 1.8.4
fax_spandsp_workaround@Base 1.8.4
- fax_spooler_new_dir_cb@Base 1.8.4
+#MISSING: 1.8.9-2# fax_spooler_new_dir_cb@Base 1.8.4
fax_transfer@Base 1.8.4
faxophone_close@Base 1.8.4
faxophone_connect@Base 1.8.4
diff --git a/debian/roger-router-cli.install b/debian/roger-router-cli.install
index d8d4c6b..1379a1c 100644
--- a/debian/roger-router-cli.install
+++ b/debian/roger-router-cli.install
@@ -1,8 +1,7 @@
usr/bin/roger_cli
usr/lib/*/routermanager/
-usr/lib/cups/backend/roger-cups
usr/share/man/*/roger_cli*
-usr/share/roger/roger-cups
+usr/share/roger/roger-cups usr/lib/cups/backend/
usr/share/roger/roger-fax.ppd
usr/share/roger/install-fax.sh
diff --git a/debian/rules b/debian/rules
index 95b94a1..c7c5f2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,6 @@ override_dh_auto_configure:
dh_auto_configure -- \
--with-spandsp=6 \
--with-libnotify=yes \
- --with-cups=yes \
--with-secret=yes \
--with-ebook=yes \
--with-gstreamer1=yes \
@@ -32,7 +31,7 @@ override_dh_install:
override_dh_fixperms:
dh_fixperms
- chmod 755 debian/roger-router-cli/usr/share/roger/roger-cups
chmod 755 debian/roger-router-cli/usr/share/roger/install-fax.sh
+ chmod 755 debian/roger-router-cli/usr/lib/cups/backend/roger-cups
chown lp.fax debian/roger-router-cli/var/spool/roger
chmod 2770 debian/roger-router-cli/var/spool/roger
Reply to: