diff options
author | Andrew Shadura <andrewsh@debian.org> | 2015-12-21 11:10:59 +0100 |
---|---|---|
committer | Andrew Shadura <andrewsh@debian.org> | 2015-12-21 11:10:59 +0100 |
commit | ef54e87ee914e710de37c27277f2440e1fdcf687 (patch) | |
tree | d3bcf28501b74a50ef00eeea0ddfbd75c15d00b8 | |
parent | 4d9c213f1f7cec6600ee1e41e058864a6d9499d0 (diff) |
Drop old patches, refresh and apply 01-pkgconfig_fixes.patch.
-rw-r--r-- | appindicator3-sharp-0.1.pc.in | 2 | ||||
-rw-r--r-- | debian/patches/01-pkgconfig_fixes.patch | 16 | ||||
-rw-r--r-- | debian/patches/02-generated_sources_path.patch | 16 | ||||
-rw-r--r-- | debian/patches/03-ac_config_macro_dir.patch | 23 | ||||
-rw-r--r-- | debian/patches/04-use_mcs_instead_of_gmcs.patch | 21 | ||||
-rw-r--r-- | debian/patches/series | 3 |
6 files changed, 6 insertions, 75 deletions
diff --git a/appindicator3-sharp-0.1.pc.in b/appindicator3-sharp-0.1.pc.in index 4e1c39c..0c1567f 100644 --- a/appindicator3-sharp-0.1.pc.in +++ b/appindicator3-sharp-0.1.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=@libdir@ -pkglibdir=${exec_prefix}/lib/mono/@ASSEMBLY_NAME@ +pkglibdir=${exec_prefix}/lib/cli/@ASSEMBLY_PC@ gapidir=@GAPIXMLDIR@ Name: @ASSEMBLY_TITLE@ diff --git a/debian/patches/01-pkgconfig_fixes.patch b/debian/patches/01-pkgconfig_fixes.patch index e045a7e..f0d2d9f 100644 --- a/debian/patches/01-pkgconfig_fixes.patch +++ b/debian/patches/01-pkgconfig_fixes.patch @@ -1,22 +1,16 @@ Description: Fix a few things in pkgconfig file Author: Thanh Tung Nguyen <thngtong@gmailcom> Forwarded: no -Last-Update: 2013-12-11 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Last-Update: 2015-12-21 + --- a/appindicator3-sharp-0.1.pc.in +++ b/appindicator3-sharp-0.1.pc.in -@@ -1,9 +1,12 @@ +@@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=@libdir@ +-pkglibdir=${exec_prefix}/lib/mono/@ASSEMBLY_NAME@ +pkglibdir=${exec_prefix}/lib/cli/@ASSEMBLY_PC@ -+gapidir=${exec_prefix}/share/gapi-3.0 + gapidir=@GAPIXMLDIR@ Name: @ASSEMBLY_TITLE@ - Description: @ASSEMBLY_DESCRIPTION@ - Version: @VERSION@ - Requires: --Libs: -r:${libdir}/mono/@ASSEMBLY_NAME@/@ASSEMBLY_NAME@.dll -+Libs: -r:${pkglibdir}/@ASSEMBLY_NAME@.dll -+Cflags: -I:${gapidir}/@ASSEMBLY_NAME@-api.xml diff --git a/debian/patches/02-generated_sources_path.patch b/debian/patches/02-generated_sources_path.patch deleted file mode 100644 index 9432fe3..0000000 --- a/debian/patches/02-generated_sources_path.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix generated code path -Author: Thanh Tung Nguyen <thngtong@gmail.com> -Last-Update: 2015-01-18 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/sources/Makefile.am -+++ b/sources/Makefile.am -@@ -42,7 +42,7 @@ - - $(DLL): $(build_sources) generated-stamp - $(CSC) -nowarn:169 -unsafe -target:library $(GTK_SHARP_LIBS) \ -- $(build_sources) generated/*.cs -out:$(DLL) -+ $(build_sources) generated/*/*.cs -out:$(DLL) - - install-data-local: - echo "$(GACUTIL) /i $(DLL) /f $(GACUTIL_FLAGS)"; \ diff --git a/debian/patches/03-ac_config_macro_dir.patch b/debian/patches/03-ac_config_macro_dir.patch deleted file mode 100644 index 91868cd..0000000 --- a/debian/patches/03-ac_config_macro_dir.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: Add correctly the local macro directory -Author: Thanh Tung Nguyen <thngtong@gmail.com> -Last-Updated: 2013-11-02 - ---- a/configure.ac -+++ b/configure.ac -@@ -16,7 +16,7 @@ - ASSEMBLY_SHORTNAME="appindicator3" - ASSEMBLY_TITLE="AppIndicator3#" - ASSEMBLY_VERSION="12.10.0" --AC_SUBST([ACLOCAL_AMFLAGS], ["-I m4 \${ACLOCAL_FLAGS}"]) -+AC_CONFIG_MACRO_DIR([m4]) - - AC_SUBST(ASSEMBLY_NAME) - AC_SUBST(ASSEMBLY_VERSION) ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,3 +1,5 @@ -+ACLOCAL_AMFLAGS = -I m4 -+ - SUBDIRS = sources sources/glue doc - - pkgconfigdir = $(libdir)/pkgconfig diff --git a/debian/patches/04-use_mcs_instead_of_gmcs.patch b/debian/patches/04-use_mcs_instead_of_gmcs.patch deleted file mode 100644 index ccf5bc4..0000000 --- a/debian/patches/04-use_mcs_instead_of_gmcs.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 11bd7c6fb9fe834cc432c3d892b21cd339f084fd Mon Sep 17 00:00:00 2001 -From: Hylke Bons <hylkebons@gmail.com> -Date: Wed, 24 Jun 2015 22:57:37 +0100 -Subject: [PATCH] Use "mcs" instead of "gmcs" for the compiler check for mono > - 2.10 - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -39,7 +39,7 @@ - - if test "x$has_mono" = "xtrue"; then - 1 AC_PATH_PROG(RUNTIME, mono, no) -- AC_PATH_PROG(CSC, gmcs, no) -+ AC_PATH_PROG(CSC, mcs, no) - LIB_PREFIX=.so - LIB_SUFFIX= - else diff --git a/debian/patches/series b/debian/patches/series index 35119d2..934a455 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1 @@ 01-pkgconfig_fixes.patch -02-generated_sources_path.patch -03-ac_config_macro_dir.patch -04-use_mcs_instead_of_gmcs.patch |