Control: user release.debian....@packages.debian.org
Control: usertag -1 + transition
Control: block -1 by 790756
Control: reassign -1 release.debian.org
(I am not the maintainer of this, but am an upstream developer)
The attached does the rename; both reverse dependencies (flightgear and
fgrun) build and appear to work.
Do we need to wait for libglu (not yet rebuilt, but not listed as
needing a transition)?
diff --git a/debian/changelog b/debian/changelog
index 00b4e80..7b6816b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+simgear (3.4.0-3) UNRELEASED; urgency=medium
+
+ * Rename for gcc5 transition.
+
+ -- Rebecca N. Palmer <rnpalmer@rnpalmer-laptop> Sat, 05 Sep 2015 14:08:42 +0100
+
simgear (3.4.0-2) unstable; urgency=medium
* Really drop the conflicts against simgear0 (in control.in).
diff --git a/debian/control b/debian/control
index d490a6f..661f8c0 100644
--- a/debian/control
+++ b/debian/control
@@ -18,11 +18,13 @@ Homepage: http://www.simgear.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/simgear.git
Vcs-Git: git://anonscm.debian.org/collab-maint/simgear.git
-Package: libsimgearcore3.4.0
+Package: libsimgearcore3.4.0v5
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libsimgearcore3.4.0
+Replaces: libsimgearcore3.4.0
Description: Simulator Construction Gear -- core library
SimGear is a collection of libraries useful for constructing
simulation and visualization applications such as FlightGear
@@ -35,7 +37,7 @@ Architecture: any
Section: debug
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore3.4.0 (= ${binary:Version}),
+Depends: libsimgearcore3.4.0v5 (= ${binary:Version}),
${misc:Depends}
Description: debugging symbols for libsimgearcore
SimGear is a collection of libraries useful for constructing
@@ -44,12 +46,14 @@ Description: debugging symbols for libsimgearcore
.
This package contains the debug symbols for the core library.
-Package: libsimgearscene3.4.0
+Package: libsimgearscene3.4.0v5
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore3.4.0 (= ${binary:Version}),
+Depends: libsimgearcore3.4.0v5 (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
+Conflicts: libsimgearscene3.4.0
+Replaces: libsimgearscene3.4.0
Description: Simulator Construction Gear -- scene library
SimGear is a collection of libraries useful for constructing
simulation and visualization applications such as FlightGear
@@ -62,7 +66,7 @@ Architecture: any
Section: debug
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore3.4.0 (= ${binary:Version}),
+Depends: libsimgearcore3.4.0v5 (= ${binary:Version}),
${misc:Depends}
Description: debugging symbols for libsimgearscene
SimGear is a collection of libraries useful for constructing
@@ -74,8 +78,8 @@ Description: debugging symbols for libsimgearscene
Package: libsimgear-dev
Architecture: any
Section: libdevel
-Depends: libsimgearcore3.4.0 (= ${binary:Version}),
- libsimgearscene3.4.0 (= ${binary:Version}),
+Depends: libsimgearcore3.4.0v5 (= ${binary:Version}),
+ libsimgearscene3.4.0v5 (= ${binary:Version}),
libopenscenegraph-dev, libc6-dev, ${misc:Depends}
Replaces: simgear-dev (<< 2.10.0~)
Breaks: simgear-dev (<< 2.10.0~)
diff --git a/debian/control.in b/debian/control.in
index 8a2bf9c..86f0382 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,11 +18,13 @@ Homepage: http://www.simgear.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/simgear.git
Vcs-Git: git://anonscm.debian.org/collab-maint/simgear.git
-Package: libsimgearcore##UVER
+Package: libsimgearcore##UVERv5
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libsimgearcore##UVER
+Replaces: libsimgearcore##UVER
Description: Simulator Construction Gear -- core library
SimGear is a collection of libraries useful for constructing
simulation and visualization applications such as FlightGear
@@ -35,7 +37,7 @@ Architecture: any
Section: debug
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore##UVER (= ${binary:Version}),
+Depends: libsimgearcore##UVERv5 (= ${binary:Version}),
${misc:Depends}
Description: debugging symbols for libsimgearcore
SimGear is a collection of libraries useful for constructing
@@ -44,12 +46,14 @@ Description: debugging symbols for libsimgearcore
.
This package contains the debug symbols for the core library.
-Package: libsimgearscene##UVER
+Package: libsimgearscene##UVERv5
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore##UVER (= ${binary:Version}),
+Depends: libsimgearcore##UVERv5 (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
+Conflicts: libsimgearscene##UVER
+Replaces: libsimgearscene##UVER
Description: Simulator Construction Gear -- scene library
SimGear is a collection of libraries useful for constructing
simulation and visualization applications such as FlightGear
@@ -62,7 +66,7 @@ Architecture: any
Section: debug
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore##UVER (= ${binary:Version}),
+Depends: libsimgearcore##UVERv5 (= ${binary:Version}),
${misc:Depends}
Description: debugging symbols for libsimgearscene
SimGear is a collection of libraries useful for constructing
@@ -74,8 +78,8 @@ Description: debugging symbols for libsimgearscene
Package: libsimgear-dev
Architecture: any
Section: libdevel
-Depends: libsimgearcore##UVER (= ${binary:Version}),
- libsimgearscene##UVER (= ${binary:Version}),
+Depends: libsimgearcore##UVERv5 (= ${binary:Version}),
+ libsimgearscene##UVERv5 (= ${binary:Version}),
libopenscenegraph-dev, libc6-dev, ${misc:Depends}
Replaces: simgear-dev (<< 2.10.0~)
Breaks: simgear-dev (<< 2.10.0~)
diff --git a/debian/libsimgearcore3.4.0.install b/debian/libsimgearcore3.4.0.install
deleted file mode 100644
index 93272c0..0000000
--- a/debian/libsimgearcore3.4.0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libSimGearCore.so.*
diff --git a/debian/libsimgearcore3.4.0.shlibs b/debian/libsimgearcore3.4.0.shlibs
deleted file mode 100644
index 9872061..0000000
--- a/debian/libsimgearcore3.4.0.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libSimGearCore 3.4.0 libsimgearcore3.4.0 (>= 3.4.0~)
diff --git a/debian/libsimgearcore3.4.0v5.install b/debian/libsimgearcore3.4.0v5.install
new file mode 100644
index 0000000..93272c0
--- /dev/null
+++ b/debian/libsimgearcore3.4.0v5.install
@@ -0,0 +1 @@
+usr/lib/*/libSimGearCore.so.*
diff --git a/debian/libsimgearcore3.4.0v5.shlibs b/debian/libsimgearcore3.4.0v5.shlibs
new file mode 100644
index 0000000..8798408
--- /dev/null
+++ b/debian/libsimgearcore3.4.0v5.shlibs
@@ -0,0 +1 @@
+libSimGearCore 3.4.0 libsimgearcore3.4.0v5 (>= 3.4.0~)
diff --git a/debian/libsimgearscene3.4.0.install b/debian/libsimgearscene3.4.0.install
deleted file mode 100644
index 14ff3cb..0000000
--- a/debian/libsimgearscene3.4.0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libSimGearScene.so.*
diff --git a/debian/libsimgearscene3.4.0.shlibs b/debian/libsimgearscene3.4.0.shlibs
deleted file mode 100644
index 82df2a5..0000000
--- a/debian/libsimgearscene3.4.0.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libSimGearScene 3.4.0 libsimgearscene3.4.0 (>= 3.4.0~)
diff --git a/debian/libsimgearscene3.4.0v5.install b/debian/libsimgearscene3.4.0v5.install
new file mode 100644
index 0000000..14ff3cb
--- /dev/null
+++ b/debian/libsimgearscene3.4.0v5.install
@@ -0,0 +1 @@
+usr/lib/*/libSimGearScene.so.*
diff --git a/debian/libsimgearscene3.4.0v5.shlibs b/debian/libsimgearscene3.4.0v5.shlibs
new file mode 100644
index 0000000..0f2094c
--- /dev/null
+++ b/debian/libsimgearscene3.4.0v5.shlibs
@@ -0,0 +1 @@
+libSimGearScene 3.4.0 libsimgearscene3.4.0v5 (>= 3.4.0~)
diff --git a/debian/rules b/debian/rules
index 73d347e..e08334e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,16 +43,16 @@ override_dh_auto_clean:
cat $(CURDIR)/debian/control.in \
| sed 's/\#\#UVER/$(UVER)/' > $(CURDIR)/debian/control
rm -f $(CURDIR)/debian/libsimgearcore*.shlibs $(CURDIR)/debian/libsimgearcore*.install
- echo "libSimGearCore $(UVER) libsimgearcore$(UVER) (>= $(UVER)~)" \
- > $(CURDIR)/debian/libsimgearcore$(UVER).shlibs
+ echo "libSimGearCore $(UVER) libsimgearcore$(UVER)v5 (>= $(UVER)~)" \
+ > $(CURDIR)/debian/libsimgearcore$(UVER)v5.shlibs
echo "usr/lib/*/libSimGearCore.so.*" \
- > $(CURDIR)/debian/libsimgearcore$(UVER).install
+ > $(CURDIR)/debian/libsimgearcore$(UVER)v5.install
rm -f $(CURDIR)/debian/libsimgearscene*.shlibs $(CURDIR)/debian/libsimgearscene*.install
- echo "libSimGearScene $(UVER) libsimgearscene$(UVER) (>= $(UVER)~)" \
- > $(CURDIR)/debian/libsimgearscene$(UVER).shlibs
+ echo "libSimGearScene $(UVER) libsimgearscene$(UVER)v5 (>= $(UVER)~)" \
+ > $(CURDIR)/debian/libsimgearscene$(UVER)v5.shlibs
echo "usr/lib/*/libSimGearScene.so.*" \
- > $(CURDIR)/debian/libsimgearscene$(UVER).install
+ > $(CURDIR)/debian/libsimgearscene$(UVER)v5.install
dh_auto_clean
@@ -61,8 +61,8 @@ override_dh_auto_configure:
cd build && cmake .. $(CMAKE_FLAGS)
override_dh_strip:
- dh_strip -plibsimgearcore$(UVER) --dbg-package=libsimgearcore$(UVER)-dbg
- dh_strip -plibsimgearscene$(UVER) --dbg-package=libsimgearscene$(UVER)-dbg
+ dh_strip -plibsimgearcore$(UVER)v5 --dbg-package=libsimgearcore$(UVER)-dbg
+ dh_strip -plibsimgearscene$(UVER)v5 --dbg-package=libsimgearscene$(UVER)-dbg
get-orig-source:
uscan --download-current-version --verbose --rename
