First shot at 3.0.1-3

diff --git a/debian/changelog b/debian/changelog
index 280874280f19c02b9cbc50135f59c7402c116a83..c4cb737aefec986ddf5e5f3bd29d4ad8a550872e 100644 (file)
--- 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 659a96d6b576dad32df976ab29b8633620a561c3..94a6ec1723222a472fd387b67e215a171ef4f8bf 100644 (file)
--- 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 (file)
index 5b4fdaf..0000000
--- 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          \