From: Jakob Haufe <sur5r@sur5r.net>
Date: Sat, 7 Sep 2013 17:17:16 +0000 (+0200)
Subject: First shot at 3.0.1-3
X-Git-Tag: debian/3.0.1-3~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e0f067716b75079574b7c47908ec2e4f04a51573;p=glabels

First shot at 3.0.1-3
---

diff --git a/debian/changelog b/debian/changelog
index 28087428..c4cb737a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+glabels (3.0.1-3) UNRELEASED; urgency=low
+
+  * Refresh debian/patches
+  * Cherry-pick 6b7d7e831e5542b6ea3c15802fa882a42399fc15 from upstream
+    as 0004-unbreak-with-evolution-data-server-3.6.0.patch
+    (Closes: #722033)
+  * Bump Standards-Version (no changes needed)
+
+ -- Jakob Haufe <sur5r@sur5r.net>  Sat, 07 Sep 2013 19:01:45 +0200
+
 glabels (3.0.1-2) experimental; urgency=low
 
   * Pre-depend on dpkg >= 1.15.6~ as we are using xz.
diff --git a/debian/control b/debian/control
index 659a96d6..94a6ec17 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: autotools-dev,
                barcode (>= 0.98),
                libqrencode-dev (>= 3.1.0),
                libiec16022-dev (>= 0.2.4)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://glabels.sourceforge.net/
 
 Package: glabels
diff --git a/debian/patches/0007-Ignore-license.page.patch b/debian/patches/0007-Ignore-license.page.patch
deleted file mode 100644
index 5b4fdaf8..00000000
--- a/debian/patches/0007-Ignore-license.page.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Jakob Haufe <sur5r@sur5r.net>
-Date: Mon, 9 Apr 2012 18:40:04 +0200
-Subject: Ignore license.page
-Forwarded: not-needed
-
----
- help/Makefile.am |    1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/help/Makefile.am b/help/Makefile.am
-index 1185a90..1427128 100644
---- a/help/Makefile.am
-+++ b/help/Makefile.am
-@@ -34,7 +34,6 @@ DOC_PAGES = \
- 	editprop.page		\
- 	index.page		\
- 	labelprop.page		\
--	license.page		\
- 	mancreate.page		\
- 	merge-ex1.page		\
- 	merge-ex2.page		\