* New upstream release

   - cups-browsed: Added daemon to browse the Bonjour broadcasts of
     shared remote CUPS printers and automatically add local raw queues
     pointing to them, to resemble the behavior of the former CUPS
     broadcasting/browsing which was dropped in CUPS 1.6. Now remote
     printers appear as local print queues as before, but with the
     standardized Bonjour broadcasting (LP: #1086019, LP: #1061063,
     LP: #1061069).
* debian/control: Added build dependencies on Avahi, needed for the new
  cups-browsed and also a new binary package named cups-browsed.
* debian/cups-browsed.install: New cups-browsed binary package.
* debian/local/cups-browsed.upstart: Upstart configuration file for
  cups-browsed.
* debian/rules: Added everything needed so that the cups-browsed daemon gets
  started automatically.
* debian/cups-filters.install: Include files from /usr/bin.

6 files changed, 75 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 54a6f6559..f2d6656fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+cups-filters (1.0.26-1) UNRELEASED; urgency=low
+
+  * New upstream release
+     - cups-browsed: Added daemon to browse the Bonjour broadcasts of
+       shared remote CUPS printers and automatically add local raw queues
+       pointing to them, to resemble the behavior of the former CUPS
+       broadcasting/browsing which was dropped in CUPS 1.6. Now remote
+       printers appear as local print queues as before, but with the
+       standardized Bonjour broadcasting (LP: #1086019, LP: #1061063,
+       LP: #1061069).
+  * debian/control: Added build dependencies on Avahi, needed for the new
+    cups-browsed and also a new binary package named cups-browsed.
+  * debian/cups-browsed.install: New cups-browsed binary package.
+  * debian/local/cups-browsed.upstart: Upstart configuration file for
+    cups-browsed.
+  * debian/rules: Added everything needed so that the cups-browsed daemon gets
+    started automatically.
+  * debian/cups-filters.install: Include files from /usr/bin.
+
+ -- Till Kamppeter <till.kamppeter@gmail.com>  Thu, 27 Dec 2012 22:53:07 +0100
+
 cups-filters (1.0.25-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 76e7a1e37..362490be9 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,9 @@ Build-Depends:
  libcupsimage2-dev (>= 1.5.2-6~),
  libijs-dev,
  zlib1g-dev,
- libfontconfig1-dev
+ libfontconfig1-dev,
+ libavahi-common-dev,
+ libavahi-client-dev
 Homepage: http://www.openprinting.org/
 Vcs-Bzr: http://bzr.debian.org/pkg-cups/cups-filters/debian-trunk/
 Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-cups/cups-filters/debian-trunk/
@@ -104,6 +106,20 @@ Depends: ${shlibs:Depends},
 Description: OpenPrinting CUPS Filters - Development files for font embed library
  Header files to develop applications using libfontembed.
 
+Package: cups-browsed
+Priority: optional
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, 
+ ${misc:Depends},
+ cups
+Description: OpenPrinting CUPS Filters - cups-browsed
+ This package provides cups-browsed, a daemon which browses the Bonjour
+ broadcasts of shared remote CUPS printers and makes the printers
+ available locally, replacing the CUPS broadcasting/browsing which was
+ dropped in CUPS 1.6.x. This way the old behavior of having the remote
+ printers available automatically is now re-implemented with Bonjour.
+
 #Package: cups-filters-dbg
 #Priority: extra
 #Section: debug
diff --git a/debian/cups-browsed.install b/debian/cups-browsed.install
new file mode 100644
index 000000000..b2b5f9034
--- /dev/null
+++ b/debian/cups-browsed.install
@@ -0,0 +1 @@
+usr/sbin/cups-browsed
diff --git a/debian/cups-filters.install b/debian/cups-filters.install
index 558e994a9..e8498cdd7 100644
--- a/debian/cups-filters.install
+++ b/debian/cups-filters.install
@@ -1,4 +1,5 @@
 etc/fonts/conf.d/99pdftoopvp.conf
+usr/bin/*
 usr/lib/cups/backend/*
 usr/lib/cups/filter/*
 usr/share/cups/*
diff --git a/debian/local/cups-browsed.upstart b/debian/local/cups-browsed.upstart
new file mode 100755
index 000000000..cc987187e
--- /dev/null
+++ b/debian/local/cups-browsed.upstart
@@ -0,0 +1,17 @@
+# cups-browsed - Bonjour remote printer browsing daemon
+
+description     "cups-browsed - Bonjour remote printer browsing daemon"
+author          "Till Kamppeter <till.kamppeter@gmail.com>"
+
+start on (filesystem
+          and (started cups or runlevel [2345]))
+stop on runlevel [016]
+
+respawn
+respawn limit 3 12
+
+pre-start script
+    [ -x /usr/sbin/cups-browsed ]
+end script
+
+exec /usr/sbin/cups-browsed
diff --git a/debian/rules b/debian/rules
index 58f053f38..6a193db89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --mandir=/usr/share/man --enable-static
+# Do not install /etc/rc?.d/* links, on Ubuntu we use Upstart and on Debian
+# we create the links on our own
+# DEB_CONFIGURE_EXTRA_FLAGS += --with-rcdir=/etc/init.d --with-rclevels=
 
 DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(DEB_DESTDIR)
 DEB_INSTALL_CHANGELOGS_ALL := NEWS
@@ -27,8 +30,22 @@ DEB_DH_FIXPERMS_ARGS := -Xusr/lib/cups/backend
 DPKG_GENSYMBOLS_CHECK_LEVEL=4
 export DPKG_GENSYMBOLS_CHECK_LEVEL
 
+ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
+DEB_DH_INSTALLINIT_ARGS := --upstart-only
+else
+DEB_DH_INSTALLINIT_ARGS := -u'start 50 2 3 4 5 . stop 80 1 .'
+endif
+
 cleanbuilddir::
-	[ ! -f Makedefs ] || make distclean
+	[ ! -r Makefile ] || make distclean
+	rm -f debian/*.upstart # master copy is in debian/local
+
+common-install-prehook-impl::
+	# Use upstart script on Ubuntu; we need to hide it away for Debian
+	# builds, as dh_installinit does not have a --sysvinit-only
+	if dpkg-vendor --is ubuntu; then \
+	    cp debian/local/*.upstart debian; \
+	fi
 
 binary-post-install/cups-filters::
 	# Ubuntu-specific stuff