control: tags -1 patch pending

The following debdiff is now in deferred/15

G.
diff -Nru linux-ftpd-ssl-0.17.36+0.3/debian/changelog 
linux-ftpd-ssl-0.17.36+0.3/debian/changelog
--- linux-ftpd-ssl-0.17.36+0.3/debian/changelog 2019-02-24 14:39:30.000000000 
+0100
+++ linux-ftpd-ssl-0.17.36+0.3/debian/changelog 2019-08-12 18:39:22.000000000 
+0200
@@ -1,3 +1,12 @@
+linux-ftpd-ssl (0.17.36+0.3-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Tweak cmake patches to link correctly. Closes: #925768
+  * Drop obsolete libssl1.0-dev dependency. Closes: #917348
+    - drop version constraint, satisfied already since o-o-stable
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org>  Mon, 12 Aug 2019 
18:39:22 +0200
+
 linux-ftpd-ssl (0.17.36+0.3-2.1) unstable; urgency=high
 
   * Non-maintainer upload
diff -Nru linux-ftpd-ssl-0.17.36+0.3/debian/control 
linux-ftpd-ssl-0.17.36+0.3/debian/control
--- linux-ftpd-ssl-0.17.36+0.3/debian/control   2019-02-24 14:39:30.000000000 
+0100
+++ linux-ftpd-ssl-0.17.36+0.3/debian/control   2019-08-12 18:39:22.000000000 
+0200
@@ -3,12 +3,12 @@
 Priority: extra
 Maintainer: Mats Erik Andersson <mats.anders...@gisladisker.se>
 Uploaders: Alberto Gonzalez Iniesta <a...@inittab.org>
-Build-Depends: bison, debhelper (>= 10~), libpam0g-dev | libpam-dev, 
libssl-dev | libssl1.0-dev, cmake
+Build-Depends: bison, debhelper (>= 10~), libpam0g-dev | libpam-dev, 
libssl-dev, cmake
 Standards-Version: 3.9.8
 
 Package: ftpd-ssl
 Architecture: any
-Depends: openbsd-inetd | inet-superserver, libpam-modules, openssl (>= 
0.9.8g-9), ${shlibs:Depends}, ${misc:Depends}
+Depends: openbsd-inetd | inet-superserver, libpam-modules, openssl, 
${shlibs:Depends}, ${misc:Depends}
 Provides: ftp-server
 Conflicts: ftp-server, ftpd
 Replaces: ftpd
diff -Nru 
linux-ftpd-ssl-0.17.36+0.3/debian/patches/use-cmake-as-buildsystem-debian-extras.patch
 
linux-ftpd-ssl-0.17.36+0.3/debian/patches/use-cmake-as-buildsystem-debian-extras.patch
--- 
linux-ftpd-ssl-0.17.36+0.3/debian/patches/use-cmake-as-buildsystem-debian-extras.patch
      2019-02-24 14:39:30.000000000 +0100
+++ 
linux-ftpd-ssl-0.17.36+0.3/debian/patches/use-cmake-as-buildsystem-debian-extras.patch
      2019-04-17 17:43:55.000000000 +0200
@@ -12,12 +12,13 @@
  include_directories(
      BEFORE
      "../support/"
-@@ -18,6 +20,8 @@
+@@ -18,6 +20,9 @@
      in.ftpd
-     crypt
+     ${USE_CRYPT}
      support
 +    ssl
 +    crypto
++    ${USE_PAM}
  )
  install(
      TARGETS in.ftpd
@@ -31,7 +32,7 @@
 +
 +if(USE_PAM)
 +    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_PAM=1")
-+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lpam")
++    #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lpam")
 +endif()
 +
 +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64")
diff -Nru 
linux-ftpd-ssl-0.17.36+0.3/debian/patches/use-cmake-as-buildsystem.patch 
linux-ftpd-ssl-0.17.36+0.3/debian/patches/use-cmake-as-buildsystem.patch
--- linux-ftpd-ssl-0.17.36+0.3/debian/patches/use-cmake-as-buildsystem.patch    
2019-02-24 14:39:30.000000000 +0100
+++ linux-ftpd-ssl-0.17.36+0.3/debian/patches/use-cmake-as-buildsystem.patch    
2019-04-17 17:44:11.000000000 +0200
@@ -37,7 +37,7 @@
 +)
 +target_link_libraries(
 +    in.ftpd
-+    crypt
++    ${USE_CRYPT}
 +    support
 +)
 +install(

Reply via email to