[Pkg-mono-svn-commits] rev 4008 - in mono-debugger/trunk/debian: . patches

Jo Shields directhex-guest at alioth.debian.org
Tue Jun 30 14:34:15 UTC 2009 

Author: directhex-guest
Date: 2009-06-30 14:34:13 +0000 (Tue, 30 Jun 2009)
New Revision: 4008

Modified:
   mono-debugger/trunk/debian/changelog
   mono-debugger/trunk/debian/control
   mono-debugger/trunk/debian/patches/use_real_nunit.dpatch
   mono-debugger/trunk/debian/rules
Log:
  * New upstream release
  * debian/control:
    + Switch from libmono1.0-cil to libmono-cecil-private-cil, as
      that's where cecil lives now
    + No-change bump to Standards 3.8.2
  * debian/rules:
    + Enhance get-orig-source rule to produce consistent md5sums
  * debian/patches/use_real_nunit.dpatch:
    + Updated


Modified: mono-debugger/trunk/debian/changelog
===================================================================
--- mono-debugger/trunk/debian/changelog	2009-06-30 12:11:40 UTC (rev 4007)
+++ mono-debugger/trunk/debian/changelog	2009-06-30 14:34:13 UTC (rev 4008)
@@ -1,3 +1,17 @@
+mono-debugger (2.4.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/control:
+    + Switch from libmono1.0-cil to libmono-cecil-private-cil, as
+      that's where cecil lives now
+    + No-change bump to Standards 3.8.2
+  * debian/rules:
+    + Enhance get-orig-source rule to produce consistent md5sums
+  * debian/patches/use_real_nunit.dpatch:
+    + Updated
+
+ -- Jo Shields <directhex at apebox.org>  Tue, 30 Jun 2009 15:15:13 +0100
+
 mono-debugger (2.4-2) unstable; urgency=low
 
   * Rebuild against Mono 2.4

Modified: mono-debugger/trunk/debian/control
===================================================================
--- mono-debugger/trunk/debian/control	2009-06-30 12:11:40 UTC (rev 4007)
+++ mono-debugger/trunk/debian/control	2009-06-30 14:34:13 UTC (rev 4008)
@@ -7,7 +7,7 @@
  dpatch,
  cli-common-dev (>= 0.4.4),
  mono-devel (>= 2.0),
- libmono1.0-cil,
+ libmono-cecil-private-cil,
  libmono-system-runtime2.0-cil,
  nunit-console,
  libnunit2.4-cil,
@@ -18,7 +18,7 @@
  libmono-dev (>= 2.0),
  libglib2.0-dev,
  libreadline5-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://www.mono-project.com/Debugger
 Vcs-Svn: svn://svn.debian.org/pkg-mono/mono-debugger/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mono/mono-debugger/trunk/

Modified: mono-debugger/trunk/debian/patches/use_real_nunit.dpatch
===================================================================
--- mono-debugger/trunk/debian/patches/use_real_nunit.dpatch	2009-06-30 12:11:40 UTC (rev 4007)
+++ mono-debugger/trunk/debian/patches/use_real_nunit.dpatch	2009-06-30 14:34:13 UTC (rev 4008)
@@ -5,10 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad mono-debugger-2.4~/build/Makefile.am mono-debugger-2.4/build/Makefile.am
---- mono-debugger-2.4~/build/Makefile.am	2009-04-28 23:19:46.000000000 +0100
-+++ mono-debugger-2.4/build/Makefile.am	2009-04-28 23:22:19.000000000 +0100
-@@ -100,8 +100,7 @@
+diff -urNad mono-debugger-2.4.2~/build/Makefile.am mono-debugger-2.4.2/build/Makefile.am
+--- mono-debugger-2.4.2~/build/Makefile.am	2009-06-30 15:25:54.000000000 +0100
++++ mono-debugger-2.4.2/build/Makefile.am	2009-06-30 15:26:47.000000000 +0100
+@@ -101,8 +101,7 @@
  	-r:Mono.GetOptions				\
  	-r:./Mono.Debugger.dll				\
  	-r:./Mono.Debugger.Frontend.dll			\
@@ -18,22 +18,22 @@
  
  if MARTIN_PRIVATE
  MCS_FLAGS += -define:MARTIN_PRIVATE
-diff -urNad mono-debugger-2.4~/configure.in mono-debugger-2.4/configure.in
---- mono-debugger-2.4~/configure.in	2009-04-28 23:19:46.000000000 +0100
-+++ mono-debugger-2.4/configure.in	2009-04-28 23:24:43.000000000 +0100
-@@ -191,9 +191,9 @@
-       AC_MSG_ERROR([Can't find "mcs" in your PATH])
-    fi
+diff -urNad mono-debugger-2.4.2~/configure.in mono-debugger-2.4.2/configure.in
+--- mono-debugger-2.4.2~/configure.in	2009-06-30 15:25:54.000000000 +0100
++++ mono-debugger-2.4.2/configure.in	2009-06-30 15:27:52.000000000 +0100
+@@ -179,9 +179,9 @@
+    AC_MSG_ERROR([Can't find "mcs" in your PATH])
+ fi
  
--   AC_PATH_PROG(NUNIT_CONSOLE, nunit-console2)
-+   AC_PATH_PROG(NUNIT_CONSOLE, nunit-console)
-    if test "x$NUNIT_CONSOLE" = "x" ; then
--     AC_MSG_ERROR([Can't find "nunit-console2" in your PATH])
-+     AC_MSG_ERROR([Can't find "nunit-console" in your PATH])
-    fi
+-AC_PATH_PROG(NUNIT_CONSOLE, nunit-console2)
++AC_PATH_PROG(NUNIT_CONSOLE, nunit-console)
+ if test "x$NUNIT_CONSOLE" = "x" ; then
+-  AC_MSG_ERROR([Can't find "nunit-console2" in your PATH])
++  AC_MSG_ERROR([Can't find "nunit-console" in your PATH])
  fi
  
-@@ -218,13 +218,13 @@
+ target_mono_prefix="$prefix"
+@@ -205,13 +205,13 @@
    TARGET_MONO="$MONO"
  
    ## Check NUnit
@@ -43,7 +43,7 @@
 +    AC_MSG_RESULT("Found nunit.pc")
    else
 -    AC_MSG_ERROR([Cannot find mono-nunit (mono-unit.pc for packageconfig)])
-+    AC_MSG_ERROR([Cannot find nunit (nunit.pc for packageconfig)])
++    AC_MSG_ERROR([Cannot find nunit (mono-unit.pc for packageconfig)])
    fi
 -  NUNIT_PREFIX=`pkg-config --variable=prefix mono-nunit`
 -  NUNIT_VERSION=`pkg-config --modversion mono-nunit`

Modified: mono-debugger/trunk/debian/rules
===================================================================
--- mono-debugger/trunk/debian/rules	2009-06-30 12:11:40 UTC (rev 4007)
+++ mono-debugger/trunk/debian/rules	2009-06-30 14:34:13 UTC (rev 4008)
@@ -1,8 +1,14 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 export MONO_SHARED_DIR=$(CURDIR)
-VERSION = $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2 | cut -d'-' -f1)
+MAKEFILE = $(firstword $(MAKEFILE_LIST))
+DEBIAN_DIR = $(dir $(MAKEFILE))
+SOURCE_DIR = $(DEBIAN_DIR)/..
 
+DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Version | cut -d" " -f2)
+DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
+VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
+
 include /usr/share/dpatch/dpatch.make
 
 CFLAGS = -Wall -g
@@ -80,10 +86,15 @@
 get-orig-source:
 	[ -d ../tarballs ] || mkdir ../tarballs
 	uscan \
+		--package $(DEB_SOURCE_NAME) \
+		--watchfile $(DEBIAN_DIR)/watch \
+		--upstream-version $(VERSION) \
+		--download-version $(VERSION) \
+		--destdir ../tarballs \
 		--force-download \
-		--download-version $(VERSION) \
-		--repack \
-		--rename \
-		--destdir ../tarballs
+		--rename
+	bzcat ../tarballs/$(DEB_SOURCE_NAME)_$(VERSION).orig.tar.bz2 | \
+		gzip -9fn -c - > ../tarballs/$(DEB_SOURCE_NAME)_$(VERSION).orig.tar.gz
+	rm ../tarballs/$(DEB_SOURCE_NAME)_$(VERSION).orig.tar.bz2
 
 .PHONY: build clean binary-indep binary-arch binary install configure

More information about the Pkg-mono-svn-commits mailing list