Browse Source

Use a simple debian/control Architecture

By switching to the "any" architecture, we no longer need to template
the debian/control file.  This simply claims that the package can be
built on any known debian arch - which we currently think is true - so
it will help future portability.
pull/1147/head
Hamish Coleman 1 year ago
parent
commit
018add0280
  1. 1
      .gitignore
  2. 3
      packages/debian/configure
  3. 1
      packages/debian/configure.in
  4. 2
      packages/debian/debian/control

1
.gitignore

@ -24,7 +24,6 @@ build
.idea
.vscode
.vs
packages/debian/debian/control
packages/debian/debian/files
*dSYM*

3
packages/debian/configure

@ -1765,8 +1765,6 @@ fi
ac_config_files="$ac_config_files debian/control"
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@ -2469,7 +2467,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"debian/control") CONFIG_FILES="$CONFIG_FILES debian/control" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

1
packages/debian/configure.in

@ -35,6 +35,5 @@ fi
AC_SUBST(N2N_VERSION)
AC_SUBST(EXTN)
AC_CONFIG_FILES(debian/control)
AC_CONFIG_FILES(Makefile)
AC_OUTPUT

2
packages/debian/debian/control.in → packages/debian/debian/control

@ -6,7 +6,7 @@ Standards-Version: 4.6.0
Build-Depends:
Package: n2n
Architecture: @EXTN@
Architecture: any
Suggests: uml-utilities
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: n2n (<< 2.1.0-1)
Loading…
Cancel
Save