aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-06-16 17:12:41 +0200
committerGuido Günther <agx@sigxcpu.org>2014-02-05 08:38:26 +0100
commit59ed3390b9a798ff8bf9133cbc28c4539ad99f42 (patch)
tree2009d57abbd0061b4ee230516e004eb83509aac5 /debian
parentbbf8a053e07c66f336ed46a7fb6105dc30645596 (diff)
parent3dbe8df8bfe8741e1b9a48b56e41517816f17dc1 (diff)
Imported Debian patch 0.4.997-1debian/0.4.997-1
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog14
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/watch2
3 files changed, 16 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 000a468..577a4bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+modemmanager (0.4.997-1) unstable; urgency=low
+
+ * debian/watch: Switch to .bz2 tarballs.
+ * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org> Thu, 16 Jun 2011 17:12:41 +0200
+
+modemmanager (0.4.997-0ubuntu1) oneiric; urgency=low
+
+ * New upstream release 0.4.997.
+ + switch to git branch MM_05.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Thu, 09 Jun 2011 09:41:20 -0400
+
modemmanager (0.4+git.20110429t103114.863dbca-1) unstable; urgency=low
[ Thomas Bechtold ]
diff --git a/debian/rules b/debian/rules
index b75af87..d61f645 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//'
DEB_MAJOR_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/git.*//')
GIT_URL := git://anongit.freedesktop.org/ModemManager/ModemManager
-GIT_BRANCH := "master"
+GIT_BRANCH := "MM_05"
GIT_BRANCH_NAME := ModemManager
ifneq (,$(LOCAL_BRANCH))
diff --git a/debian/watch b/debian/watch
index 11e0972..b586c1a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://ftp.gnome.org/pub/gnome/sources/ModemManager/([\d\.]+)/ModemManager-(.*)\.tar\.gz
+http://ftp.gnome.org/pub/gnome/sources/ModemManager/([\d\.]+)/ModemManager-(.*)\.tar\.bz2