Skip to content

Commit

Permalink
Use a simple debian/control Architecture
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
hamishcoleman committed Aug 30, 2023
1 parent d7eff53 commit 018add0
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 6 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ build
.idea
.vscode
.vs
packages/debian/debian/control
packages/debian/debian/files
*dSYM*

Expand Down
3 changes: 0 additions & 3 deletions packages/debian/configure
Original file line number Diff line number Diff line change
Expand Up @@ -1765,8 +1765,6 @@ fi



ac_config_files="$ac_config_files debian/control"

ac_config_files="$ac_config_files Makefile"

cat >confcache <<\_ACEOF
Expand Down Expand Up @@ -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;;
Expand Down
1 change: 0 additions & 1 deletion packages/debian/configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,5 @@ fi
AC_SUBST(N2N_VERSION)
AC_SUBST(EXTN)

AC_CONFIG_FILES(debian/control)
AC_CONFIG_FILES(Makefile)
AC_OUTPUT
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 018add0

Please sign in to comment.