diff -Nru ../v4l2ucp-1.4/debian/changelog debian/changelog --- ../v4l2ucp-1.4/debian/changelog 2009-09-08 11:13:15.000000000 +0200 +++ debian/changelog 2009-09-08 12:07:33.088264131 +0200 @@ -1,3 +1,22 @@ +v4l2ucp (2.0.0-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #426189): + - Move to QT4. + - Move to CMake build system. + * debian/control: + - Change Build-Depends to use the new build system. + - Bump Standards: + + Add ${misc:Depends} macro to the runtime package's Depends field. + * Replace dpatch with quilt: + - Adjust Build-Depends according with new patch system requirements. + - Refresh and convert patches in debian/patches/ to quilt format. + - Add debian/README.source to give help in patching the sources. + * debian/{control,rules}: Switch to debhelper 7. + * debian/v4l2ucp.manpages: Install all manpages. + * debian/docs: Also install the README file. + + -- Alessio Treglia Tue, 08 Sep 2009 12:07:17 +0200 + v4l2ucp (1.4-0ubuntu1) karmic; urgency=low * New upstream release. diff -Nru ../v4l2ucp-1.4/debian/control debian/control --- ../v4l2ucp-1.4/debian/control 2009-09-08 11:13:15.000000000 +0200 +++ debian/control 2009-09-08 11:21:22.404263648 +0200 @@ -2,13 +2,13 @@ Section: x11 Priority: optional Maintainer: Alessio Treglia -Build-Depends: debhelper (>= 7), libqt3-mt-dev, dpatch -Standards-Version: 3.8.2 +Build-Depends: debhelper (>= 7), libqt4-dev, cmake, quilt (>= 0.46-7) +Standards-Version: 3.8.3 Homepage: http://v4l2ucp.sourceforge.net Package: v4l2ucp Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Video for Linux 2 Universal Control Panel V4L2UCP is an universal control panel for Linux Two (V4L2) devices. It reads a description of the controls that the V4L2 device supports from the diff -Nru ../v4l2ucp-1.4/debian/docs debian/docs --- ../v4l2ucp-1.4/debian/docs 1970-01-01 01:00:00.000000000 +0100 +++ debian/docs 2009-09-08 11:50:30.173278767 +0200 @@ -0,0 +1 @@ +README diff -Nru ../v4l2ucp-1.4/debian/patches/00list debian/patches/00list --- ../v4l2ucp-1.4/debian/patches/00list 2009-09-08 11:13:15.000000000 +0200 +++ debian/patches/00list 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -01-video0_as_default diff -Nru ../v4l2ucp-1.4/debian/patches/01-video0_as_default.diff debian/patches/01-video0_as_default.diff --- ../v4l2ucp-1.4/debian/patches/01-video0_as_default.diff 1970-01-01 01:00:00.000000000 +0100 +++ debian/patches/01-video0_as_default.diff 2009-09-08 11:27:40.444264758 +0200 @@ -0,0 +1,37 @@ +Description: Set /dev/video0 as default device. +Vendor: http://www.debian-multimedia.org/pool/main/v/v4l2ucp/ +Index: v4l2ucp-2.0.0/src/v4l2ctrl.c +=================================================================== +--- v4l2ucp-2.0.0.orig/src/v4l2ctrl.c 2009-09-08 11:24:16.785266679 +0200 ++++ v4l2ucp-2.0.0/src/v4l2ctrl.c 2009-09-08 11:25:25.313261295 +0200 +@@ -38,7 +38,7 @@ + printf(" %s -h\n", argv0); + printf("-s to save settings to filename\n"); + printf("-l to load settings from filename\n"); +- printf("-d to specify the device name to use. Defaults to /dev/video.\n"); ++ printf("-d to specify the device name to use. Defaults to /dev/video0.\n"); + printf("-h to print this message.\n"); + } + +@@ -172,7 +172,7 @@ + { + int i, fd, ret; + int load = -1; +- const char *device = "/dev/video"; ++ const char *device = "/dev/video0"; + const char *filename, *mode; + FILE *file; + +Index: v4l2ucp-2.0.0/src/v4l2ucp.cpp +=================================================================== +--- v4l2ucp-2.0.0.orig/src/v4l2ucp.cpp 2009-09-08 11:24:16.905262174 +0200 ++++ v4l2ucp-2.0.0/src/v4l2ucp.cpp 2009-09-08 11:25:45.252264926 +0200 +@@ -35,7 +35,7 @@ + cout << "filename is one or more device files for the "; + cout << "V4L2 devices to control." << endl; + cout << "If no filenames are given, the filename specified in the" << endl; +- cout << "environment variable V4L2UCP_DEV, or /dev/video will be used."; ++ cout << "environment variable V4L2UCP_DEV, or /dev/video0 will be used."; + cout << endl; + cout << "Also accepts standard Qt arguments." << endl; + } diff -Nru ../v4l2ucp-1.4/debian/patches/01-video0_as_default.dpatch debian/patches/01-video0_as_default.dpatch --- ../v4l2ucp-1.4/debian/patches/01-video0_as_default.dpatch 2009-09-08 11:13:15.000000000 +0200 +++ debian/patches/01-video0_as_default.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01-video0_as_default.dpatch by Alessio Treglia -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Set /dev/video0 as default device. The original patch has been taken -## DP: from Christian Marillat's debian packaging (debian-multimedia). - -@DPATCH@ -diff -urNad v4l2ucp-1.3~/v4l2ctrl.c v4l2ucp-1.3/v4l2ctrl.c ---- v4l2ucp-1.3~/v4l2ctrl.c 2009-02-22 23:13:22.000000000 +0100 -+++ v4l2ucp-1.3/v4l2ctrl.c 2009-05-13 22:44:49.142422902 +0200 -@@ -38,7 +38,7 @@ - printf(" %s -h\n", argv0); - printf("-s to save settings to filename\n"); - printf("-l to load settings from filename\n"); -- printf("-d to specify the device name to use. Defaults to /dev/video.\n"); -+ printf("-d to specify the device name to use. Defaults to /dev/video0.\n"); - printf("-h to print this message.\n"); - } - -@@ -172,7 +172,7 @@ - { - int i, fd, ret; - int load = -1; -- const char *device = "/dev/video"; -+ const char *device = "/dev/video0"; - const char *filename, *mode; - FILE *file; - -diff -urNad v4l2ucp-1.3~/v4l2ucp.cpp v4l2ucp-1.3/v4l2ucp.cpp ---- v4l2ucp-1.3~/v4l2ucp.cpp 2005-08-17 00:52:34.000000000 +0200 -+++ v4l2ucp-1.3/v4l2ucp.cpp 2009-05-13 22:42:25.393422334 +0200 -@@ -34,7 +34,7 @@ - cout << "filename is one or more device files for the "; - cout << "V4L2 devices to control." << endl; - cout << "If no filenames are given, the filename specified in the" << endl; -- cout << "environment variable V4L2UCP_DEV, or /dev/video will be used."; -+ cout << "environment variable V4L2UCP_DEV, or /dev/video0 will be used."; - cout << endl; - cout << "Also accepts standard Qt arguments." << endl; - } -@@ -66,7 +66,7 @@ - windowOpened = true; - } - } else { -- w = MainWindow::openFile("/dev/video"); -+ w = MainWindow::openFile("/dev/video0"); - if(w) { - w->show(); - windowOpened = true; diff -Nru ../v4l2ucp-1.4/debian/patches/series debian/patches/series --- ../v4l2ucp-1.4/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ debian/patches/series 2009-09-08 11:23:15.760275442 +0200 @@ -0,0 +1 @@ +01-video0_as_default.diff diff -Nru ../v4l2ucp-1.4/debian/README.source debian/README.source --- ../v4l2ucp-1.4/debian/README.source 1970-01-01 01:00:00.000000000 +0100 +++ debian/README.source 2009-09-08 11:28:21.124441698 +0200 @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. diff -Nru ../v4l2ucp-1.4/debian/rules debian/rules --- ../v4l2ucp-1.4/debian/rules 2009-09-08 11:13:15.000000000 +0200 +++ debian/rules 2009-09-08 11:22:00.836262054 +0200 @@ -1,71 +1,4 @@ #!/usr/bin/make -f -include /usr/share/dpatch/dpatch.make - -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) -CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -else -CROSS= --build $(DEB_BUILD_GNU_TYPE) -endif - - -config.status: patch-stamp configure - dh_testdir -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - ./configure $(CROSS) --prefix=/usr CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" - - -build: build-stamp - -build-stamp: config.status - dh_testdir - - $(MAKE) - - touch $@ - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp - - [ ! -f Makefile ] || $(MAKE) distclean - rm -f config.sub config.guess - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - $(MAKE) DESTDIR=$(CURDIR)/debian/v4l2ucp install - -binary-indep: install - -binary-arch: install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installman debian/manpages/* - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +%: + dh --with quilt $@ diff -Nru ../v4l2ucp-1.4/debian/v4l2ucp.manpages debian/v4l2ucp.manpages --- ../v4l2ucp-1.4/debian/v4l2ucp.manpages 1970-01-01 01:00:00.000000000 +0100 +++ debian/v4l2ucp.manpages 2009-09-08 11:49:21.888278310 +0200 @@ -0,0 +1 @@ +debian/manpages/*