Drop patches applied upstream

5 files changed, 6 insertions, 55 deletions

diff --git a/debian/patches/01-Modify-distclean-and-install-targets.patch b/debian/patches/01-Modify-distclean-and-install-targets.patch
deleted file mode 100644
index 7582dae..0000000
--- a/debian/patches/01-Modify-distclean-and-install-targets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Modify distclean and install targets.
- Modified distclean target to allow for dh_clean to complete successfully.
- Modified install target to use correct file permissions.
-Author: Ahmed Toulan <thelinuxer@ubuntu.com>
-
---- a/Makefile
-+++ b/Makefile
-@@ -27,13 +27,13 @@
- 
- distclean : clean
- 	rm -f .*.m
--	rm -r images/gdigi_icon.h
-+	rm -f images/gdigi_icon.h
- 	rm -f gdigi
- 
- install: gdigi
- 	install gdigi $(DESTDIR)/usr/bin
--	install gdigi.desktop $(DESTDIR)/usr/share/applications/
--	install images/gdigi.png $(DESTDIR)/usr/share/icons/
-+	install -m 0644 gdigi.desktop $(DESTDIR)/usr/share/applications/
-+	install -m 0644 images/gdigi.png $(DESTDIR)/usr/share/icons/
- 
- NODEP_TARGETS := clean distclean
- depinc := 1
diff --git a/debian/patches/02-Update-categories-in-gdigi-desktop-file.patch b/debian/patches/02-Update-categories-in-gdigi-desktop-file.patch
deleted file mode 100644
index fa4e556..0000000
--- a/debian/patches/02-Update-categories-in-gdigi-desktop-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Update categories in gdigi.desktop file
-Author: Ahmed Toulan <thelinuxer@ubuntu.com>
-
---- a/gdigi.desktop
-+++ b/gdigi.desktop
-@@ -3,6 +3,7 @@
- Type=Application
- Name=gdigi
- Exec=gdigi
--Categories=GNOME;Audio;AudioVideo;
-+Categories=GTK;Audio;AudioVideo;
- Icon=gdigi
-+X-Desktop-File-Install-Version=0.20
- 
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
index a75c23f..febe34e 100644
--- a/debian/patches/cross.patch
+++ b/debian/patches/cross.patch
@@ -6,10 +6,10 @@ gdigi fails to cross build from source, because the upstream Makefile
 hard codes the build architecture pkg-config. Making it substitutable is
 sufficient to making gdigi cross buildable.
 
---- gdigi-0.4.0.orig/Makefile
-+++ gdigi-0.4.0/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -1,9 +1,10 @@
- CC = gcc
+ CC ?= gcc
 +PKG_CONFIG ?= pkg-config
  EXTRA_CFLAGS ?=
  EXTRA_LDFLAGS ?=
diff --git a/debian/patches/gcc-10.patch b/debian/patches/gcc-10.patch
index 299cc3c..ac20487 100644
--- a/debian/patches/gcc-10.patch
+++ b/debian/patches/gcc-10.patch
@@ -6,18 +6,9 @@ Forwarded: no
 
 ---
 
---- gdigi-0.4.0.orig/gdigi.h
-+++ gdigi-0.4.0/gdigi.h
-@@ -42,7 +42,7 @@ gboolean debug_flag_is_set (debug_flags_
- #define GNX_CABINET_WARP 263
- #define GNX_CHANNEL_FS_MODE 264
- 
--unsigned char product_id;
-+extern unsigned char product_id;
- 
- enum {
-   GNX3K_WAH_TYPE_CRY = 129,
-@@ -1105,7 +1105,7 @@ enum {
+--- a/gdigi.h
++++ b/gdigi.h
+@@ -1114,7 +1114,7 @@ enum {
      GENETX_TYPE_CABINET
  };
  
diff --git a/debian/patches/series b/debian/patches/series
index 54bb4ca..1420015 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-01-Modify-distclean-and-install-targets.patch
-02-Update-categories-in-gdigi-desktop-file.patch
 gcc-10.patch
 cross.patch