[SCM] Debian packaging for jack-audio-connection-kit branch, master.jackd2, updated. debian/1.9.4+svn3842-2-75-g9c05976

js at users.alioth.debian.org js at users.alioth.debian.org
Sat Apr 3 20:34:16 UTC 2010


The following commit has been merged in the master.jackd2 branch:
commit 9c05976ba6ab32e66be57ac24ff700b0a531c462
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Apr 3 22:33:57 2010 +0200

    Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index bf0baa8..0cd7467 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jack-audio-connection-kit (1.9.5+svn3977-1) UNRELEASED; urgency=low
+jack-audio-connection-kit (1.9.5+svn3977-1_but_requires_repackaging!) UNRELEASED; urgency=low
 
   [ Adrian Knoth ]
   * New upstream version 1.9.5
@@ -13,14 +13,47 @@ jack-audio-connection-kit (1.9.5+svn3977-1) UNRELEASED; urgency=low
   * Add myself as uploader.
   * Drop old Vcs-Bzr stanza from control.
   * Fix tighten libasound-dev build-dependency to at least 1.0.18.
-  * Implement DEB_MAINTAINER_MODE to semi-autoupdate control file (and
-    more in the future).
-  * Fix build-depend on patchutils, thanks to CDBS dependency resolver.
-  * Lower debhelper build-dependency to 6, to ease backporting (we do
-    not rely on any new features anyway). Fix bump debhelper compat to
-    match build-dependency.
-
- -- Jonas Smedegaard <dr at jones.dk>  Tue, 16 Feb 2010 07:29:48 +0100
+  * Lower debhelper build-dependency to 6, to ease backporting (we need
+    no newer features anyway).
+    Fix bump debhelper compat level to match build-dependency.
+  * Update patch handling:
+    + Use source format "3.0 (quilt)" (not CDBS simple-patchsys.mk).
+    + Unfuzz.
+    + Refresh, compacting with quilt --no-timestamps --no-index -pab.
+    + Rename with leading number, and add README to source documenting
+      micro naming scheme.
+    + Add DEP3 header to patch 1001 "earlier connect.diff").
+  * Update watch file:
+    + Track jackd2 releases.
+    + Add usage hint.
+  * Fix non-unix line-ends in PO files.
+  * Tidy build routines:
+    + Drop install hints automagically handled by CDBS already.
+    + Separate configure from build in rules file.
+    + Avoid unneeded ifeq construct in rules file.
+    + Use single space in multi-line fields of control file.
+    + Use 'waf distclean', and drop custom clean rule.
+    + Fix avoid remove man subdir (clash with dpkg unpatch routine).
+  * Drop file user-howto (7 years old, newest version 4 years old, and
+    is apparently included in jackd.1 manpage already).
+  * Use d-shlibs to resolve development library dependencies.
+    Build-depend on d-shlibs.
+  * Stop build-depending on scons (upstream use waf now).
+  * Use system waf. Build-depend on waf.
+      - Strip binary waf file (too risky to blindly invoke, and too much
+        hassle unpacking and inspecting properly).
+    Stop build-depending on python (only used by local waf now dropped).
+  * Recursively-expand a variable and avoid a linewrap in rules file.
+  * Enable waf verbose mode (easing porter work).
+  * Setup get-orig-source routine:
+    + include cdbs snippet upstream-tarball (suppressing its build-
+      dependencies unneeded for normal builds, to ease backporting).
+    + Repackage upstream source:
+      - Strip shared libraries.
+      - Strip unneeded sources copyright-protected without licence.
+  * Rewrite debian/copyright using draft DEP5 rev. 135 format.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Sat, 03 Apr 2010 18:25:40 +0200
 
 jack-audio-connection-kit (1.9.4+svn3842-2) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 5bfb2d5..02351d4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,22 +3,23 @@ Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Adrian Knoth <adi at drcomp.erfurt.thur.de>, Jonas Smedegaard <dr at jones.dk>
-Build-Depends: cdbs, debhelper (>= 6), patchutils,
-                python,
-                doxygen,
-                libsamplerate-dev,
-                libasound2-dev (>= 1.0.18) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-                libdbus-1-dev,
-                libexpat1-dev,
-                libsndfile1-dev,
-                libncurses-dev,
-                libreadline-dev,
-                libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-                libffado-dev (>= 2.0.0) [amd64 i386 powerpc],
-                g++-multilib [amd64],
-                po-debconf,
-                libcelt-dev (>= 0.7.0),
-                scons
+Build-Depends: cdbs,
+ debhelper (>= 6),
+ waf,
+ d-shlibs,
+ doxygen,
+ libsamplerate-dev,
+ libasound2-dev (>= 1.0.18) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libdbus-1-dev,
+ libexpat1-dev,
+ libsndfile1-dev,
+ libncurses-dev,
+ libreadline-dev,
+ libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libffado-dev (>= 2.0.0) [amd64 i386 powerpc],
+ g++-multilib [amd64],
+ po-debconf,
+ libcelt-dev (>= 0.7.0)
 Standards-Version: 3.8.4
 DM-Upload-Allowed: yes
 Homepage: http://jackaudio.org/
@@ -28,17 +29,17 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/jack-audio-connection-kit.g
 Package: jackd
 Architecture: any
 Depends: ${shlibs:Depends},
-	 ${misc:Depends},
-	 coreutils (>= 4.0),
-	 python,
-	 debconf | debconf-2.0,
-	 libjack0 (= ${binary:Version})
+ ${misc:Depends},
+ coreutils (>= 4.0),
+ python,
+ debconf | debconf-2.0,
+ libjack0 (= ${binary:Version})
 Recommends: qjackctl,
-	    libpam-modules,
-	    jackd-firewire [amd64 i386 powerpc]
+ libpam-modules,
+ jackd-firewire [amd64 i386 powerpc]
 Suggests: jack-tools,
-	  meterbridge,
-	  libjackasyn0
+ meterbridge,
+ libjackasyn0
 Description: JACK Audio Connection Kit (server and example clients)
  JACK is a low-latency sound server, allowing multiple applications to
  connect to one audio device, and to share audio between themselves.
@@ -49,9 +50,9 @@ Package: libjack0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+ ${misc:Depends}
 Conflicts: jackd (>> ${binary:Version}),
-           jackd (<< ${binary:Version})
+ jackd (<< ${binary:Version})
 Suggests: jackd (= ${binary:Version})
 Description: JACK Audio Connection Kit (libraries)
  JACK is a low-latency sound server, allowing multiple applications to
@@ -62,8 +63,8 @@ Description: JACK Audio Connection Kit (libraries)
 Package: jackd-firewire
 Architecture: amd64 i386 powerpc
 Depends: ${shlibs:Depends},
-	 ${misc:Depends},
-	 jackd (= ${binary:Version})
+ ${misc:Depends},
+ jackd (= ${binary:Version})
 Description: JACK Audio Connection Kit (FFADO and FreeBoB backends)
  JACK is a low-latency sound server, allowing multiple applications to
  connect to one audio device, and to share audio between themselves.
@@ -74,11 +75,11 @@ Package: libjack-dev
 Architecture: any
 Section: libdevel
 Depends: libjack0 (= ${binary:Version}), 
-    	 ${asound:Depends},
-	     ${misc:Depends},
-         ${shlibs:Depends},
-         pkg-config,
-         libdbus-1-dev
+ ${asound:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends},
+ pkg-config,
+ libdbus-1-dev
 Conflicts: libjack0.100.0-dev (<< 0.102.20-2)
 Replaces: libjack0.71.2-0 (<< 0.75.0-1)
 Description: JACK Audio Connection Kit (development files)
diff --git a/debian/copyright_hints b/debian/copyright_hints
index ab64e69..f068a73 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -37,6 +37,7 @@ Files: ./ChangeLog,
 	./debian/patches/0001_jackrec-rename.patch,
 	./debian/patches/0002_manpages.patch,
 	./debian/patches/1001_connect.patch,
+	./debian/patches/1002_waf_wscript_update.patch,
 	./debian/patches/README,
 	./debian/patches/series,
 	./debian/po/POTFILES.in,

-- 
Debian packaging for jack-audio-connection-kit



More information about the pkg-multimedia-commits mailing list