[Pkg-cli-apps-commits] r5270 - in /packages/tomboy-latex/trunk/debian: changelog control patches/ patches/add_gtk_sharp_to_references.diff patches/series patches/use_unversioned_compiler_not_csc.diff rules

directhex at users.alioth.debian.org directhex at users.alioth.debian.org
Tue Jan 26 13:17:09 UTC 2010 

Author: directhex
Date: Tue Jan 26 13:17:07 2010
New Revision: 5270

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5270
Log:
fix broken build. that was unpleasant

Added:
    packages/tomboy-latex/trunk/debian/patches/
    packages/tomboy-latex/trunk/debian/patches/add_gtk_sharp_to_references.diff
    packages/tomboy-latex/trunk/debian/patches/series
    packages/tomboy-latex/trunk/debian/patches/use_unversioned_compiler_not_csc.diff
Modified:
    packages/tomboy-latex/trunk/debian/changelog
    packages/tomboy-latex/trunk/debian/control
    packages/tomboy-latex/trunk/debian/rules

Modified: packages/tomboy-latex/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/tomboy-latex/trunk/debian/changelog?rev=5270&op=diff
==============================================================================
--- packages/tomboy-latex/trunk/debian/changelog (original)
+++ packages/tomboy-latex/trunk/debian/changelog Tue Jan 26 13:17:07 2010
@@ -2,9 +2,16 @@
 
   * debian/control:
     + No-change bump to Standards 3.8.3
+    + Use -dev packages in build-depends to find GTK# pcfiles
   * debian/control:
     debian/rules:
     + Use mono-csc from mono-devel 2.4.3 for compiler
+    + Add quilt to build-depends and rules
+  * debian/patches/add_gtk_sharp_to_references.diff:
+    + Ensure gtk-sharp-2.0.pc is explicitly called on the command line
+  * debian/patches/use_unversioned_compiler_not_csc.diff:
+    + Ensure the compiler set in debian/rules is used, not a hard-coded
+      gmcs
 
  -- Jo Shields <directhex at apebox.org>  Tue, 26 Jan 2010 11:50:46 +0000
 

Modified: packages/tomboy-latex/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/tomboy-latex/trunk/debian/control?rev=5270&op=diff
==============================================================================
--- packages/tomboy-latex/trunk/debian/control (original)
+++ packages/tomboy-latex/trunk/debian/control Tue Jan 26 13:17:07 2010
@@ -4,8 +4,11 @@
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Jonathan Davies <jpds at ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50),
+               quilt (>= 0.46-7~),
                cli-common-dev (>= 0.5.7),
                mono-devel (>= 2.4.3),
+               libgtk2.0-cil-dev,
+               libglib2.0-cil-dev,
                tomboy (>= 0.7)
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/tomboy-latex/trunk

Added: packages/tomboy-latex/trunk/debian/patches/add_gtk_sharp_to_references.diff
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/tomboy-latex/trunk/debian/patches/add_gtk_sharp_to_references.diff?rev=5270&op=file
==============================================================================
--- packages/tomboy-latex/trunk/debian/patches/add_gtk_sharp_to_references.diff (added)
+++ packages/tomboy-latex/trunk/debian/patches/add_gtk_sharp_to_references.diff Tue Jan 26 13:17:07 2010
@@ -1,0 +1,26 @@
+Index: tomboy-latex-0.5/src/Makefile.am
+===================================================================
+--- tomboy-latex-0.5.orig/src/Makefile.am	2010-01-26 12:29:38.001129626 +0000
++++ tomboy-latex-0.5/src/Makefile.am	2010-01-26 12:29:51.113645185 +0000
+@@ -6,7 +6,7 @@
+ 
+ CSFILES = $(srcdir)/Latex.cs
+ 	
+-ASSEMBLIES = -pkg:tomboy-addins -r:Mono.Posix
++ASSEMBLIES = -pkg:tomboy-addins -pkg:gtk-sharp-2.0 -r:Mono.Posix
+ 
+ $(TARGET): $(CSFILES)
+ 	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $^
+Index: tomboy-latex-0.5/src/Makefile.in
+===================================================================
+--- tomboy-latex-0.5.orig/src/Makefile.in	2010-01-26 12:28:55.223624179 +0000
++++ tomboy-latex-0.5/src/Makefile.in	2010-01-26 12:29:36.033657642 +0000
+@@ -120,7 +120,7 @@
+ TARGET = $(TARGET_NAME).dll
+ CSFLAGS = -target:library -resource:Latex.addin.xml
+ CSFILES = $(srcdir)/Latex.cs
+-ASSEMBLIES = -pkg:tomboy-addins -r:Mono.Posix
++ASSEMBLIES = -pkg:tomboy-addins -pkg:gtk-sharp-2.0 -r:Mono.Posix
+ EXTRA_DIST = \
+ 	$(CSFILES)		\
+ 	$(srcdir)/Latex.addin.xml

Added: packages/tomboy-latex/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/tomboy-latex/trunk/debian/patches/series?rev=5270&op=file
==============================================================================
--- packages/tomboy-latex/trunk/debian/patches/series (added)
+++ packages/tomboy-latex/trunk/debian/patches/series Tue Jan 26 13:17:07 2010
@@ -1,0 +1,2 @@
+use_unversioned_compiler_not_csc.diff
+add_gtk_sharp_to_references.diff

Added: packages/tomboy-latex/trunk/debian/patches/use_unversioned_compiler_not_csc.diff
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/tomboy-latex/trunk/debian/patches/use_unversioned_compiler_not_csc.diff?rev=5270&op=file
==============================================================================
--- packages/tomboy-latex/trunk/debian/patches/use_unversioned_compiler_not_csc.diff (added)
+++ packages/tomboy-latex/trunk/debian/patches/use_unversioned_compiler_not_csc.diff Tue Jan 26 13:17:07 2010
@@ -1,0 +1,23 @@
+Index: tomboy-latex-0.5/src/Makefile.am
+===================================================================
+--- tomboy-latex-0.5.orig/src/Makefile.am	2010-01-26 12:27:40.681125762 +0000
++++ tomboy-latex-0.5/src/Makefile.am	2010-01-26 12:27:44.511135646 +0000
+@@ -1,6 +1,4 @@
+ 
+-CSC = gmcs -debug
+-
+ TARGET_NAME = Latex
+ TARGET = $(TARGET_NAME).dll
+ 
+Index: tomboy-latex-0.5/src/Makefile.in
+===================================================================
+--- tomboy-latex-0.5.orig/src/Makefile.in	2010-01-26 12:27:48.981123382 +0000
++++ tomboy-latex-0.5/src/Makefile.in	2010-01-26 12:27:55.271134338 +0000
+@@ -116,7 +116,6 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-CSC = gmcs -debug
+ TARGET_NAME = Latex
+ TARGET = $(TARGET_NAME).dll
+ CSFLAGS = -target:library -resource:Latex.addin.xml

Modified: packages/tomboy-latex/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/tomboy-latex/trunk/debian/rules?rev=5270&op=diff
==============================================================================
--- packages/tomboy-latex/trunk/debian/rules (original)
+++ packages/tomboy-latex/trunk/debian/rules Tue Jan 26 13:17:07 2010
@@ -9,8 +9,10 @@
 VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
 
 include /usr/share/cli-common/cli.make
+include /usr/share/quilt/quilt.make
 
 export MCS=/usr/bin/mono-csc
+export CSC=/usr/bin/mono-csc
 
 get-orig-source:
 	uscan \
@@ -24,4 +26,4 @@
 		--repack
 
 %:
-	dh $@
+	dh --with quilt $@

More information about the Pkg-cli-apps-commits mailing list