summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog11
-rw-r--r--debian/control17
-rwxr-xr-xdebian/rules7
-rw-r--r--debian/xtrkcad-common.install3
-rw-r--r--debian/xtrkcad.install9
5 files changed, 33 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog
index 31abec1..14797f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xtrkcad (1:4.2.4a-1) unstable; urgency=medium
+ [ Team Upload ]
* New Maintainer (Closes: #849139):
- debian/control: Add myself as maintainer.
- debian/copyright: Add myself to debian/*.
@@ -30,8 +31,14 @@ xtrkcad (1:4.2.4a-1) unstable; urgency=medium
- debian/xtrkcad.install: add the new place to install.
- debian/rules: Remove the documentation from /usr/share/xtrkcad.
- New debian/xtrkcat.doc-base.
-
- -- Jörg Frings-Fürst <debian@jff-webhosting.net> Fri, 30 Dec 2016 17:10:12 +0100
+ * Split package into arch-indep and arch-dep packages:
+ - New package xtrkcad-common for the arch-indep files.
+ + Add section for xtrkcad-common into debian/control.
+ + New debian/xtrkcad-common.install.
+ + Rewrite debian/xtrkcad.install.
+ + Remove now useless override_dh_install for debian/rules.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 01 Jan 2017 21:24:30 +0100
xtrkcad (1:4.2.2-1.2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b9f08c1..6859baa 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,23 @@ Package: xtrkcad
Architecture: any
Depends:
${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
+ xtrkcad-common (= ${source:Version}),
Description: Model Train Track CAD Program
This program allows you to design model train layouts. It is fundamentally
a drawing (CAD) program, but tailored to some of the specific issues in the
model train world.
+
+Package: xtrkcad-common
+Architecture: all
+Depends:
+ ${misc:Depends}
+Breaks:
+ xtrkcad (<< 1:4.2.4a-1)
+Replaces:
+ xtrkcad (<< 1:4.2.4a-1)
+Description: Model Train Track CAD Program common files
+ This program allows you to design model train layouts. It is fundamentally
+ a drawing (CAD) program, but tailored to some of the specific issues in the
+ model train world.
+ This package contains the demo, examples and parameter files.
diff --git a/debian/rules b/debian/rules
index 4ddb741..0b1ffba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,10 +14,3 @@ override_dh_auto_configure:
-DXTRKCAD_USE_GETTEXT=ON \
-DXTRKCAD_USE_GTK=ON \
-DCMAKE_INSTALL_PREFIX:PATH=/usr/
-
-override_dh_install:
- dh_install
- rm -fr $(CURDIR)/debian/xtrkcad/usr/share/xtrkcad/html
- rm -f $(CURDIR)/debian/xtrkcad/usr/share/xtrkcad/Readme.txt
- rm -f $(CURDIR)/debian/xtrkcad/usr/share/xtrkcad/logo.bmp
- rm -f $(CURDIR)/debian/xtrkcad/usr/share/xtrkcad/COPYING
diff --git a/debian/xtrkcad-common.install b/debian/xtrkcad-common.install
new file mode 100644
index 0000000..d381691
--- /dev/null
+++ b/debian/xtrkcad-common.install
@@ -0,0 +1,3 @@
+usr/share/xtrkcad/demos/* usr/share/xtrkcad/demos
+usr/share/xtrkcad/examples/* usr/share/xtrkcad/examples
+usr/share/xtrkcad/params/* usr/share/xtrkcad/params
diff --git a/debian/xtrkcad.install b/debian/xtrkcad.install
index e338dd9..d1d5887 100644
--- a/debian/xtrkcad.install
+++ b/debian/xtrkcad.install
@@ -1,4 +1,5 @@
-debian/xtrkcad.desktop usr/share/applications
-debian/xtrkcad/usr/share/xtrkcad/html/* usr/share/doc/xtrkcad/html
-debian/xtrkcad/usr/share/xtrkcad/Readme.txt usr/share/doc/xtrkcad
-debian/xtrkcad/usr/share/xtrkcad/logo.bmp usr/share/doc/xtrkcad
+debian/xtrkcad.desktop usr/share/applications
+usr/share/xtrkcad/html/* usr/share/doc/xtrkcad/html
+usr/share/xtrkcad/Readme.txt usr/share/doc/xtrkcad
+usr/share/xtrkcad/logo.bmp usr/share/doc/xtrkcad
+usr/bin/*