Merge lp:~noskcaj/ubuntu/utopic/flashplugin-nonfree-extrasound/merge into lp:ubuntu/utopic/flashplugin-nonfree-extrasound

[Jackson Doak]

Merge from debian

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

5. By Jackson Doak on 2014-05-26

fix a typo

4. By Jackson Doak on 2014-05-26

* Merge from debian. Remaining changes:
  - debian/control: Update flashplugin-nonfree recommends to
    flashplugin-installer, as the former is NBS now.

=== added directory '.pc'
=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2014-05-26 22:03:48 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2014-05-26 22:03:48 +0000
@@ -0,0 +1,1 @@
+series

=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2014-05-26 22:03:48 +0000
@@ -0,0 +1,1 @@
+2

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-15 12:08:26 +0000
+++ debian/changelog	2014-05-26 22:03:48 +0000
@@ -1,3 +1,38 @@
+flashplugin-nonfree-extrasound (0.0.svn2431-5ubuntu1) utopic; urgency=medium
+
+  * Merge from debian. Remaining changes:
+    - debian/control: Update flashplugin-nonfree recommends to
+      flashplugin-installer, as the former is NBS now.
+
+ -- Jackson Doak <[e-mail]>  Tue, 27 May 2014 07:34:17 +1000
+
+flashplugin-nonfree-extrasound (0.0.svn2431-5) unstable; urgency=low
+
+  * Debian QA upload.
+  * Remove wrong home page URL.  Current home page for this project is
+    unknown.
+  * Reinclude README.orig which was lost in the last upload.
+  * Package description no longer mention non-existing package
+    flashplugin-nonfree-pulse (Closes: #477266).
+  * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Petter Reinholdtsen <[e-mail]>  Mon, 10 Mar 2014 14:05:18 +0100
+
+flashplugin-nonfree-extrasound (0.0.svn2431-4) unstable; urgency=low
+
+  * Orphan package.
+  * New upstream version from http://git.0pointer.de/repos/libflashsupport.git,
+    commit a9bc3caccb4635305ed9b0a71f9fc62ae4895348 .
+  * Add amd64 to architecture list (Closes: #594683).
+  * Add vcs links in control file.
+  * Add homepage URL to control file.
+  * Implement get-orig-source rules target.
+  * Add README.Debian with information on the Adobe source.
+  * Change Standards-Version from 3.7.3 to 3.9.5.  No changes needed.
+  * Switch to dpatch.
+
+ -- Petter Reinholdtsen <[e-mail]>  Mon, 10 Mar 2014 13:37:19 +0100
+
 flashplugin-nonfree-extrasound (0.0.svn2431-3ubuntu1) oneiric; urgency=low
 
   * debian/control: Update flashplugin-nonfree recommends to

=== modified file 'debian/control'
--- debian/control	2011-09-15 12:08:26 +0000
+++ debian/control	2014-05-26 22:03:48 +0000
@@ -2,12 +2,14 @@
 Section: contrib/sound
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Petter Reinholdtsen <[e-mail]>
-Build-Depends: debhelper (>= 5), cdbs, linux-libc-dev | linux-kernel-headers, libesd0-dev
-Standards-Version: 3.7.3
+XSBC-Original-Maintainer: Debian QA Group <[e-mail]>
+Build-Depends: debhelper (>= 9), cdbs, linux-libc-dev | linux-kernel-headers, libesd0-dev
+Standards-Version: 3.9.5
+Vcs-Browser: http://anonscm.debian.org/viewvc/collab-maint/deb-maint/flashplugin-nonfree-extrasound/
+Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/flashplugin-nonfree-extrasound
 
 Package: flashplugin-nonfree-extrasound
-Architecture: i386
+Architecture: i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: flashplugin-installer
 Conflicts: libflashsupport, flashplugin-nonfree-pulse
@@ -24,4 +26,4 @@
  If all of the above failed, it falls back to the ALSA driver that's
  built directly into FlashPlayer 9.
  .
- For PulseAudio support, see flashplugin-nonfree-pulse.
+ For PulseAudio support, look elsewhere.

=== modified file 'debian/patches/destdirinstall.patch' (properties changed: -x to +x)
--- debian/patches/destdirinstall.patch	2008-01-24 00:04:49 +0000
+++ debian/patches/destdirinstall.patch	2014-05-26 22:03:48 +0000
@@ -1,5 +1,8 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
 Add support for DESTDIR installs.
 
+@DPATCH@
 --- libflashsupport-0.0.svn2431.orig/Makefile
 +++ libflashsupport-0.0.svn2431/Makefile
 @@ -55,8 +55,8 @@

=== added file 'debian/patches/print-pointers.patch'
--- debian/patches/print-pointers.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/print-pointers.patch	2014-05-26 22:03:48 +0000
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+Fix pointer printing when sizeof(void*) > sizeof(int).
+
+@DPATCH@
+--- flashplugin-nonfree-extrasound-0.0.svn2431.old/flashsupport.c	2008-01-23 16:07:10.000000000 +0100
++++ flashplugin-nonfree-extrasound-0.0.svn2431/flashsupport.c	2014-03-10 13:11:59.449846588 +0100
+@@ -511,7 +511,7 @@
+ 	if(audiodrivers & AUDIO_ESD) {
+ 		if(audiodebug) fprintf( stderr,"Trying ESD\n");	
+ 		ptr=ESD_FPX_SoundOutput_Open();
+-		if(audiodebug) fprintf( stderr,"ptr=%d\n",(int)ptr);	
++		if(audiodebug) fprintf( stderr,"ptr=%p\n",ptr);	
+ 		if(ptr) {
+ 			audiotype=AUDIO_ESD;
+ 			if(audiodebug) fprintf( stderr, "Using Esound audio driver\n");
+@@ -529,7 +529,7 @@
+ 	if(audiodrivers & AUDIO_ALSA) {
+ 		if(audiodebug) fprintf( stderr,"Trying ALSA\n");	
+ 		ptr=ALSA_FPX_SoundOutput_Open();
+-		if(audiodebug) fprintf( stderr,"ptr=%d\n",(int)ptr);	
++		if(audiodebug) fprintf( stderr,"ptr=%p\n",ptr);	
+ 		if(ptr) {
+ 			audiotype=AUDIO_ALSA;
+ 			if(audiodebug) fprintf( stderr, "Using ALSA audio driver\n");
+@@ -541,7 +541,7 @@
+ 	if(audiodrivers & AUDIO_OSS) {
+ 		if(audiodebug) fprintf( stderr,"Trying OSS\n");	
+ 		ptr=OSS_FPX_SoundOutput_Open();
+-		if(audiodebug) fprintf( stderr,"ptr=%d\n",(int)ptr);	
++		if(audiodebug) fprintf( stderr,"ptr=%p\n",ptr);	
+ 		if(ptr) {
+ 			audiotype=AUDIO_OSS;
+ 			if(audiodebug) fprintf( stderr, "Using OSS audio driver\n");

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-05-26 22:03:48 +0000
@@ -0,0 +1,2 @@
+destdirinstall.patch
+print-pointers.patch

=== modified file 'debian/rules'
--- debian/rules	2008-01-24 00:04:49 +0000
+++ debian/rules	2014-05-26 22:03:48 +0000
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 # Override the cdbs defaults to make sure -shared and -fPIC is included
 CFLAGS=-fPIC -shared -O2 -Wall -Werror
@@ -15,3 +14,8 @@
   LIBDIR="/usr/lib/flashplugin-nonfree-extrasound"
 
 DEB_MAKE_CLEAN_TARGET = clean
+
+get-orig-source:
+	svn export https://svn.revolutionlinux.com/MILLE/XTERM/trunk/libflashsupport/src flashplugin-nonfree-extrasound
+	tar zcf flashplugin-nonfree-extrasound.tar.gz flashplugin-nonfree-extrasound
+	rm -rf flashplugin-nonfree-extrasound

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2014-05-26 22:03:48 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)