[Pkg-mono-svn-commits] rev 4003 - gluezilla/trunk/debian mono-tools/trunk/debian

Jo Shields directhex-guest at alioth.debian.org
Tue Jun 30 09:20:51 UTC 2009 

Author: directhex-guest
Date: 2009-06-30 09:20:50 +0000 (Tue, 30 Jun 2009)
New Revision: 4003

Modified:
   gluezilla/trunk/debian/changelog
   gluezilla/trunk/debian/control
   gluezilla/trunk/debian/rules
   mono-tools/trunk/debian/changelog
   mono-tools/trunk/debian/control
   mono-tools/trunk/debian/rules
Log:
mono-tools (2.0-4) UNRELEASED; urgency=low

  * debian/monodoc.1,
    debian/monodoc-browser.manpages:
    + Provide a manpage for the "monodoc" command
  * debian/rules:
    + Enhance get-orig-source rule to produce consistent md5sums
  * debian/control:
    + Bump to Standards version 3.8.2

gluezilla (2.4.2-1) UNRELEASED; urgency=low

  * New upstream release
  * debian/control:
    + No-change bump to Standards 3.8.2
    + Remove optional xulrunner-1.9-dev build-dep. We're all agreed that
      a nice unversioned xulrunner-dev is better
  * debian/rules:
    + Modify get-orig-source rule to ensure md5sums always match



Modified: gluezilla/trunk/debian/changelog
===================================================================
--- gluezilla/trunk/debian/changelog	2009-06-15 07:33:20 UTC (rev 4002)
+++ gluezilla/trunk/debian/changelog	2009-06-30 09:20:50 UTC (rev 4003)
@@ -1,3 +1,15 @@
+gluezilla (2.4.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/control:
+    + No-change bump to Standards 3.8.2
+    + Remove optional xulrunner-1.9-dev build-dep. We're all agreed that
+      a nice unversioned xulrunner-dev is better
+  * debian/rules:
+    + Modify get-orig-source rule to ensure md5sums always match
+
+ -- Jo Shields <directhex at apebox.org>  Tue, 30 Jun 2009 10:05:50 +0100
+
 gluezilla (2.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: gluezilla/trunk/debian/control
===================================================================
--- gluezilla/trunk/debian/control	2009-06-15 07:33:20 UTC (rev 4002)
+++ gluezilla/trunk/debian/control	2009-06-30 09:20:50 UTC (rev 4003)
@@ -9,8 +9,8 @@
  libmono-dev,
  libnspr4-dev,
  libnss3-dev,
- xulrunner-dev (>= 1.9) | xulrunner-1.9-dev
-Standards-Version: 3.8.1
+ xulrunner-dev (>= 1.9)
+Standards-Version: 3.8.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/gluezilla/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mono/gluezilla/trunk/
 

Modified: gluezilla/trunk/debian/rules
===================================================================
--- gluezilla/trunk/debian/rules	2009-06-15 07:33:20 UTC (rev 4002)
+++ gluezilla/trunk/debian/rules	2009-06-30 09:20:50 UTC (rev 4003)
@@ -1,12 +1,28 @@
 #!/usr/bin/make -f
 export DH_VERBOSE=1
-upstream_version=$(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
+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
 
 get-orig-source:
-	uscan --force-download --download-version $(upstream_version) \
-		--repack --rename --destdir .
+	[ -d ../tarballs ] || mkdir ../tarballs
+	uscan \
+		--package $(DEB_SOURCE_NAME) \
+		--watchfile $(DEBIAN_DIR)/watch \
+		--upstream-version $(VERSION) \
+		--download-version $(VERSION) \
+		--destdir ../tarballs \
+		--force-download \
+		--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
 
 
 build: patch-stamp build-stamp

Modified: mono-tools/trunk/debian/changelog
===================================================================
--- mono-tools/trunk/debian/changelog	2009-06-15 07:33:20 UTC (rev 4002)
+++ mono-tools/trunk/debian/changelog	2009-06-30 09:20:50 UTC (rev 4003)
@@ -3,6 +3,10 @@
   * debian/monodoc.1,
     debian/monodoc-browser.manpages:
     + Provide a manpage for the "monodoc" command
+  * debian/rules:
+    + Enhance get-orig-source rule to produce consistent md5sums
+  * debian/control:
+    + Bump to Standards version 3.8.2
 
  -- Jo Shields <directhex at apebox.org>  Wed, 10 Jun 2009 19:42:00 +0100
 

Modified: mono-tools/trunk/debian/control
===================================================================
--- mono-tools/trunk/debian/control	2009-06-15 07:33:20 UTC (rev 4002)
+++ mono-tools/trunk/debian/control	2009-06-30 09:20:50 UTC (rev 4003)
@@ -21,7 +21,7 @@
  libmono-webbrowser0.5-cil,
  libwebkit1.0-cil,
  monodoc-base (>= 1.1.9)
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/mono-tools/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mono/mono-tools/trunk/
 

Modified: mono-tools/trunk/debian/rules
===================================================================
--- mono-tools/trunk/debian/rules	2009-06-15 07:33:20 UTC (rev 4002)
+++ mono-tools/trunk/debian/rules	2009-06-30 09:20:50 UTC (rev 4003)
@@ -2,8 +2,16 @@
 
 #export DH_VERBOSE=1
 export MONO_SHARED_DIR=$(CURDIR)
-CURVER = $(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/quilt/quilt.make
 
 configure: config-stamp
@@ -69,10 +77,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 $(CURVER) \
-		--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 clean-patched binary-indep binary install

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