From c5536ddbc2b7ed00a901413a452593b4edb4648a Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Mon, 25 Dec 2017 20:28:38 -0500
Subject: [PATCH 1/8] Drop unnecessary libart depends
---
debian/control | 2 +-
debian/patches/03_drop_libart_depends.patch | 33 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 35 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/03_drop_libart_depends.patch
diff --git a/debian/control b/debian/control
index 9410ae9..2c73845 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Stefan Ebner <seb...@ubuntu.com>
Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~),
cli-common-dev (>= 0.7), imagemagick
Build-Depends-Indep: mono-devel (>= 2.4.2.3),
- libglib2.0-cil-dev, libgtk2.0-cil-dev, libart2.0-cil-dev
+ libglib2.0-cil-dev, libgtk2.0-cil-dev
Standards-Version: 3.8.3
Homepage: http://www.brdstudio.net/yahtzeesharp/
Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/yahtzeesharp.git
diff --git a/debian/patches/03_drop_libart_depends.patch b/debian/patches/03_drop_libart_depends.patch
new file mode 100644
index 0000000..6476dc4
--- /dev/null
+++ b/debian/patches/03_drop_libart_depends.patch
@@ -0,0 +1,33 @@
+From: Jeremy Bicha <jbi...@debian.org>
+Date: Mon, 25 Dec 2017 20:27:14 -0500
+Subject: Drop unnecessary libart depends
+
+---
+ YahtzeeSharp/Makefile.am | 1 -
+ configure.ac | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/YahtzeeSharp/Makefile.am b/YahtzeeSharp/Makefile.am
+index e31bce9..fb14770 100644
+--- a/YahtzeeSharp/Makefile.am
++++ b/YahtzeeSharp/Makefile.am
+@@ -133,7 +133,6 @@ REFERENCES = \
+ System.Data \
+ System \
+ System.Xml \
+- $(ART_SHARP_20_LIBS) \
+ $(GTK_SHARP_20_LIBS) \
+ $(GLIB_SHARP_20_LIBS)
+
+diff --git a/configure.ac b/configure.ac
+index e8bf8c1..781f965 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,7 +46,6 @@ fi
+
+ dnl package checks, common for all configs
+ PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
+-PKG_CHECK_MODULES([ART_SHARP_20], [art-sharp-2.0])
+ PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
+
+ dnl package checks, per config
diff --git a/debian/patches/series b/debian/patches/series
index ab66544..562e618 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_fix_build_system
02_fix_desktop_file
+03_drop_libart_depends.patch
--
2.14.1
From 16b16db0115b1f96bc4e7486529b1d522b5c1d7b Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Mon, 25 Dec 2017 22:42:03 -0500
Subject: [PATCH 2/8] Switch to 3.0 (quilt)
---
debian/README.source | 57 ----------------------------------------------------
debian/control | 2 +-
debian/rules | 7 +------
debian/source/format | 1 +
4 files changed, 3 insertions(+), 64 deletions(-)
delete mode 100644 debian/README.source
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 8646078..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
diff --git a/debian/control b/debian/control
index 2c73845..3d3ff25 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
Priority: optional
Maintainer: Debian CLI Applications Team <pkg-cli-apps-t...@lists.alioth.debian.org>
Uploaders: Stefan Ebner <seb...@ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~),
+Build-Depends: debhelper (>= 7.0.50),
cli-common-dev (>= 0.7), imagemagick
Build-Depends-Indep: mono-devel (>= 2.4.2.3),
libglib2.0-cil-dev, libgtk2.0-cil-dev
diff --git a/debian/rules b/debian/rules
index 457c575..f0a5974 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,6 @@ DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^
DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Version | cut -d" " -f2)
VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
-
-include /usr/share/cli-common/cli.make
-include /usr/share/quilt/quilt.make
-
-
get-orig-source:
uscan \
--package $(DEB_SOURCE_NAME) \
@@ -49,6 +44,6 @@ override_dh_auto_install:
$(CURDIR)/debian/yahtzeesharp/usr/share/pixmaps/yahtzeesharp.xpm
%:
- dh --with quilt $@
+ dh $@ --with cli
.PHONY: get-orig-source
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
2.14.1
From 02b990ed607cb9c3ea624902f4fc0b329759d31a Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Mon, 25 Dec 2017 22:42:57 -0500
Subject: [PATCH 3/8] Bump debhelper compat to 11
---
debian/compat | 2 +-
debian/control | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/compat b/debian/compat
index 7f8f011..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+11
diff --git a/debian/control b/debian/control
index 3d3ff25..f5da9f7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
Priority: optional
Maintainer: Debian CLI Applications Team <pkg-cli-apps-t...@lists.alioth.debian.org>
Uploaders: Stefan Ebner <seb...@ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50),
+Build-Depends: debhelper (>= 11),
cli-common-dev (>= 0.7), imagemagick
Build-Depends-Indep: mono-devel (>= 2.4.2.3),
libglib2.0-cil-dev, libgtk2.0-cil-dev
--
2.14.1
From 558eb7e67fb51785361fe4e79905ca67d54ff218 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Mon, 25 Dec 2017 22:43:06 -0500
Subject: [PATCH 4/8] Add patches to fix build with autoreconf
---
debian/patches/04_fix_build_with_automake112.patch | 30 ++++++++++++++++++++++
debian/patches/05_specify_libdir.patch | 19 ++++++++++++++
debian/patches/series | 2 ++
debian/rules | 2 +-
4 files changed, 52 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/04_fix_build_with_automake112.patch
create mode 100644 debian/patches/05_specify_libdir.patch
diff --git a/debian/patches/04_fix_build_with_automake112.patch b/debian/patches/04_fix_build_with_automake112.patch
new file mode 100644
index 0000000..52a50bf
--- /dev/null
+++ b/debian/patches/04_fix_build_with_automake112.patch
@@ -0,0 +1,30 @@
+From: Jeremy Bicha <jbi...@debian.org>
+Date: Mon, 25 Dec 2017 20:58:18 -0500
+Subject: fix build with automake 1.12
+
+See
+https://git.savannah.gnu.org/cgit/automake.git/commit/?h=maint&id=9ca6326
+---
+ Makefile.include | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.include b/Makefile.include
+index 6e1bbb7..25a87ed 100644
+--- a/Makefile.include
++++ b/Makefile.include
+@@ -36,7 +36,7 @@ EXTRA_DIST += $(build_sources) $(build_resx_files) $(build_others_files) $(ASSEM
+ CLEANFILES += $(ASSEMBLY) $(ASSEMBLY).mdb $(BINARIES) $(build_resx_resources) $(build_satellite_assembly_list)
+ DISTCLEANFILES = $(GENERATED_FILES) $(pc_files) $(BUILD_DIR)/*
+
+-pkglib_SCRIPTS = $(ASSEMBLY)
++libexec_SCRIPTS = $(ASSEMBLY)
+ bin_SCRIPTS = $(BINARIES)
+
+ linuxdesktopapplicationsdir = @datadir@/applications
+@@ -77,4 +77,4 @@ $(eval $(foreach res, $(culture_resources), $(eval $(call culture_resource_comma
+
+ $(build_satellite_assembly_list): $(BUILD_DIR)/%/$(SATELLITE_ASSEMBLY_NAME):
+ mkdir -p '$(@D)'
+- $(AL) -out:'$@' -culture:$* -t:lib $(cmd_line_satellite_$*)
+\ No newline at end of file
++ $(AL) -out:'$@' -culture:$* -t:lib $(cmd_line_satellite_$*)
diff --git a/debian/patches/05_specify_libdir.patch b/debian/patches/05_specify_libdir.patch
new file mode 100644
index 0000000..97aa725
--- /dev/null
+++ b/debian/patches/05_specify_libdir.patch
@@ -0,0 +1,19 @@
+From: Jeremy Bicha <jbi...@debian.org>
+Date: Mon, 25 Dec 2017 22:32:38 -0500
+Subject: specify libdir
+
+workaround this error when importing "expanded_libdir"
+/configure: SHAMROCK_EXPAND_LIBDIR: command not found
+---
+ YahtzeeSharp/yahtzeesharp.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/YahtzeeSharp/yahtzeesharp.in b/YahtzeeSharp/yahtzeesharp.in
+index e161e8a..37af917 100644
+--- a/YahtzeeSharp/yahtzeesharp.in
++++ b/YahtzeeSharp/yahtzeesharp.in
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-exec mono "@expanded_libdir@/@PACKAGE@/YahtzeeSharp.exe" "$@"
++exec mono "/usr/lib/@PACKAGE@/YahtzeeSharp.exe" "$@"
diff --git a/debian/patches/series b/debian/patches/series
index 562e618..a3e29c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
01_fix_build_system
02_fix_desktop_file
03_drop_libart_depends.patch
+04_fix_build_with_automake112.patch
+05_specify_libdir.patch
diff --git a/debian/rules b/debian/rules
index f0a5974..f03a43f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ get-orig-source:
override_dh_auto_configure:
dh_auto_configure -- GMCS=/usr/bin/mono-csc CSC=/usr/bin/mono-csc \
- --prefix=/usr --bindir=/usr/games
+ --prefix=/usr --bindir=/usr/games --libexecdir=/usr/lib/yahtzeesharp
override_dh_auto_install:
dh_auto_install
--
2.14.1
From 265914e4d3f3e241939f47cab9a6a1b342d9dafe Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Mon, 25 Dec 2017 22:48:04 -0500
Subject: [PATCH 5/8] Drop obsolete debian/menu, debian/dirs and .xpm
---
debian/control | 2 +-
debian/dirs | 2 --
debian/menu | 3 ---
debian/rules | 7 -------
4 files changed, 1 insertion(+), 13 deletions(-)
delete mode 100644 debian/dirs
delete mode 100644 debian/menu
diff --git a/debian/control b/debian/control
index f5da9f7..a3911dc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian CLI Applications Team <pkg-cli-apps-t...@lists.alioth.debian.org>
Uploaders: Stefan Ebner <seb...@ubuntu.com>
Build-Depends: debhelper (>= 11),
- cli-common-dev (>= 0.7), imagemagick
+ cli-common-dev (>= 0.7)
Build-Depends-Indep: mono-devel (>= 2.4.2.3),
libglib2.0-cil-dev, libgtk2.0-cil-dev
Standards-Version: 3.8.3
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 027dc91..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/games
-usr/share/pixmaps
diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index 0d231b0..0000000
--- a/debian/menu
+++ /dev/null
@@ -1,3 +0,0 @@
-?package(yahtzeesharp):needs="X11" section="Games/Card"\
- title="yahtzeesharp" command="/usr/games/yahtzeesharp"\
- icon="yahtzeesharp.xpm"
diff --git a/debian/rules b/debian/rules
index f03a43f..b4e91d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,12 +38,5 @@ override_dh_auto_configure:
dh_auto_configure -- GMCS=/usr/bin/mono-csc CSC=/usr/bin/mono-csc \
--prefix=/usr --bindir=/usr/games --libexecdir=/usr/lib/yahtzeesharp
-override_dh_auto_install:
- dh_auto_install
- convert $(CURDIR)/YahtzeeSharp/work-files/YSlogo.png -resize 32x32 \
- $(CURDIR)/debian/yahtzeesharp/usr/share/pixmaps/yahtzeesharp.xpm
-
%:
dh $@ --with cli
-
-.PHONY: get-orig-source
--
2.14.1
From 54b57007fe4ce7a66bc074f289d25196d79853e8 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Mon, 25 Dec 2017 22:49:02 -0500
Subject: [PATCH 6/8] Bump Standards-Version to 4.1.2
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index a3911dc..238350c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 11),
cli-common-dev (>= 0.7)
Build-Depends-Indep: mono-devel (>= 2.4.2.3),
libglib2.0-cil-dev, libgtk2.0-cil-dev
-Standards-Version: 3.8.3
+Standards-Version: 4.1.2
Homepage: http://www.brdstudio.net/yahtzeesharp/
Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/yahtzeesharp.git
Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/yahtzeesharp.git
--
2.14.1
From d9c53671b41d84fd936155ade5d11f9bf89c8794 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Mon, 25 Dec 2017 22:50:32 -0500
Subject: [PATCH 7/8] Update Vcs fields
---
debian/control | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 238350c..f8c511f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Build-Depends-Indep: mono-devel (>= 2.4.2.3),
libglib2.0-cil-dev, libgtk2.0-cil-dev
Standards-Version: 4.1.2
Homepage: http://www.brdstudio.net/yahtzeesharp/
-Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/yahtzeesharp.git
-Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/yahtzeesharp.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-cli-apps/packages/yahtzeesharp.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-cli-apps/packages/yahtzeesharp.git
Package: yahtzeesharp
Architecture: all
--
2.14.1
From 8bcbb58bca30f6dece962b7339eb147381185d0c Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Mon, 25 Dec 2017 23:03:38 -0500
Subject: [PATCH 8/8] releasing package yahtzeesharp version 1.1-6.1
---
debian/changelog | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index e8106fd..1a43d84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+yahtzeesharp (1.1-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop unnecessary Build-Depends on libart2.0-cil-dev (Closes: #885252)
+ * Add patches to fix that and to fix the build with autoreconf
+ * Switch to 3.0 (quilt) instead of an older quilt system
+ * Drop obsolete debian/menu, debian/dirs and .xpm
+ * Bump debhelper compat to 11
+ * Bump Standards-Version to 4.1.2
+ * Update Vcs fields
+
+ -- Jeremy Bicha <jbi...@debian.org> Mon, 25 Dec 2017 22:53:55 -0500
+
yahtzeesharp (1.1-6) unstable; urgency=medium
* No-change rebuild for CLR 4.5 transition
--
2.14.1
