[SCM] jackd2/master: Update changelog, control file and copyright hints.

js at users.alioth.debian.org js at users.alioth.debian.org
Sat Oct 16 09:20:33 UTC 2010


The following commit has been merged in the master branch:
commit 3189bc502412d71ae5946c814c1ed3cba8117fb9
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Oct 16 11:19:37 2010 +0200

    Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index 55ff1ee..03bc3f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
 jackd2 (1.9.6~dfsg-1) UNRELEASED; urgency=low
 
-  * Imported Upstream version 1.9.6~dfsg
+  * New upstream release.
+
+  [ Adrian Knoth ]
   * jackrec is now called jack_rec (like in jackd1)
+  * Make libjack-jackd2-dev provide libjack-dev.
+  * Don't suggest libjackasyn0, nobody really uses it.
+
+  [ Jonas Smedegaard ]
+  * Unfuzz patches.
+  * Update copyright file: Extend some copyright years.
 
- -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Mon, 30 Aug 2010 14:28:06 +0200
+ -- Jonas Smedegaard <dr at jones.dk>  Sat, 16 Oct 2010 11:16:09 +0200
 
 jackd2 (1.9.5~dfsg-19) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 081d682..693c545 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Adrian Knoth <adi at drcomp.erfurt.thur.de>, Jonas Smedegaard <dr at jones.dk>, Reinhard Tartler <siretart at tauware.de>
 Build-Depends: cdbs,
  debhelper (>= 6),
+ dh-buildinfo,
  d-shlibs,
  python,
  libsamplerate-dev,
diff --git a/debian/copyright_hints b/debian/copyright_hints
index d5595ce..9942256 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -11,7 +11,6 @@ Files: ./ChangeLog,
 	./dbus/org.jackaudio.service.in,
 	./dbus/sigsegv.h,
 	./dbus/wscript,
-	./debian/FAQ,
 	./debian/TODO.Debian,
 	./debian/asound.rc,
 	./debian/audio.conf,
@@ -20,27 +19,26 @@ Files: ./ChangeLog,
 	./debian/control,
 	./debian/control.in,
 	./debian/gbp.conf,
-	./debian/jackd-firewire.install,
-	./debian/jackd.README.Debian,
-	./debian/jackd.config,
-	./debian/jackd.docs,
-	./debian/jackd.examples,
-	./debian/jackd.install,
-	./debian/jackd.manpages,
-	./debian/jackd.postinst,
-	./debian/jackd.postrm,
-	./debian/jackd.preinst,
-	./debian/jackd.templates,
-	./debian/libjack-dev.README,
-	./debian/libjack-dev.install,
-	./debian/libjack0.install,
+	./debian/jackd2-firewire.install,
+	./debian/jackd2.config,
+	./debian/jackd2.docs,
+	./debian/jackd2.examples,
+	./debian/jackd2.install,
+	./debian/jackd2.manpages,
+	./debian/jackd2.postinst,
+	./debian/jackd2.postrm,
+	./debian/jackd2.preinst,
+	./debian/jackd2.templates,
+	./debian/libjack-jackd2-0.install,
+	./debian/libjack-jackd2-0.shlibs,
+	./debian/libjack-jackd2-dev.README,
+	./debian/libjack-jackd2-dev.install,
 	./debian/libjack0.lintian-overrides,
 	./debian/libjack0.symbols,
-	./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/hppa-parallel.patch,
+	./debian/patches/hurd.patch,
 	./debian/patches/series,
 	./debian/po/POTFILES.in,
 	./debian/rules,
@@ -99,14 +97,11 @@ Files: ./ChangeLog,
 	./windows/JackRouter/JackRouter.def,
 	./windows/JackRouter/JackRouter.dsp,
 	./windows/JackRouter/JackRouter.dsw,
-	./windows/JackRouter/Psapi.Lib,
 	./windows/JackRouter/README,
 	./windows/JackRouter/profport.h,
-	./windows/JackRouter/psapi.dll,
 	./windows/JackRouter/psapi.h,
 	./windows/JackRouter/resource.h,
 	./windows/README,
-	./windows/Setup/JackRouter.dll,
 	./windows/Setup/JackRouter.ini,
 	./windows/Setup/README,
 	./windows/Setup/jack.ci,
@@ -150,9 +145,7 @@ Files: ./ChangeLog,
 	./windows/libjackmp.dsp,
 	./windows/libjackserver.cbp,
 	./windows/libjackservermp.dsp,
-	./windows/libsamplerate-0.lib,
 	./windows/multiple_metro.cbp,
-	./windows/portaudio/portaudio_x86.lib,
 	./windows/resource.h,
 	./windows/resource_vc.h,
 	./windows/testSynchoServerClient.dsp,
@@ -454,21 +447,6 @@ Copyright: 2001, Paul Davis
 License: LGPL-2.1+
  FIXME
 
-Files: ./windows/jackaudioadapter.rc,
-	./windows/jackd.rc,
-	./windows/jacknetadapter.rc,
-	./windows/jacknetdriver.rc,
-	./windows/jacknetmanager.rc,
-	./windows/jackportaudio.rc,
-	./windows/jackwinmme.rc,
-	./windows/libjack.rc,
-	./windows/libjackserver.rc
-Copyright: 2006-2008
-	2006-2008,
-	Grame 2006-2010\0"
-License: UNKNOWN
- FIXME
-
 Files: ./common/JackPhysicalMidiInput.cpp,
 	./common/JackPhysicalMidiInput.h,
 	./common/JackPhysicalMidiOutput.cpp,
@@ -490,6 +468,7 @@ Files: ./dbus/controller.c,
 	./dbus/controller_internal.h
 Copyright: 2007-2008, Juuso Alasuutari
 	2007-2008, Nedko Arnaudov
+	2007-2008,2010, Nedko Arnaudov
 	2008, Juuso Alasuutari
 	2008, Nedko Arnaudov
 License: GPL
@@ -538,14 +517,6 @@ Copyright: 2003, Jack O'Quin
 License: GPL-2+
  FIXME
 
-Files: ./example-clients/alsa_in.c,
-	./example-clients/alsa_out.c,
-	./example-clients/wait.c,
-	./macosx/libportaudio.a
-Copyright: 
-License: UNKNOWN
- FIXME
-
 Files: ./common/JackMidiDriver.cpp,
 	./dbus/audio_reserve.c,
 	./dbus/audio_reserve.h
@@ -594,10 +565,18 @@ Copyright: 2001, Paul Davis
 License: LGPL-2.1+
  FIXME
 
+Files: ./example-clients/alsa_in.c,
+	./example-clients/alsa_out.c,
+	./example-clients/wait.c
+Copyright: 
+License: UNKNOWN
+ FIXME
+
 Files: ./dbus/jackdbus.c,
 	./dbus/jackdbus.h
 Copyright: 2007-2008, Juuso Alasuutari
 	2007-2008, Nedko Arnaudov
+	2007-2008,2010, Nedko Arnaudov
 	2008, Marc-Olivier Barre
 License: GPL
  FIXME
@@ -744,12 +723,6 @@ Copyright: 2009
 License: UNKNOWN
  FIXME
 
-Files: ./windows/JackRouter/resource.rc,
-	./windows/resource.rc
-Copyright: Grame 2006-2010\0"
-License: UNKNOWN
- FIXME
-
 Files: ./debian/po/ru.po,
 	./debian/po/templates.pot
 Copyright: YEAR THE PACKAGE'S HOLDER
@@ -819,7 +792,7 @@ Files: ./common/Jackdmp.cpp
 Copyright: 2001, Paul Davis
 	2001-2005, Paul Davis and others.\n"
 	2004-2008, Grame
-	2004-2009, Grame.\n"
+	2004-2010, Grame.\n"
 License: GPL-2+
  FIXME
 
@@ -899,18 +872,6 @@ Copyright: 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc
 License: LGPL-2+
  FIXME
 
-Files: ./debian/patches/0000_sync_upstream_VCS.patch
-Copyright: (isascii && isalnum )
-	(isascii && isblank )
-	2001-2003, Paul Davis
-	2002-2007, Werner Schweer and others
-	2004-2008, Grame
-	2006, Grame
-	2009, Grame
-	re_syntax_table[c
-License: LGPL-2.1+
- FIXME
-
 Files: ./macosx/JackMachThread.h
 Copyright: 2001, Paul Davis
 	2002, Apple Computer, Inc.
@@ -952,9 +913,10 @@ Copyright: 2005, - 2008, Jaco Kroon
 License: Public domain
  FIXME
 
-Files: ./windows/jacknetonedriver.rc
-Copyright: 2006-2008,
-	Grame 2006-2009\0"
+Files: ./macosx/libcelt.a
+Copyright:    Pm  z   P        >  D   Pi  m   P«  Ç   P        Œ  —   R 
  ³
   R        ^
   
   Rã  ï   R¼  Æ   R        ç     W        ù  
+	  &   &—  &  &‚  +w    '  (³  )¾  +  )É  a  )Ò  ª  (Û  p      Ô      (ç      ³   m¨  str l°  file l°  line l    #X  “       å        @  st ’  R  fin ’K  ›  fout ’ý  Ñ  *   ’   -  /@  #  i ™   c   -v  p  –&›  &  &„    #4   §ð      ÿ      ™  •  cfg ¦  å  fin ¦K    fout ¦ý  +   02  ¬÷  "st «  "fin «K  "fout «ý  !*   «   1å  i ²    .&›  &  &„    2•         ›      N  i  +¥  š  +°  ã  +¼    +É  u  /   L  )Ú  «   -v  Ð  ¯&›  &  &„     “   ç  !Ú   à   "f á–  !I   â  !*   ã   !‹   ä–  "st æ  p èV  m éV  1á  j î    .j õ   ..(½  (Ç  1  (Ö   .(â       2i         ½!      á  ×  +x  -  +„  ¯   +Ž  \#  +š  ¥#  +¦  Ý#  +²  Q$  *½  v„}*Ç  vˆ}/   Ç  )â  ‰$  3i  l      :!      ø&Y  &P  &G  &>  &5  &,  l      :!      )½  Ã$  )Ç  ý$  /@  ò  )Ö  7%   '  )â  ¹%  -i  à  ø&Y  &P  &G  &>  &5  &,  '  )½  ó%  )Ç  -&  /@  ²  )â  g&  -i    ø&Y  &P  &G  &>  &5  &,  'À  )½  ¡&  )Ç  Û&  /ð     )â  '  -i  @  ø&Y  &P  &G  &>  &5  &,  'p  )½  O'  )Ç  ‰'  /   Ž  )â  Ã'  -i  ð  ø&Y  &P  &G  &>  &5  &,  '   )½  ý'  )Ç  7(  /P  |  )â  q(  -i     ø&Y  &P  &G  &>  &5  &,  'Ð  )½  «(  )Ç  å(  /   j  )â  )  -i  P  ø&Y  &P  &G  &>  &5  &,  '€  )½  Y)  )Ç  “)  /°  ó  )Ö  Í)   '   )â  Ô*  -i  @  ø&Y  &P  &G  &>  &5  &,  'p  )½  +  )Ç  D+  /   U  )Ö  ~+   'à  )â  …,         '   )Ö  á,      'p	  )Ö  è-      'À	  )Ö  ï.      '
+	  /´	  H  17  Ÿ  .Â	  /Í	  €       "r  p  ‰  a   „   >  ¥	  É	  !L    
 License: UNKNOWN
  FIXME
 
@@ -1016,13 +978,3 @@ Copyright: 2009, the jack-audio-connection-kit's holder
 License: UNKNOWN
  FIXME
 
-Files: ./windows/Release/bin/libsamplerate-0.dll
-Copyright: ¸¿b:¸A:¸±Õ9¸9¸ZH9¸”9¸»º8¸Ðs8¸Ó,8¸Äå7¸£ž7¸pW7¸,7¸ÕÈ6¸m6¸ò96¸fò5¸Éª5¸c5¸X5¸…Ó4¸¡‹4¸ªC4¸£û3¸Š³3¸_k3¸##3¸ÕÚ2¸v’2¸J2¸„2¸ñ¸1¸Mp1¸—'1¸ÑÞ0¸ù•0¸M0¸0¸
-License: UNKNOWN
- FIXME
-
-Files: ./windows/Release/bin/portaudio_x86.dll
-Copyright: Ô:T;„;<Ë<=„=´=;>û>7?R?h?p? À  4   ì0r1A2À2ä4ß6§8õ8999L9: :=|=˜=>D>`>º?â?è? Ð  h   ^0Î1õ1ì45+5I5s5g6ì6:7g8—8
-License: UNKNOWN
- FIXME
-

-- 
jackd2 packaging



More information about the pkg-multimedia-commits mailing list