[Pkg-cli-apps-commits] r4743 - in /packages/yahtzeesharp/trunk/debian: patches/01_fix_build_system patches/02_fix_desktop_file rules

[sebner-guest at users.alioth.debian.org]

Author: sebner-guest
Date: Sat Mar 21 19:52:55 2009
New Revision: 4743

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4743
Log:
Fix crappy upstream directory design

Modified:
    packages/yahtzeesharp/trunk/debian/patches/01_fix_build_system
    packages/yahtzeesharp/trunk/debian/patches/02_fix_desktop_file
    packages/yahtzeesharp/trunk/debian/rules

Modified: packages/yahtzeesharp/trunk/debian/patches/01_fix_build_system
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/yahtzeesharp/trunk/debian/patches/01_fix_build_system?rev=4743&op=diff
==============================================================================
--- packages/yahtzeesharp/trunk/debian/patches/01_fix_build_system (original)
+++ packages/yahtzeesharp/trunk/debian/patches/01_fix_build_system Sat Mar 21 19:52:55 2009
@@ -1,7 +1,7 @@
-Index: yahtzeesharp-1.1/yahtzeesharp-1.1/Makefile.in
+Index: yahtzeesharp-1.1/Makefile.in
 ===================================================================
---- yahtzeesharp-1.1.orig/yahtzeesharp-1.1/Makefile.in	2009-03-21 11:59:24.000000000 +0100
-+++ yahtzeesharp-1.1/yahtzeesharp-1.1/Makefile.in	2009-03-21 12:00:04.000000000 +0100
+--- yahtzeesharp-1.1.orig/Makefile.in	2009-03-21 11:59:24.000000000 +0100
++++ yahtzeesharp-1.1/Makefile.in	2009-03-21 12:00:04.000000000 +0100
 @@ -82,7 +82,7 @@
  ECHO_T = @ECHO_T@
  GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
@@ -11,10 +11,10 @@
  GTK_SHARP_20_CFLAGS = @GTK_SHARP_20_CFLAGS@
  GTK_SHARP_20_LIBS = @GTK_SHARP_20_LIBS@
  INSTALL = @INSTALL@
-Index: yahtzeesharp-1.1/yahtzeesharp-1.1/YahtzeeSharp/Makefile.am
+Index: yahtzeesharp-1.1/YahtzeeSharp/Makefile.am
 ===================================================================
 --- yahtzeesharp-1.1.orig/yahtzeesharp-1.1/YahtzeeSharp/Makefile.am	2009-03-21 12:00:41.000000000 +0100
-+++ yahtzeesharp-1.1/yahtzeesharp-1.1/YahtzeeSharp/Makefile.am	2009-03-21 12:01:08.000000000 +0100
++++ yahtzeesharp-1.1/YahtzeeSharp/Makefile.am	2009-03-21 12:01:08.000000000 +0100
 @@ -4,7 +4,7 @@
  # Warning: This is an automatically generated file, do not edit!
  
@@ -33,10 +33,10 @@
  ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG "-main:MainClass"
  
  ASSEMBLY = bin/Release/YahtzeeSharp.exe
-Index: yahtzeesharp-1.1/yahtzeesharp-1.1/YahtzeeSharp/Makefile.in
+Index: yahtzeesharp-1.1/YahtzeeSharp/Makefile.in
 ===================================================================
 --- yahtzeesharp-1.1.orig/yahtzeesharp-1.1/YahtzeeSharp/Makefile.in	2009-03-21 12:00:41.000000000 +0100
-+++ yahtzeesharp-1.1/yahtzeesharp-1.1/YahtzeeSharp/Makefile.in	2009-03-21 12:01:43.000000000 +0100
++++ yahtzeesharp-1.1/YahtzeeSharp/Makefile.in	2009-03-21 12:01:43.000000000 +0100
 @@ -72,7 +72,7 @@
  ECHO_T = @ECHO_T@
  GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@

Modified: packages/yahtzeesharp/trunk/debian/patches/02_fix_desktop_file
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/yahtzeesharp/trunk/debian/patches/02_fix_desktop_file?rev=4743&op=diff
==============================================================================
--- packages/yahtzeesharp/trunk/debian/patches/02_fix_desktop_file (original)
+++ packages/yahtzeesharp/trunk/debian/patches/02_fix_desktop_file Sat Mar 21 19:52:55 2009
@@ -1,7 +1,7 @@
-Index: yahtzeesharp-1.1/yahtzeesharp-1.1/YahtzeeSharp/YahtzeeSharp.desktop
+Index: yahtzeesharp-1.1/YahtzeeSharp/YahtzeeSharp.desktop
 ===================================================================
 --- yahtzeesharp-1.1.orig/yahtzeesharp-1.1/YahtzeeSharp/YahtzeeSharp.desktop	2009-03-21 12:02:24.000000000 +0100
-+++ yahtzeesharp-1.1/yahtzeesharp-1.1/YahtzeeSharp/YahtzeeSharp.desktop	2009-03-21 12:05:17.000000000 +0100
++++ yahtzeesharp-1.1/YahtzeeSharp/YahtzeeSharp.desktop	2009-03-21 12:05:17.000000000 +0100
 @@ -1,10 +1,10 @@
 -
  [Desktop Entry]

Modified: packages/yahtzeesharp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/yahtzeesharp/trunk/debian/rules?rev=4743&op=diff
==============================================================================
--- packages/yahtzeesharp/trunk/debian/rules (original)
+++ packages/yahtzeesharp/trunk/debian/rules Sat Mar 21 19:52:55 2009
@@ -1,24 +1,44 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
+
+MAKEFILE = $(firstword $(MAKEFILE_LIST))
+DEBIAN_DIR = $(dir $(MAKEFILE))
+SOURCE_DIR = $(DEBIAN_DIR)/..
+
+DEB_VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
+DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
+VERSION = $(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
 
 include /usr/share/cli-common/cli.make
 include /usr/share/quilt/quilt.make
 
-override_dh_auto_configure:
-	( cd yahtzeesharp-1.1/ ; ./configure --prefix=/usr --bindir=/usr/games \
-	GMCS=/usr/bin/csc )
 
-override_dh_auto_build:
-	( cd yahtzeesharp-1.1/ ; make )
+get-orig-source:
+	uscan \
+		--package $(DEB_SOURCE_NAME) \
+		--watchfile $(DEBIAN_DIR)/watch \
+		--upstream-version $(VERSION) \
+		--download-version $(VERSION) \
+		--destdir . \
+		--force-download \
+		--rename \
+		--repack
 
-override_dh_auto_install:
-	( cd yahtzeesharp-1.1/ ; make DESTDIR=$(CURDIR)/debian/yahtzeesharp/ install )
+	if [ -d $(DEB_SOURCE_NAME)-$(VERSION) ]; then \
+		echo "$(DEB_SOURCE_NAME)-$(VERSION) is in the way, bailing out!"; \
+		exit 1; \
+	fi
+	tar -xzf $(DEB_SOURCE_NAME)_$(VERSION).orig.tar.gz
+	rm $(DEB_SOURCE_NAME)_$(VERSION).orig.tar.gz
+	mv yahtzeesharp-*/* .
+	tar -czf $(DEB_SOURCE_NAME)_$(VERSION).orig.tar.gz $(DEB_SOURCE_NAME)-$(VERSION)
+	rm -r $(DEB_SOURCE_NAME)-$(VERSION)
 
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
-	dh build
-	touch $@
+	dh_auto_configure -- GMCS=/usr/bin/csc CSC=/usr/bin/csc \
+	--prefix=/usr --bindir=/usr/games
 
 install: install-stamp
 install-stamp: build