Hey Lazslo,

I updated seamlik's patch to work with the 1.0.1 version of this package.  It
adds libzopfli1 and libzopfli-dev based on upstream's Makefile.  We really
need this for the android-tools work.  I can upload a v1.0.1-1.1 as an NMU if
you want, or just let you do it.

.hc
diff -Nru zopfli-1.0.1/debian/changelog zopfli-1.0.1/debian/changelog
--- zopfli-1.0.1/debian/changelog       2015-10-22 16:54:35.000000000 +0200
+++ zopfli-1.0.1/debian/changelog       2015-11-10 20:53:36.000000000 +0100
@@ -1,3 +1,10 @@
+zopfli (1.0.1-2) UNRELEASED; urgency=low
+
+  * New packages: libzopfli1 and libzopfli-dev
+  * Drop hardened_build.patch: No longer needed
+
+ -- Kai-Chung Yan <seamli...@gmail.com>  Fri, 31 Jul 2015 20:06:30 +0800
+
 zopfli (1.0.1-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru zopfli-1.0.1/debian/control zopfli-1.0.1/debian/control
--- zopfli-1.0.1/debian/control 2015-10-22 16:45:52.000000000 +0200
+++ zopfli-1.0.1/debian/control 2015-11-10 20:52:13.000000000 +0100
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~)
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), dh-exec
 Standards-Version: 3.9.6
 Homepage: https://github.com/google/zopfli
 
@@ -14,3 +14,27 @@
  compressor. This compressor takes more time (~100x slower), but compresses
  around 5% better than zlib and better than any other zlib-compatible
  compressor we have found.
+
+Package: libzopfli1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: zlib (gzip, deflate) compatible compressor library
+ Zopfli Compression Algorithm is a new zlib (gzip, deflate) compatible
+ compressor. This compressor takes more time (~100x slower), but compresses
+ around 5% better than zlib and better than any other zlib-compatible
+ compressor we have found.
+ .
+ This package contains the dynamic library version of zopfli.
+
+Package: libzopfli-dev
+Architecture: any
+Section: libdevel
+Depends: libzopfli1 (= ${binary:Version}), ${misc:Depends}
+Description: zlib (gzip, deflate) compatible compressor library - Development 
files
+ Zopfli Compression Algorithm is a new zlib (gzip, deflate) compatible
+ compressor. This compressor takes more time (~100x slower), but compresses
+ around 5% better than zlib and better than any other zlib-compatible
+ compressor we have found.
+ .
+ This package contains the development files.
\ No newline at end of file
diff -Nru zopfli-1.0.1/debian/libzopfli1.install 
zopfli-1.0.1/debian/libzopfli1.install
--- zopfli-1.0.1/debian/libzopfli1.install      1970-01-01 01:00:00.000000000 
+0100
+++ zopfli-1.0.1/debian/libzopfli1.install      2015-11-10 21:45:09.000000000 
+0100
@@ -0,0 +1,3 @@
+#!/usr/bin/dh-exec
+
+libzopfli.so.*   usr/lib/${DEB_HOST_MULTIARCH}
\ No newline at end of file
diff -Nru zopfli-1.0.1/debian/libzopfli1.links 
zopfli-1.0.1/debian/libzopfli1.links
--- zopfli-1.0.1/debian/libzopfli1.links        1970-01-01 01:00:00.000000000 
+0100
+++ zopfli-1.0.1/debian/libzopfli1.links        2015-11-10 21:45:09.000000000 
+0100
@@ -0,0 +1,3 @@
+#!/usr/bin/dh-exec
+
+usr/lib/${DEB_HOST_MULTIARCH}/libzopfli.so.1.0.1   
usr/lib/${DEB_HOST_MULTIARCH}/libzopfli.so.1
\ No newline at end of file
diff -Nru zopfli-1.0.1/debian/libzopfli-dev.install 
zopfli-1.0.1/debian/libzopfli-dev.install
--- zopfli-1.0.1/debian/libzopfli-dev.install   1970-01-01 01:00:00.000000000 
+0100
+++ zopfli-1.0.1/debian/libzopfli-dev.install   2015-11-10 21:45:09.000000000 
+0100
@@ -0,0 +1,4 @@
+#!/usr/bin/dh-exec
+
+libzopfli.a    usr/lib/${DEB_HOST_MULTIARCH}
+src/zopfli/*.h usr/include/zopfli
\ No newline at end of file
diff -Nru zopfli-1.0.1/debian/libzopfli-dev.links 
zopfli-1.0.1/debian/libzopfli-dev.links
--- zopfli-1.0.1/debian/libzopfli-dev.links     1970-01-01 01:00:00.000000000 
+0100
+++ zopfli-1.0.1/debian/libzopfli-dev.links     2015-11-10 21:45:09.000000000 
+0100
@@ -0,0 +1,3 @@
+#!/usr/bin/dh-exec
+
+usr/lib/${DEB_HOST_MULTIARCH}/libzopfli.so.1.0.1   
usr/lib/${DEB_HOST_MULTIARCH}/libzopfli.so
\ No newline at end of file
diff -Nru zopfli-1.0.1/debian/patches/generate-static-lib.patch 
zopfli-1.0.1/debian/patches/generate-static-lib.patch
--- zopfli-1.0.1/debian/patches/generate-static-lib.patch       1970-01-01 
01:00:00.000000000 +0100
+++ zopfli-1.0.1/debian/patches/generate-static-lib.patch       2015-11-10 
20:57:56.000000000 +0100
@@ -0,0 +1,10 @@
+--- a/Makefile
++++ b/Makefile
+@@ -26,6 +26,7 @@ zopfli:
+ libzopfli:
+       $(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
+       $(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) -shared -Wl,-soname,libzopfli.so.1 -o 
libzopfli.so.1.0.1
++      $(AR) rs libzopfli.a $(ZOPFLILIB_OBJ)
+ 
+ # ZopfliPNG binary
+ zopflipng:
diff -Nru zopfli-1.0.1/debian/patches/hardened_build.patch 
zopfli-1.0.1/debian/patches/hardened_build.patch
--- zopfli-1.0.1/debian/patches/hardened_build.patch    2015-10-22 
16:48:38.000000000 +0200
+++ zopfli-1.0.1/debian/patches/hardened_build.patch    1970-01-01 
01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-Description: build with hardening enabled
- Add $LDFLAGS to the makefile .
-Author: Laszlo Boszormenyi (GCS) <g...@debian.org>
-Forwarded: not-needed
-Last-Update: 2015-10-22
-
----
-
---- zopfli-1.0.1.orig/Makefile
-+++ zopfli-1.0.1/Makefile
-@@ -20,7 +20,7 @@ ZOPFLIPNGBIN_SRC := src/zopflipng/zopfli
- 
- # Zopfli binary
- zopfli:
--      $(CC) $(ZOPFLILIB_SRC) $(ZOPFLIBIN_SRC) $(CFLAGS) -o zopfli
-+      $(CC) $(ZOPFLILIB_SRC) $(ZOPFLIBIN_SRC) $(CFLAGS) $(LDFLAGS) -o zopfli
- 
- # Zopfli shared library
- libzopfli:
-@@ -30,7 +30,7 @@ libzopfli:
- # ZopfliPNG binary
- zopflipng:
-       $(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -c
--      $(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) 
$(ZOPFLIPNGBIN_SRC) $(CFLAGS) -o zopflipng
-+      $(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) 
$(ZOPFLIPNGBIN_SRC) $(CFLAGS) $(LDFLAGS) -o zopflipng
- 
- # ZopfliPNG shared library
- libzopflipng:
diff -Nru zopfli-1.0.1/debian/patches/series zopfli-1.0.1/debian/patches/series
--- zopfli-1.0.1/debian/patches/series  2015-10-22 16:48:46.000000000 +0200
+++ zopfli-1.0.1/debian/patches/series  2015-11-10 20:56:22.000000000 +0100
@@ -1 +1 @@
-hardened_build.patch
+generate-static-lib.patch
diff -Nru zopfli-1.0.1/debian/rules zopfli-1.0.1/debian/rules
--- zopfli-1.0.1/debian/rules   2013-12-22 01:20:37.000000000 +0100
+++ zopfli-1.0.1/debian/rules   2015-11-10 20:51:12.000000000 +0100
@@ -6,7 +6,11 @@
 
 override_dh_auto_configure:
 
+override_dh_auto_build:
+       dh_auto_build
+       make libzopfli
+
 %:
        dh  $@
 
-.PHONY: override_dh_auto_configure
+.PHONY: override_dh_auto_configure override_dh_auto_build

Reply via email to