[Pkg-oss4-maintainers] updated oss4

Thorsten Glaser t.glaser at tarent.de
Mon Feb 21 10:39:39 UTC 2011 

Hi,

I’ve updated your oss4 source package from Debian unstable,
patched it somewhat, built (with a newer debhelper and a
modified dkms to include dh_dkms) on Kubuntu Hardy, which
we unfortunately, currently, still have on our workstations,
and it works.

Please find the attached debdiff. You might want to integrate
the changes.

bye,
//mirabilos • tg at d.o
-- 
CeBIT 2011 – tarent ist dabei. Besuchen Sie uns auf der CeBIT 2011 und
lernen Sie unser neues Identity- and Accessmanagement OSIAM kennen. Wir
freuen uns auf Ihren Besuch in Halle 2, Stand D40/1. Sie wünschen ein
persönliches Gespräch? – Wenden Sie sich an sales at tarent.de.

tarent Gesellschaft für Softwareentwicklung und IT-Beratung mbH
Heilsbachstraße 24, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 52675-93 • Fax: +49 228 52675-25
HRB AG Bonn 5168 • USt-ID (VAT): DE122264941
Geschäftsführer: Boris Esser, Elmar Geese
-------------- next part --------------
diff -Nru oss4-4.2-build2003/debian/changelog oss4-4.2-build2004/debian/changelog
--- oss4-4.2-build2003/debian/changelog	2011-02-21 11:35:21.000000000 +0100
+++ oss4-4.2-build2004/debian/changelog	2011-02-21 11:35:21.000000000 +0100
@@ -1,3 +1,12 @@
+oss4 (4.2-build2004-0tarent2) hardy; urgency=low
+
+  * Put Debian packaging of oss4 with newer upstream version on hardy.
+  * Refresh patches.
+  * oss4-base Provides/Conflicts/Replaces: oss-linux (commercial build).
+  * Try /lib/modules/${kernelver}/build/ if …/source/ doesn’t exist.
+
+ -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 21 Feb 2011 11:31:07 +0100
+
 oss4 (4.2-build2003-1) unstable; urgency=high
 
   * New upstream release.
diff -Nru oss4-4.2-build2003/debian/control oss4-4.2-build2004/debian/control
--- oss4-4.2-build2003/debian/control	2011-02-21 11:35:21.000000000 +0100
+++ oss4-4.2-build2004/debian/control	2011-02-21 11:35:21.000000000 +0100
@@ -11,6 +11,9 @@
 Depends: linux-sound-base, ${shlibs:Depends}, ${misc:Depends}
 Recommends: pm-utils
 Suggests: oss4-modules
+Provides: oss-linux
+Conflicts: oss-linux
+Replaces: oss-linux
 Description: Open Sound System - base package
  Open Sound System (OSS) is an attempt in unifying
  the digital audio architecture for UNIX.
diff -Nru oss4-4.2-build2003/debian/oss4-dkms.dkms.in oss4-4.2-build2004/debian/oss4-dkms.dkms.in
--- oss4-4.2-build2003/debian/oss4-dkms.dkms.in	2011-02-21 11:35:21.000000000 +0100
+++ oss4-4.2-build2004/debian/oss4-dkms.dkms.in	2011-02-21 11:35:21.000000000 +0100
@@ -97,7 +97,9 @@
 DEST_MODULE_LOCATION[30]="/updates/dkms/"
 DEST_MODULE_LOCATION[31]="/updates/dkms/"
 AUTOINSTALL=yes
-MAKE[0]="cp /lib/modules/${kernelver}/source/include/linux/limits.h ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core && \
+MAKE[0]="p=/lib/modules/${kernelver}/source/include/linux/limits.h; \
+         test -e \${p} || p=/lib/modules/${kernelver}/build/include/linux/limits.h; \
+         cp \${p} ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core && \
          make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core modules && \
          make -C ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/drivers osscore_symbols.inc && \
          make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/drivers modules"
diff -Nru oss4-4.2-build2003/debian/patches/arch_without_mregparm.patch oss4-4.2-build2004/debian/patches/arch_without_mregparm.patch
--- oss4-4.2-build2003/debian/patches/arch_without_mregparm.patch	2011-02-21 11:35:21.000000000 +0100
+++ oss4-4.2-build2004/debian/patches/arch_without_mregparm.patch	2011-02-21 11:35:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: oss-v4.2-build2000-src-gpl/setup/srcconf_linux.inc
+Index: oss-build/setup/srcconf_linux.inc
 ===================================================================
---- oss-v4.2-build2000-src-gpl.orig/setup/srcconf_linux.inc	2009-11-27 19:05:11.000000000 -0600
-+++ oss-v4.2-build2000-src-gpl/setup/srcconf_linux.inc	2009-11-27 19:05:41.000000000 -0600
+--- oss-build.orig/setup/srcconf_linux.inc	2011-01-05 02:33:08.000000000 +0100
++++ oss-build/setup/srcconf_linux.inc	2011-02-21 10:34:01.000000000 +0100
 @@ -53,7 +53,9 @@
    fprintf (f,
  	     "CFLAGS += -O3 -fno-common  -mcmodel=kernel -mno-red-zone  -fno-asynchronous-unwind-tables -ffreestanding%s\n", fnsp);
diff -Nru oss4-4.2-build2003/debian/patches/cmd.patch oss4-4.2-build2004/debian/patches/cmd.patch
--- oss4-4.2-build2003/debian/patches/cmd.patch	2011-02-21 11:35:21.000000000 +0100
+++ oss4-4.2-build2004/debian/patches/cmd.patch	2011-02-21 11:35:21.000000000 +0100
@@ -1,8 +1,8 @@
-Index: /oss-build/cmd/ossdevlinks/ossdevlinks.c
+Index: oss-build/cmd/ossdevlinks/ossdevlinks.c
 ===================================================================
---- oss-build/cmd/ossdevlinks/ossdevlinks.c	2009-11-26 23:39:42.000000000 -0600
-+++ oss-build/cmd/ossdevlinks/ossdevlinks.c	2009-11-26 23:40:23.000000000 -0600
-@@ -73,7 +73,7 @@
+--- oss-build.orig/cmd/ossdevlinks/ossdevlinks.c	2011-01-05 22:06:26.000000000 +0100
++++ oss-build/cmd/ossdevlinks/ossdevlinks.c	2011-02-21 10:33:02.000000000 +0100
+@@ -75,7 +75,7 @@
  #if defined(sun)
  #define DEFAULT_OSSLIBDIR "/etc/oss"
  #else
@@ -11,7 +11,7 @@
  #endif
  
  static char *
-@@ -97,7 +97,7 @@
+@@ -99,7 +99,7 @@
        if (l > 0 && tmp[l - 1] == '\n')
  	tmp[l - 1] = '\0';
  
@@ -20,7 +20,7 @@
  	{
  	  l = snprintf (name, sizeof (name), "%s", &tmp[10]);
  	  if ((l >= OSSLIBDIRLEN) || (l < 0))
-@@ -989,7 +989,7 @@
+@@ -991,7 +991,7 @@
        char lfile[PATH_MAX+20], * osslibdir;
  
        osslibdir = get_mapname ();
@@ -29,11 +29,11 @@
        if ((f = fopen (lfile, "w")) == NULL)
  	{
  	  perror (lfile);
-Index: /oss-build/cmd/ossdevlinks/ossdevlinks.man
+Index: oss-build/cmd/ossdevlinks/ossdevlinks.man
 ===================================================================
---- oss-build/cmd/ossdevlinks/ossdevlinks.man	2009-11-26 23:39:42.000000000 -0600
-+++ oss-build/cmd/ossdevlinks/ossdevlinks.man	2009-11-26 23:40:23.000000000 -0600
-@@ -33,7 +33,7 @@
+--- oss-build.orig/cmd/ossdevlinks/ossdevlinks.man	2011-01-05 02:33:06.000000000 +0100
++++ oss-build/cmd/ossdevlinks/ossdevlinks.man	2011-02-21 10:33:02.000000000 +0100
+@@ -34,7 +34,7 @@
  
  FILES
  /usr/sbin/ossdevlinks
@@ -42,11 +42,11 @@
  /dev/dspN
  /dev/midiNN
  /dev/mixerN
-Index: /oss-build/cmd/savemixer/savemixer.c
+Index: oss-build/cmd/savemixer/savemixer.c
 ===================================================================
---- oss-build/cmd/savemixer/savemixer.c	2009-11-26 23:39:42.000000000 -0600
-+++ oss-build/cmd/savemixer/savemixer.c	2009-11-26 23:40:23.000000000 -0600
-@@ -269,14 +269,14 @@
+--- oss-build.orig/cmd/savemixer/savemixer.c	2011-01-05 22:06:26.000000000 +0100
++++ oss-build/cmd/savemixer/savemixer.c	2011-02-21 10:33:02.000000000 +0100
+@@ -268,14 +268,14 @@
  get_mapname (void)
  {
    FILE *f;
@@ -66,7 +66,7 @@
        return name;
      }
  
-@@ -292,15 +292,15 @@
+@@ -291,15 +291,15 @@
        if (l > 0 && tmp[l - 1] == '\n')
  	tmp[l - 1] = '\0';
  
@@ -85,7 +85,7 @@
  	  if ((l >= sizeof (ossetcdir)) || (l < 0))
  	    {
  	      fprintf (stderr, "String in /etc/oss.conf is too long!\n");
-@@ -312,7 +312,7 @@
+@@ -311,7 +311,7 @@
      }
  
    fclose (f);
@@ -94,10 +94,10 @@
  
  dexit:
    snprintf (name, sizeof (name), "%s/mixer.save", ossetcdir);
-Index: /oss-build/cmd/savemixer/savemixer.man
+Index: oss-build/cmd/savemixer/savemixer.man
 ===================================================================
---- oss-build/cmd/savemixer/savemixer.man	2009-11-26 23:39:42.000000000 -0600
-+++ oss-build/cmd/savemixer/savemixer.man	2009-11-26 23:40:23.000000000 -0600
+--- oss-build.orig/cmd/savemixer/savemixer.man	2011-01-05 02:33:07.000000000 +0100
++++ oss-build/cmd/savemixer/savemixer.man	2011-02-21 10:33:02.000000000 +0100
 @@ -9,8 +9,8 @@
  settings back into the mixer.
  
diff -Nru oss4-4.2-build2003/debian/patches/dont_build_kernel_module.patch oss4-4.2-build2004/debian/patches/dont_build_kernel_module.patch
--- oss4-4.2-build2003/debian/patches/dont_build_kernel_module.patch	2011-02-21 11:35:21.000000000 +0100
+++ oss4-4.2-build2004/debian/patches/dont_build_kernel_module.patch	2011-02-21 11:35:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: /oss-build/setup/Linux/build.sh
+Index: oss-build/setup/Linux/build.sh
 ===================================================================
---- oss-build/setup/Linux/build.sh.orig	2009-06-16 11:20:10.000000000 +0200
-+++ oss-build/setup/Linux/build.sh	2009-11-30 14:46:20.448621871 +0100
+--- oss-build.orig/setup/Linux/build.sh	2011-02-21 10:33:56.000000000 +0100
++++ oss-build/setup/Linux/build.sh	2011-02-21 10:34:06.000000000 +0100
 @@ -108,7 +108,6 @@
  if ! ld -r -o prototype/$OSSLIBDIR/$OBJECTS/osscore.o target/objects/*.o
  then
diff -Nru oss4-4.2-build2003/debian/patches/fix_invalid_printf.patch oss4-4.2-build2004/debian/patches/fix_invalid_printf.patch
--- oss4-4.2-build2003/debian/patches/fix_invalid_printf.patch	2011-02-21 11:35:21.000000000 +0100
+++ oss4-4.2-build2004/debian/patches/fix_invalid_printf.patch	2011-02-21 11:35:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: oss-v4.2-build2000-src-gpl/setup/elflib.inc
+Index: oss-build/setup/elflib.inc
 ===================================================================
---- oss-v4.2-build2000-src-gpl.orig/setup/elflib.inc	2009-11-27 18:48:40.000000000 -0600
-+++ oss-v4.2-build2000-src-gpl/setup/elflib.inc	2009-11-27 19:01:01.000000000 -0600
+--- oss-build.orig/setup/elflib.inc	2011-01-05 22:06:27.000000000 +0100
++++ oss-build/setup/elflib.inc	2011-02-21 10:34:08.000000000 +0100
 @@ -81,7 +81,11 @@
      }
    if (hdr->e_ehsize != sizeof (*hdr))
diff -Nru oss4-4.2-build2003/debian/patches/os_cmd.patch oss4-4.2-build2004/debian/patches/os_cmd.patch
--- oss4-4.2-build2003/debian/patches/os_cmd.patch	2011-02-21 11:35:21.000000000 +0100
+++ oss4-4.2-build2004/debian/patches/os_cmd.patch	2011-02-21 11:35:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: /oss-build/os_cmd/Linux/ossdetect/ossdetect.c
+Index: oss-build/os_cmd/Linux/ossdetect/ossdetect.c
 ===================================================================
---- oss-build/os_cmd/Linux/ossdetect/ossdetect.c	2009-11-27 00:06:58.000000000 -0600
-+++ oss-build/os_cmd/Linux/ossdetect/ossdetect.c	2009-11-27 00:06:59.000000000 -0600
+--- oss-build.orig/os_cmd/Linux/ossdetect/ossdetect.c	2011-01-05 22:06:26.000000000 +0100
++++ oss-build/os_cmd/Linux/ossdetect/ossdetect.c	2011-02-21 10:33:47.000000000 +0100
 @@ -90,7 +90,7 @@
        if (l > 0 && tmp[l - 1] == '\n')
  	tmp[l - 1] = '\0';
@@ -11,7 +11,7 @@
  	{
  	  l = snprintf (name, sizeof (name), "%s", &tmp[10]);
  	  if ((l >= OSSLIBDIRLEN) || (l < 0))
-@@ -109,11 +109,11 @@
+@@ -109,12 +109,12 @@
  	}
      }
  
@@ -21,12 +21,13 @@
 +		   "/etc/oss4\n");
  oexit:
    fclose (f);
+ oexit2:
 -  snprintf (name, sizeof (name), "/usr/lib/oss");
 +  snprintf (name, sizeof (name), "/etc/oss4");
    return name;
  }
  
-@@ -646,7 +646,7 @@
+@@ -648,7 +648,7 @@
        exit (0);
      }
  
@@ -35,7 +36,7 @@
  
    if (stat ("/etc/oss_3rdparty", &st) != -1)
      load_devlist ("/etc/oss_3rdparty", 1);
-@@ -672,7 +672,7 @@
+@@ -674,7 +674,7 @@
      }
  
    snprintf (instfname, sizeof (instfname), "%s/%s", osslibdir,
@@ -44,10 +45,10 @@
   
    if ((f = fopen (instfname, "w")) == NULL)
      {
-Index: /oss-build/os_cmd/Linux/ossdetect/ossdetect.man
+Index: oss-build/os_cmd/Linux/ossdetect/ossdetect.man
 ===================================================================
---- oss-build/os_cmd/Linux/ossdetect/ossdetect.man	2009-11-27 00:06:58.000000000 -0600
-+++ oss-build/os_cmd/Linux/ossdetect/ossdetect.man	2009-11-27 00:06:59.000000000 -0600
+--- oss-build.orig/os_cmd/Linux/ossdetect/ossdetect.man	2011-01-05 02:33:08.000000000 +0100
++++ oss-build/os_cmd/Linux/ossdetect/ossdetect.man	2011-02-21 10:33:10.000000000 +0100
 @@ -6,9 +6,10 @@
  
  DESCRIPTION
diff -Nru oss4-4.2-build2003/debian/patches/txt2man.patch oss4-4.2-build2004/debian/patches/txt2man.patch
--- oss4-4.2-build2003/debian/patches/txt2man.patch	2011-02-21 11:35:21.000000000 +0100
+++ oss4-4.2-build2004/debian/patches/txt2man.patch	2011-02-21 11:35:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: /oss-build/setup/Linux/build.sh
+Index: oss-build/setup/Linux/build.sh
 ===================================================================
---- oss-build/setup/Linux/build.sh	2009-11-26 23:42:30.000000000 -0600
-+++ oss-build/setup/Linux/build.sh	2009-11-26 23:42:34.000000000 -0600
+--- oss-build.orig/setup/Linux/build.sh	2011-01-05 02:33:08.000000000 +0100
++++ oss-build/setup/Linux/build.sh	2011-02-21 10:33:56.000000000 +0100
 @@ -8,7 +8,7 @@
  else
     echo "No gawk found. Using lesser replacement" >&2

More information about the Pkg-oss4-maintainers mailing list