10 files changed, 64 insertions, 36 deletions
diff --git a/debian/changelog b/debian/changelog
index 315e78e..7c3a303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,30 @@
+gdigi (0.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Modify clean target in Makefile for dh_clean step to succeed.
+  * Set the correct permissions in install target.
+  * Added libglib2.0-dev to Build-Depends.
+  * Dropped debian/gdigi.png as upstream tarball now includes that file.
+  * Removed 01-Add-application-icon-to-gdigi.desktop-file.patch.
+  * Added a new patch to update categories in gdigi.desktop file.
+
+ -- Ahmed Toulan <thelinuxer@ubuntu.com>  Tue, 29 Jan 2013 17:14:41 +0200
+
 gdigi (0.3.0-1) unstable; urgency=low
 
-  * New upstream release
-  * Added Andrew O. Shadoura <bugzilla@tut.by> to Uploaders
+  * New upstream release.
+  * Added Andrew Shadura <bugzilla@tut.by> to Uploaders.
   * Added libxml2-dev to Build-Depends and replace libgtk2.0-dev with
-    libgtk-3-dev
-  * Bumped Standards-Version to 3.9.3
-  * Added watch file
+    libgtk-3-dev.
+  * Bumped Standards-Version to 3.9.3 (no changes required).
+  * Added watch file.
   * Changed copyright on debian/* and added Islam Alwazery <wazery@ubuntu.com>
-    on debian/gdigi.png and debian/gdigi.xpm
-  * Added application xpm to the menu file 
+    on debian/gdigi.png and debian/gdigi.xpm.
+  * Added application xpm to the menu file.
   * Added application icon to gdigi.desktop file. Changed GNOME category to GTK.
-  * Dropped git-orig-source rule
+  * Dropped no longer needed get-orig-source rule.
 
- -- Ahmed Toulan <thelinuxer@ubuntu.com>  Mon, 10 April 2012 17:55:51 +0200
+ -- Ahmed Toulan <thelinuxer@ubuntu.com>  Sun, 29 Jul 2012 06:17:10 +0000
 
 gdigi (0.2.0+hg20110905r195-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 586fac3..1c10d9b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: gdigi
 Section: sound
 Priority: extra
 Maintainer: Ahmed Toulan <thelinuxer@ubuntu.com>
-Uploaders: Andrew O. Shadoura <bugzilla@tut.by>
-Build-Depends: debhelper (>= 7), libexpat1-dev (>= 2.0.0), libgtk-3-dev , libasound2-dev, libxml2-dev
+Uploaders: Andrew Shadura <bugzilla@tut.by>
+Build-Depends: debhelper (>= 7), libasound2-dev, libgtk-3-dev , libglib2.0-dev, libexpat1-dev (>= 2.0.0), libxml2-dev
 Standards-Version: 3.9.3
 Homepage: http://desowin.org/gdigi/
 Vcs-hg: http://anonscm.debian.org/hg/collab-maint/gdigi/#debian
diff --git a/debian/dirs b/debian/dirs
index a59ccc8..c72855a 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,3 +1,4 @@
 usr/bin
 usr/share/applications
+usr/share/icons
 usr/share/pixmaps
diff --git a/debian/gdigi.install b/debian/gdigi.install
index 4bcfc23..a2e86ed 100644
--- a/debian/gdigi.install
+++ b/debian/gdigi.install
@@ -1,2 +1 @@
 debian/gdigi.xpm /usr/share/pixmaps/
-debian/gdigi.png /usr/share/pixmaps/
diff --git a/debian/gdigi.png b/debian/gdigi.png
deleted file mode 100644
index 0981953..0000000
--- a/debian/gdigi.png
+++ /dev/null
diff --git a/debian/patches/01-Modify-distclean-and-install-targets.patch b/debian/patches/01-Modify-distclean-and-install-targets.patch
new file mode 100644
index 0000000..7582dae
--- /dev/null
+++ b/debian/patches/01-Modify-distclean-and-install-targets.patch
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 0000000..fa4e556
--- /dev/null
+++ b/debian/patches/02-Update-categories-in-gdigi-desktop-file.patch
@@ -0,0 +1,14 @@
+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/Add-application-icon-to-gdigi.desktop-file b/debian/patches/Add-application-icon-to-gdigi.desktop-file
deleted file mode 100644
index 9fd6e55..0000000
--- a/debian/patches/Add-application-icon-to-gdigi.desktop-file
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Add application icon to gdigi.desktop file
- Add application icon to gdigi.desktop file. Change GNOME category to GTK.
- .
- gdigi (0.3.0-1) unstable; urgency=low
- .
-   * New upstream release
-Author: Ahmed Toulan <thelinuxer@ubuntu.com>
-
---- gdigi-0.3.0.orig/gdigi.desktop
-+++ gdigi-0.3.0/gdigi.desktop
-@@ -1,7 +1,10 @@
-+
- [Desktop Entry]
- Version=1.0
- Type=Application
- Name=gdigi
- Exec=gdigi
--Categories=GNOME;Audio;AudioVideo;
-+Icon=gdigi
-+Categories=GTK;Audio;AudioVideo;
- 
-+X-Desktop-File-Install-Version=0.20
diff --git a/debian/patches/series b/debian/patches/series
index f2d57d3..ff8b79a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-Add-application-icon-to-gdigi.desktop-file
+01-Modify-distclean-and-install-targets.patch
+02-Update-categories-in-gdigi-desktop-file.patch
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
deleted file mode 100644
index 1958297..0000000
--- a/debian/source/include-binaries
+++ /dev/null
@@ -1 +0,0 @@
-debian/gdigi.png