From 945d705a7f9c2294bb672869292faba613994ef0 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 15 Jun 2020 17:03:34 -0600 Subject: [PATCH 1/3] Vagrantfile improvments, bootstrap ctsim automake system --- Vagrantfile | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 1a42661..b6f7a82 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -7,54 +7,30 @@ # you're doing. Vagrant.configure("2") do |config| config.vm.box = "hashicorp/bionic64" - - # Disable automatic box update checking. If you disable this, then - # boxes will only be checked for updates when the user runs - # `vagrant box outdated`. This is not recommended. - # config.vm.box_check_update = false - - # Create a forwarded port mapping which allows access to a specific port - # within the machine from a port on the host machine. In the example below, - # accessing "localhost:8080" will access port 80 on the guest machine. - # NOTE: This will enable public access to the opened port - # config.vm.network "forwarded_port", guest: 80, host: 8080 - - # Create a forwarded port mapping which allows access to a specific port - # within the machine from a port on the host machine and only allow access - # via 127.0.0.1 to disable public access - # config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1" - - # Create a private network, which allows host-only access to the machine - # using a specific IP. - # config.vm.network "private_network", ip: "192.168.33.10" - - # Create a public network, which generally matched to bridged network. - # Bridged networks make the machine appear as another physical device on - # your network. - # config.vm.network "public_network" - config.vm.provider "virtualbox" do |vb| - # # Display the VirtualBox GUI when booting the machine - # vb.gui = true vb.memory = "2048" vb.cpus = "2" end config.vm.provision "shell", inline: <<-SHELL - FILE=/etc/apt/preferences.d/99grub + FILE=/etc/apt/preferences.d/99do_not_update echo "Package: /(grub-common|grub2-common|grub-pc)/ Pin: release * Pin-Priority: -1" > $FILE apt-get update apt-get dist-upgrade -y - apt-get install -yy debhelper libfftw3-dev libreadline-dev libgl1-mesa-dev libglu1-mesa-dev libwxgtk3.0-dev ctn-dev libpng-dev git + apt-get install -yy debhelper libfftw3-dev libreadline-dev libgl1-mesa-dev libglu1-mesa-dev libwxgtk3.0-dev ctn-dev libpng-dev + apt-get install -yy git emacs-nox apt-get autoremove -y rm $FILE - git clone git://git.kpe.io/ctsim.git - DIR=/home/vagrant/ctsim + git clone git://git.kpe.io/ctsim.git ctsim.git + echo Bootstrapping ctsim + DIR=/home/vagrant/ctsim.git cd $DIR ./bootstrap.sh chown -R vagrant:vagrant $DIR + echo "To build ctsim:" + echo " cd ctsim.git; ./configure; make" SHELL end -- 2.34.1 From d945badc626ffad61f8b8cb355c609fa93a9e664 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 7 Apr 2021 16:29:27 +0000 Subject: [PATCH 2/3] Update package dependency from libwxgtk3.0-dev to libwxgtk3.0-gtk3-dev for Debian --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f739e68..714aceb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ctsim (6.0.2-2) unstable; urgency=low + + * debian/control: Update package dependency from libwxgtk3.0-dev to libwxgtk3.0-gtk3-dev + + -- Kevin M. Rosenberg Wed, 21 Mar 2018 12:50:20 -0600 + ctsim (6.0.2-1) unstable; urgency=low * New upstream diff --git a/debian/control b/debian/control index b661a28..324ffeb 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 10), libreadline-dev, libgl1-mesa-dev, libglu1-mesa-dev, - libwxgtk3.0-dev, + libwxgtk3.0-gtk3-dev, ctn-dev, libpng-dev Standards-Version: 4.1.3 -- 2.34.1 From 3e0592aba13de283d95300fefe838a4745563abd Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 7 Apr 2021 18:41:20 +0000 Subject: [PATCH 3/3] Revert "Update package dependency from libwxgtk3.0-dev to libwxgtk3.0-gtk3-dev for Debian" This reverts commit d945badc626ffad61f8b8cb355c609fa93a9e664. --- debian/changelog | 6 ------ debian/control | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 714aceb..f739e68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -ctsim (6.0.2-2) unstable; urgency=low - - * debian/control: Update package dependency from libwxgtk3.0-dev to libwxgtk3.0-gtk3-dev - - -- Kevin M. Rosenberg Wed, 21 Mar 2018 12:50:20 -0600 - ctsim (6.0.2-1) unstable; urgency=low * New upstream diff --git a/debian/control b/debian/control index 324ffeb..b661a28 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 10), libreadline-dev, libgl1-mesa-dev, libglu1-mesa-dev, - libwxgtk3.0-gtk3-dev, + libwxgtk3.0-dev, ctn-dev, libpng-dev Standards-Version: 4.1.3 -- 2.34.1