Bug#783145: jessie-pu: package sqlcipher/3.2.0-1

[Micah Anderson <micah@debian.org>]

Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu

Hello!

It seems we missed the RC bug fix date, and now we are in the quiet
period. However, I have uploaded a NMU to unstable to fix #776987 so I
wanted to file a bug here, as was detailed in debian-devel-announce.

Please find attached the debdiff against the two source packages.

Micah


-- System Information:
Debian Release: 8.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

diff -Nru sqlcipher-3.2.0/debian/changelog sqlcipher-3.2.0/debian/changelog
--- sqlcipher-3.2.0/debian/changelog	2014-10-17 20:16:29.000000000 -0300
+++ sqlcipher-3.2.0/debian/changelog	2015-04-22 17:03:50.000000000 -0300
@@ -1,3 +1,11 @@
+sqlcipher (3.2.0-1.1) unstable; urgency=high
+
+  [ Ben Carrillo ]
+  * Non-maintainer upload.
+  * use a separate variable to track SQLCIPHER version (Closes: #776987)
+
+ -- Micah Anderson <micah@debian.org>  Wed, 22 Apr 2015 10:38:05 -0400
+
 sqlcipher (3.2.0-1) unstable; urgency=low
 
   * updated to latest upstream: v3.2.0
diff -Nru sqlcipher-3.2.0/debian/patches/20-change-name-to-sqlcipher.patch sqlcipher-3.2.0/debian/patches/20-change-name-to-sqlcipher.patch
--- sqlcipher-3.2.0/debian/patches/20-change-name-to-sqlcipher.patch	2014-10-17 00:24:01.000000000 -0300
+++ sqlcipher-3.2.0/debian/patches/20-change-name-to-sqlcipher.patch	2015-04-22 17:03:50.000000000 -0300
@@ -1,7 +1,38 @@
---- a/VERSION
-+++ b/VERSION
-@@ -1 +1 @@
--3.8.6
-\ No newline at end of file
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -89,6 +89,7 @@ TCC += $(OPTS)
+ VERSION = @VERSION@
+ VERSION_NUMBER = @VERSION_NUMBER@
+ RELEASE = @RELEASE@
++SQLCIPHER_VERSION = @SQLCIPHER_VERSION@
+ 
+ # Filename extensions
+ #
+--- /dev/null
++++ b/VERSION_SQLCIPHER
+@@ -0,0 +1 @@
 +3.2.0
-\ No newline at end of file
+--- a/configure.ac
++++ b/configure.ac
+@@ -179,6 +179,10 @@ VERSION_NUMBER=[`cat $srcdir/VERSION \
+ AC_MSG_NOTICE(Version number set to $VERSION_NUMBER)
+ AC_SUBST(VERSION_NUMBER)
+ 
++SQLCIPHER_VERSION=[`cat $srcdir/VERSION_SQLCIPHER | sed 's/^\([0-9]*\.*[0-9]*\).*/\1/'`]
++AC_MSG_NOTICE(SQLCipher Version set to $SQLCIPHER_VERSION)
++AC_SUBST(SQLCIPHER_VERSION)
++
+ #########
+ # Check to see if the --with-hints=FILE option is used.  If there is none,
+ # then check for a files named "$host.hints" and ../$hosts.hints where
+--- a/sqlcipher.pc.in
++++ b/sqlcipher.pc.in
+@@ -7,7 +7,7 @@ includedir=@includedir@
+ 
+ Name: SQLCipher
+ Description: SQL database engine
+-Version: @PACKAGE_VERSION@
++Version: @SQLCIPHER_VERSION@
+ Libs: -L${libdir} -lsqlcipher
+ Libs.private: @LIBS@
+ Cflags: -I${includedir}
diff -Nru sqlcipher-3.2.0/debian/patches/32-fix-pkgconfig-libname.patch sqlcipher-3.2.0/debian/patches/32-fix-pkgconfig-libname.patch
--- sqlcipher-3.2.0/debian/patches/32-fix-pkgconfig-libname.patch	2014-10-17 00:25:32.000000000 -0300
+++ sqlcipher-3.2.0/debian/patches/32-fix-pkgconfig-libname.patch	2015-04-22 17:03:50.000000000 -0300
@@ -1,7 +1,7 @@
 --- a/sqlcipher.pc.in
 +++ b/sqlcipher.pc.in
 @@ -10,4 +10,4 @@ Description: SQL database engine
- Version: @PACKAGE_VERSION@
+ Version: @SQLCIPHER_VERSION@
  Libs: -L${libdir} -lsqlcipher
  Libs.private: @LIBS@
 -Cflags: -I${includedir}