[rkward-cvs] SF.net SVN: rkward:[4343] trunk/rkward/debian

[tfry at users.sourceforge.net]

Revision: 4343
          http://rkward.svn.sourceforge.net/rkward/?rev=4343&view=rev
Author:   tfry
Date:     2012-10-02 08:36:11 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
Remove the hardy menu patch

Modified Paths:
--------------
    trunk/rkward/debian/changelog
    trunk/rkward/debian/rules

Removed Paths:
-------------
    trunk/rkward/debian/patches/

Modified: trunk/rkward/debian/changelog
===================================================================
--- trunk/rkward/debian/changelog	2012-10-02 08:29:29 UTC (rev 4342)
+++ trunk/rkward/debian/changelog	2012-10-02 08:36:11 UTC (rev 4343)
@@ -1,8 +1,9 @@
-rkward (0.5.7z+0.5.8-0devel1) unstable; urgency=low
+rkward (0.5.7z+0.6.0-0devel1) unstable; urgency=low
 
   * new upstream release
+  * remove support for building on Ubuntu hardy
 
- -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Mon, 25 Oct 2011 15:30:00 +0200
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Tue, 02 Oct 2012 15:30:00 +0200
 
 rkward (0.5.7-2) unstable; urgency=low
 

Modified: trunk/rkward/debian/rules
===================================================================
--- trunk/rkward/debian/rules	2012-10-02 08:29:29 UTC (rev 4342)
+++ trunk/rkward/debian/rules	2012-10-02 08:36:11 UTC (rev 4343)
@@ -5,20 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Determine the installed distribution and release number
-# Will be used to determine if certain tweaks are needed, see below
-# NOTE: /etc/lsb-release is part of package base-files, *only on Ubuntu*, not on Debian.
-# For now this is ok, as we only need special handling for Ubuntu Hardy at this time.
-DISTRO = $(shell grep "DISTRIB_ID" /etc/lsb-release | awk -F= '{print $$2}' ; grep "DISTRIB_RELEASE" /etc/lsb-release | awk -F= '{print $$2}')
-
-# Ubuntu 8.04 uses a different PATH for KDE 4 apps and needs some patching
-ifeq ("$(DISTRO)","Ubuntu 8.04")
-	export PATH := $(PATH):/usr/lib/kde4/bin
-	# If the following variables are set, patches are applied
-	PATCHTARGET = patch-ubuntu804
-	UNPATCHTARGET = unpatch
-endif
-
 # For CXXFLAGS and CFLAGS.
 # See http://lists.debian.org/debian-devel-announce/2011/09/msg00001.html 
 DPKG_EXPORT_BUILDFLAGS = 1
@@ -42,7 +28,7 @@
 	CFLAGS += -O2
 endif
 
-config.status: $(PATCHTARGET) # Will only be called if set, see above
+config.status:
 	dh_testdir
 
 	mkdir -p $(CURDIR)/build
@@ -82,13 +68,12 @@
 
 	touch build-stamp
 
-clean: $(UNPATCHTARGET) # Will only be called if set, see above
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
 	# remove any .svn subdir included by accident
 	rm -rf $(CURDIR)/debian/.svn
-	rm -rf $(CURDIR)/debian/patches/.svn
 
 	# Add here commands to clean up after the build process.
 	rm -rf $(CURDIR)/build/
@@ -146,13 +131,5 @@
 	dh_md5sums
 	dh_builddeb
 
-patch-ubuntu804:
-	dpatch apply 10_hardy_menu
-	dpatch cat-all >patch-stamp
- 
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch-ubuntu804 unpatch
+.PHONY: build clean binary-indep binary-arch binary install

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.