[hkl] 03/03: prepare for release

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch experimental
in repository hkl.

commit 1532e5926ef43c70543e57687d597e7b76496bde
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Tue Jun 30 14:54:59 2015 +0200

    prepare for release
---
 debian/changelog                       |  6 +++---
 debian/patches/0001-fix-3d-model.patch | 22 ----------------------
 debian/patches/series                  |  1 -
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e9679e..e1691c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-hkl (4.99.99.1940-1~exp1) UNRELEASED; urgency=low
+hkl (4.99.99.1946-1~exp1) experimental; urgency=low
 
-  * Imported Upstream version 4.99.99.1892
+  * Imported Upstream version 4.99.99.1946
   * debian/copyright updated
   * debian/control
     - Bump Standards-Version to 3.9.6 (nothing to do)
@@ -29,7 +29,7 @@ hkl (4.99.99.1940-1~exp1) UNRELEASED; urgency=low
   * debian/rules
     - use dh_install --fail-missing to check for uninstalled files.
 
- -- Picca Frédéric-Emmanuel <picca at debian.org>  Mon, 04 May 2015 10:22:27 +0200
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Thu, 30 Jun 2015 10:22:27 +0200
 
 hkl (4.0.3-4) unstable; urgency=low
 
diff --git a/debian/patches/0001-fix-3d-model.patch b/debian/patches/0001-fix-3d-model.patch
deleted file mode 100644
index e31e6df..0000000
--- a/debian/patches/0001-fix-3d-model.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
- <picca at synchrotron-soleil.fr>
-Date: Mon, 4 May 2015 11:33:31 +0200
-Subject: fix 3d model
-
----
- gui/hkl-gui-macros.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gui/hkl-gui-macros.h b/gui/hkl-gui-macros.h
-index 3031615..67dd616 100644
---- a/gui/hkl-gui-macros.h
-+++ b/gui/hkl-gui-macros.h
-@@ -39,7 +39,7 @@
- #define get_model(filename)						\
- 	(0 == access(filename, R_OK)) ? filename :			\
- 	((0 == access("../data/" filename, R_OK)) ? "../data/" filename : \
--	 ((0 == access(PKGDATA "hkl3d" filename, R_OK)) ? PKGDATA "hkl3d" filename : NULL))
-+	 ((0 == access(PKGDATA "/hkl3d/" filename, R_OK)) ? PKGDATA "/hkl3d/" filename : NULL))
- 
- static void get_ui(GtkBuilder *builder, const char *filename)
- {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1429d78..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-fix-3d-model.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hkl.git