debian: updated templates to match buildsystem

melowntech · Jul 26, 2017 · 8ef16ad · 8ef16ad
1 parent d125fb2
commit 8ef16ad
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 31 deletions.
diff --git a/externals/buildsys/common b/externals/buildsys/common
diff --git a/mapproxy/debian/templates/control.template b/mapproxy/debian/templates/control.template
@@ -10,23 +10,23 @@ Package: vts-mapproxy
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, vts-registry (>= 1.0)
          , vts-mapproxy-tools (= ${binary:Version})
-Replaces: ctt-vts-mapproxy
-Breaks: ctt-vts-mapproxy
+Replaces: ctt-vts-mapproxy (<< 1.0)
+Breaks: ctt-vts-mapproxy (<< 1.0)
 Description: VTS MapProxy backend server
  Backend HTTP daemon.
 
 Package: vts-mapproxy-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, vts-registry (>= 1.0)
-Replaces: ctt-vts-mapproxy-tools
-Breaks: ctt-vts-mapproxy-tools
+Replaces: ctt-vts-mapproxy-tools (<< 1.0)
+Breaks: ctt-vts-mapproxy-tools (<< 1.0)
 Description: VTS MapProxy backend server tools
  Contains collection of tools for mapproxy dataset preparation.
 
 Package: vts-mapproxy-dbg
 Architecture: any
 Depends: ${misc:Depends}, vts-mapproxy (= ${binary:Version})
          , vts-mapproxy-tools (= ${binary:Version})
-Replaces: ctt-vts-mapproxy-dbg
-Breaks: ctt-vts-mapproxy-dbg
+Replaces: ctt-vts-mapproxy-dbg (<< 1.0)
+Breaks: ctt-vts-mapproxy-dbg (<< 1.0)
 Description: Debug Symbols for vts-mapproxy*
diff --git a/mapproxy/debian/wheezy/control b/mapproxy/debian/wheezy/control
@@ -12,27 +12,3 @@ m4_define({{{VAR_BuildDepends}}},{{{debhelper (>= 7.0.50~), libboost-all-dev (>=
     , libgdal-dev (>= 2.0), libproj-dev (>= 4.9)
     , libmysql++-dev (>= 3.0.9-1+b1), libopenmesh-dev (>= 2.3.1-2)
     , libgeographiclib-dev (>= 1.21-1)}}})m4_dnl
-m4_dnl
-m4_dnl ###############################################################
-m4_dnl ## this defines tail to be inserted at the end of control file
-m4_dnl ###############################################################
-m4_define({{{VAR_footer}}},
-{{{
-Package: ctt-vts-mapproxy
-Architecture: any
-Depends: vts-mapproxy
-Description: VTS MapProxy backend server (transitional package)
- Package rename ctt-vts-mapproxy -> vts-mapproxy
-
-Package: ctt-vts-mapproxy-tools
-Architecture: any
-Depends: vts-mapproxy-tools
-Description: VTS MapProxy backend server (transitional package)
- Package rename ctt-vts-mapproxy-tools -> vts-mapproxy-tools
-
-Package: ctt-vts-mapproxy-dbg
-Architecture: any
-Depends: vts-mapproxy-dbg
-Description: VTS MapProxy backend server (transitional package)
- Package rename ctt-vts-mapproxy-dbg -> vts-mapproxy-dbg}}}
-)m4_dnl
diff --git a/mapproxy/debian/wheezy/control.footer b/mapproxy/debian/wheezy/control.footer
@@ -0,0 +1,18 @@
+
+Package: ctt-vts-mapproxy
+Architecture: any
+Depends: vts-mapproxy (= ${binary:Version})
+Description: VTS MapProxy backend server (transitional package)
+ Package rename ctt-vts-mapproxy -> vts-mapproxy
+
+Package: ctt-vts-mapproxy-tools
+Architecture: any
+Depends: vts-mapproxy-tools (= ${binary:Version})
+Description: VTS MapProxy backend server (transitional package)
+ Package rename ctt-vts-mapproxy-tools -> vts-mapproxy-tools
+
+Package: ctt-vts-mapproxy-dbg
+Architecture: any
+Depends: vts-mapproxy-dbg (= ${binary:Version})
+Description: VTS MapProxy backend server (transitional package)
+Package rename ctt-vts-mapproxy-dbg -> vts-mapproxy-dbg