Merge lp:~vibhavp/ubuntu/raring/gramophone2/merge-from-debian into lp:ubuntu/raring/gramophone2

[Vibhav Pant]

[Micah Gersten (micahg)]

The makefile changes should be converted to a quilt patch. I'd suggest that the Debian patch be disabled and the previous changes be used in their stead. I believe the Debian patch is incorrect.

review: Needs Fixing

Unmerged revisions

7. By Vibhav Pant on 2012-12-26

* Merge from Debian unstable. Remaining changes:
  - Makefile: Fix linking with --as-needed

=== added directory '.pc'
=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2012-12-26 17:40:28 +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	2012-12-26 17:40:28 +0000
@@ -0,0 +1,1 @@
+series

=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2012-12-26 17:40:28 +0000
@@ -0,0 +1,1 @@
+2

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-03 17:37:23 +0000
+++ debian/changelog	2012-12-26 17:40:28 +0000
@@ -1,3 +1,20 @@
+gramophone2 (0.8.13a-2ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    -  Makefile: Fix linking with --as-needed.
+
+ -- Vibhav Pant <[e-mail]>  Wed, 26 Dec 2012 23:06:41 +0530
+
+gramophone2 (0.8.13a-2) unstable; urgency=low
+
+  * debian/watch: fixed. (Closes: #673379)
+  * Switch to dpkg-source 3.0 (quilt) format
+  * debian/control: added dep on dpkg-dev (>= 1.16.1~)
+  * added makefile.patch to corectly handle LDFLAGS on Makefile.
+  * added typoCorrection.patch to fix a typo on source file.
+
+ -- Francesco Namuri <[e-mail]>  Sun, 12 Aug 2012 19:38:49 +0200
+
 gramophone2 (0.8.13a-1ubuntu1) natty; urgency=low
 
   * Makefile: Fix linking with --as-needed. 

=== modified file 'debian/control'
--- debian/control	2010-12-03 17:37:23 +0000
+++ debian/control	2012-12-26 17:40:28 +0000
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Francesco Namuri <[e-mail]>
-Build-Depends: debhelper (>= 5), cdbs, bison, flex
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5), cdbs, bison, flex, dpkg-dev (>= 1.16.1~)
+Standards-Version: 3.9.3
 Homepage: http://gramophone2.sourceforge.net/
 
 Package: gramophone2

=== added directory 'debian/patches'
=== added file 'debian/patches/makefile.patch'
--- debian/patches/makefile.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/makefile.patch	2012-12-26 17:40:28 +0000
@@ -0,0 +1,14 @@
+adds LDFLAGS to makefile
+Index: gramophone2/Makefile
+===================================================================
+--- gramophone2.orig/Makefile	2012-08-12 21:54:14.886343552 +0200
++++ gramophone2/Makefile	2012-08-13 19:29:23.430691399 +0200
+@@ -6,7 +6,7 @@
+ DESTDIR=/usr/local
+ 
+ default:		GRAMophone.tab.c
+-			$(CC) $(CFLAGS) -o gramophone2 GRAMophone.c\
++			$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o gramophone2 GRAMophone.c\
+ 			grammyVM.c init.c midicode.c\
+ 			midifile.c expcode.c debug.c errors.c\
+ 			hash.c GRAMophone.tab.c

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-12-26 17:40:28 +0000
@@ -0,0 +1,2 @@
+typoCorrection.patch
+makefile.patch

=== added file 'debian/patches/typoCorrection.patch'
--- debian/patches/typoCorrection.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/typoCorrection.patch	2012-12-26 17:40:28 +0000
@@ -0,0 +1,12 @@
+Fixes typo on source files.
+Index: gramophone2/grammyVM.c
+===================================================================
+--- gramophone2.orig/grammyVM.c	2012-08-12 21:40:22.302339825 +0200
++++ gramophone2/grammyVM.c	2012-08-12 21:41:18.794340078 +0200
+@@ -1552,5 +1552,5 @@
+ 	Mf_writetrack=write_player_track;
+ 	mfwrite(0, playerCount, global_resolution, midi);
+ 	if(!debugOption)
+-		printf("midi file succesfully generated!\n");
++		printf("midi file successfully generated!\n");
+ }

=== modified file 'debian/rules'
--- debian/rules	2007-08-26 19:34:04 +0000
+++ debian/rules	2012-12-26 17:40:28 +0000
@@ -3,6 +3,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp/ 
-DEB_MAKE_ENVVARS := CFLAGS="-lm"
-DEB_MAKE_INVOKE := $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR)
+DEB_MAKE_INVOKE := make -C $(DEB_BUILDDIR)
+

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-12-26 17:40:28 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== modified file 'debian/watch'
--- debian/watch	2008-07-12 21:25:34 +0000
+++ debian/watch	2012-12-26 17:40:28 +0000
@@ -1,3 +1,2 @@
 version=3
-http://sourceforge.net/projects/gramophone2/files \
-  http://downloads.sourceforge.net/.+/gramophone2?[-_](.+)\.tar\.gz.+
+http://sf.net/gramophone2/gramophone2_(.*)\.tar\.gz